Changeset e39773 in git

Timestamp:

Oct 12, 2020, 10:06:46 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bef72dfeb70992e91914e360e41731d8ebf50023

Parents:

1f952a998b9b78fa696e49294e497f0ce0835fab

Message:

opt: FLINT: fmpz conversions

Files:

• factory/FLINTconvert.cc (modified) (2 diffs)
• libpolys/polys/flintconv.cc (modified) (3 diffs)

factory/FLINTconvert.cc

@@ -95 +95 @@
 {
   if (f.isImm())
-    fmpz_set_si (result, f.intval());
+    *result=f.intval();
+    //fmpz_set_si (result, f.intval());
   else
   {
@@ -115 +116 @@
 CanonicalForm convertFmpz2CF (const fmpz_t coefficient)
 {
-  if (fmpz_cmp_si (coefficient, MINIMMEDIATE) >= 0 &&
-      fmpz_cmp_si (coefficient, MAXIMMEDIATE) <= 0)
+  if(!COEFF_IS_MPZ(*coefficient)
+  &&  (fmpz_cmp_si (coefficient, MINIMMEDIATE) >= 0)
+  &&  (fmpz_cmp_si (coefficient, MAXIMMEDIATE) <= 0))
   {
     long coeff= fmpz_get_si (coefficient);

libpolys/polys/flintconv.cc

@@ -27 +27 @@
 {
   int res;
-  res = fmpz_get_si(f);
-  return res;
+  //return fmpz_get_si(f);
+  return (int)*f;
 }
 
@@ -34 +34 @@
 {
   fmpz_init(f);
-  fmpz_set_si(f,p);
+  *f=p;
+  //fmpz_set_si(f,p);
   return;
 }
@@ -46 +47 @@
 number convFlintNSingN (fmpz_t f)
 {
-  mpz_t z;
-  mpz_init(z);
-  fmpz_get_mpz(z,f);
   number n;
-  nlMPZ(z,n,NULL);
-  mpz_clear(z);
+  if(COEFF_IS_MPZ(*f))
+    nlMPZ(COEFF_TO_PTR(*f),n,NULL);
+  else
+  {
+    mpz_t z;
+    mpz_init(z);
+    fmpz_get_mpz(z,f);
+    nlMPZ(z,n,NULL);
+    mpz_clear(z);
+  }
   return n;
 }