Changeset e0208dc in git

Timestamp:

Jan 26, 2021, 11:35:36 AM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

45adda4d5309df54c9f7e6205887c42e91d19d22

Parents:

010a14be02b07fa1ee9a250d9e2251114f166424

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-01-26 11:35:36+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-01-26 11:36:59+01:00

Message:

convertCF2Fmpz/convertCF2initFmpz

File:

• factory/FLINTconvert.cc (modified) (5 diffs)

factory/FLINTconvert.cc

@@ -113 +113 @@
 #include "FLINTconvert.h"
 
-// TODO!! decide if the input to convertCF2Fmpz is expected to be:
-//  initialized, or
-//  uninitialized
+// assumes result to be uninitialiazed
 void convertCF2Fmpz (fmpz_t result, const CanonicalForm& f)
 {
   if (f.isImm())
-    *result=f.intval();                     // assumes uninitialized
-    //fmpz_set_si (result, f.intval());
+    *result=f.intval();
   else
   {
     mpz_t gmp_val;
     f.mpzval(gmp_val);
-    fmpz_set_mpz (result, gmp_val);         // assumes initialized
+    fmpz_init(result);
+    fmpz_set_mpz (result, gmp_val);
+    mpz_clear (gmp_val);
+  }
+}
+
+// special version assuming result is already initialized
+void convertCF2initFmpz (fmpz_t result, const CanonicalForm& f)
+{
+  if (f.isImm())
+    fmpz_set_si (result, f.intval());
+  else
+  {
+    mpz_t gmp_val;
+    f.mpzval(gmp_val);
+
+    mpz_swap(gmp_val, _fmpz_promote(result));
+    _fmpz_demote_val(result);
+
     mpz_clear (gmp_val);
   }
@@ -135 +150 @@
   _fmpz_poly_set_length(result, degree(f)+1);
   for (CFIterator i= f; i.hasTerms(); i++)
-    convertCF2Fmpz (fmpz_poly_get_coeff_ptr(result, i.exp()), i.coeff()); // assumes initialized
+    convertCF2initFmpz (fmpz_poly_get_coeff_ptr(result, i.exp()), i.coeff()); // assumes initialized
 }
 
@@ -302 +317 @@
 {
   for (CFIterator i= f; i.hasTerms(); i++)
-    convertCF2Fmpz (&result[i.exp()], i.coeff()); // assumes ?
+    convertCF2initFmpz (&result[i.exp()], i.coeff()); // assumes initialized
 }
 
@@ -315 +330 @@
   CanonicalForm den= bCommonDen (f);
   convertFacCF2Fmpz_array (fmpq_poly_numref (result), f*den);
-  convertCF2Fmpz (fmpq_poly_denref (result), den); // assumes initialized
+  convertCF2initFmpz (fmpq_poly_denref (result), den); // assumes initialized
 
   if (!isRat)
@@ -412 +427 @@
   fmpz_t FLINTp;
   fmpz_init (FLINTp);
-  convertCF2Fmpz (FLINTp, b.getpk()); // assumes initialized
+  convertCF2initFmpz (FLINTp, b.getpk()); // assumes initialized
   fmpz_mod_ctx_t ctx;
   fmpz_mod_ctx_init(ctx,FLINTp);