Changeset e6ca692 in git

Timestamp:

Mar 19, 2019, 2:37:29 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

b84addc1b850ec70a5ac4d6bc62069079b238504

Parents:

7259b3d96c8cd7d99e58a2a74c07cf186222ba7f

Message:

chg: flint conversions for more rings

Files:

• Singular/extra.cc (modified) (2 diffs)
• libpolys/polys/flintconv.cc (modified) (4 diffs)
• libpolys/polys/flintconv.h (modified) (1 diff)

Singular/extra.cc

@@ -3775 +3775 @@
           // convert box-center(re,im), box-size, epsilon
           fmpq_t center_re,center_im,boxsize,eps;
-          convSingNFlintN(center_re,(number)h->Data()); h=h->next;
-          convSingNFlintN(center_im,(number)h->Data()); h=h->next;
-          convSingNFlintN(boxsize,(number)h->Data()); h=h->next;
-          convSingNFlintN(eps,(number)h->Data()); h=h->next;
+          convSingNFlintN(center_re,(number)h->Data(),currRing->cf); h=h->next;
+          convSingNFlintN(center_im,(number)h->Data(),currRing->cf); h=h->next;
+          convSingNFlintN(boxsize,(number)h->Data(),currRing->cf); h=h->next;
+          convSingNFlintN(eps,(number)h->Data(),currRing->cf); h=h->next;
           // alloc arrays
           int n=fmpq_poly_length(f);
@@ -3800 +3800 @@
             ll->m[1].rtyp=NUMBER_CMD;
             ll->m[2].rtyp=INT_CMD;
-            ll->m[0].data=convFlintNSingN(re_part[i]);
-            ll->m[1].data=convFlintNSingN(im_part[i]);
+            ll->m[0].data=convFlintNSingN(re_part[i],currRing->cf);
+            ll->m[1].data=convFlintNSingN(im_part[i],currRing->cf);
             ll->m[2].data=(char*)(long)mult[i];
           }

libpolys/polys/flintconv.cc

@@ -53 +53 @@
   return n;
 }
-number convFlintNSingN (fmpq_t f)
-{
-  number z=ALLOC_RNUMBER();
-#if defined(LDEBUG)
-  z->debug=123456;
-#endif
-  mpz_init(z->z);
-  mpz_init(z->n);
-  fmpq_get_mpz_frac(z->z,z->n,f);
-  nlNormalize(z,NULL);
+number convFlintNSingN (fmpq_t f, const coeffs cf)
+{
+  number z;
+  if (nCoeff_is_Q(cf))
+  {
+    z=ALLOC_RNUMBER();
+    #if defined(LDEBUG)
+    z->debug=123456;
+    #endif
+    mpz_init(z->z);
+    mpz_init(z->n);
+    fmpq_get_mpz_frac(z->z,z->n,f);
+  }
+  else
+  {
+    mpz_t a,b;
+    mpz_init(a);
+    mpz_init(b);
+    fmpq_get_mpz_frac(a,b,f);
+    number na=n_InitMPZ(a,cf);
+    number nb=n_InitMPZ(b,cf);
+    z=n_Div(na,nb,cf);
+    n_Delete(&na,cf);
+    n_Delete(&nb,cf);
+  }
+  n_Normalize(z,cf);
   return z;
 }
@@ -78 +94 @@
 }
 
-void convSingNFlintN(fmpq_t f, number n)
-{
-  fmpq_init(f);
-  if (SR_HDL(n)&SR_INT)
-    fmpq_set_si(f,SR_TO_INT(n),1);
-  else if (n->s<3)
-  {
-    fmpz_set_mpz(fmpq_numref(f), n->z);
-    fmpz_set_mpz(fmpq_denref(f), n->n);
-  }
-  else
-  {
-    mpz_t one;
-    mpz_init_set_si(one,1);
-    fmpz_set_mpz(fmpq_numref(f), n->z);
-    fmpz_set_mpz(fmpq_denref(f), one);
-    mpz_clear(one);
+void convSingNFlintN(fmpq_t f, number n, const coeffs cf)
+{
+  if (nCoeff_is_Q(cf))
+  {
+    fmpq_init(f);
+    if (SR_HDL(n)&SR_INT)
+      fmpq_set_si(f,SR_TO_INT(n),1);
+    else if (n->s<3)
+    {
+      fmpz_set_mpz(fmpq_numref(f), n->z);
+      fmpz_set_mpz(fmpq_denref(f), n->n);
+    }
+    else
+    {
+      mpz_t one;
+      mpz_init_set_si(one,1);
+      fmpz_set_mpz(fmpq_numref(f), n->z);
+      fmpz_set_mpz(fmpq_denref(f), one);
+      mpz_clear(one);
+    }
+  }
+  else
+  {
+    coeffs QQ=nInitChar(n_Q,NULL);
+    nMapFunc nMap=n_SetMap(cf,QQ);
+    if (nMap!=NULL)
+    {
+      number nn=nMap(n,cf,QQ);
+      convSingNFlintN(f,nn,QQ);
+    }
+    nKillChar(QQ);
   }
 }
@@ -107 +137 @@
     number n=pGetCoeff(p);
     fmpq_t c;
-    convSingNFlintN(c,n);
+    convSingNFlintN(c,n,r->cf);
     fmpq_poly_set_coeff_fmpq(res,p_GetExp(p,1,r),c);
     fmpq_clear(c);
@@ -122 +152 @@
     fmpq_t c;
     fmpq_poly_get_coeff_fmpq(c,f,i);
-    number n=convFlintNSingN(c);
+    number n=convFlintNSingN(c,r->cf);
     poly pp=p_Init(r);
     pSetCoeff0(pp,n);

libpolys/polys/flintconv.h

@@ -43 +43 @@
 void convSingNFlintN(fmpz_t f, mpz_t z);
 void convSingNFlintN(fmpz_t f, number n);
-void convSingNFlintN(fmpq_t f, number n);
+void convSingNFlintN(fmpq_t f, number n, const coeffs cf);
 number convFlintNSingN (fmpz_t f);
-number convFlintNSingN (fmpq_t f);
+number convFlintNSingN (fmpq_t f, const coeffs cf);
 void convSingPFlintP(fmpq_poly_t res, poly p, const ring r);
 poly convFlintPSingP(fmpq_poly_t f, const ring r);