Changeset 9f033f in git

Timestamp:

Jul 30, 2014, 2:54:08 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

98148c7263409c3b3ec3de55b6ac6e9b992aa2f0

Parents:

29c93e5a134d849ec5f04de5a24549ae9eb1332e

git-author:

Martin Lee <martinlee84@web.de>2014-07-30 14:54:08+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-07-31 12:08:29+02:00

Message:

fix: conversion to FLINT over Q

File:

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

factory/FLINTconvert.cc

@@ -177 +177 @@
 CanonicalForm convertFmpq_t2CF (const fmpq_t q)
 {
-  //ASSERT (isOn (SW_RATIONAL), "expected rational");
+  bool isRat= isOn (SW_RATIONAL);
+  if (!isRat)
+    On (SW_RATIONAL);
 
   CanonicalForm num, den;
@@ -186 +188 @@
   fmpz_get_mpz (nden, fmpq_denref (q));
 
+  CanonicalForm result;
   if (mpz_is_imm (nnum) && mpz_is_imm (nden))
   {
@@ -192 +195 @@
     mpz_clear (nnum);
     mpz_clear (nden);
-    return num/den;
+    result= num/den;
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return result;
   }
   else
-    return make_cf (nnum, nden, false);
+  {
+    result= make_cf (nnum, nden, false);
+    if (!isRat)
+      Off (SW_RATIONAL);
+    return result;
+  }
 }
 
@@ -227 +238 @@
 void convertFacCF2Fmpq_poly_t (fmpq_poly_t result, const CanonicalForm& f)
 {
-  //ASSERT (isOn (SW_RATIONAL), "expected poly over Q");
+  bool isRat= isOn (SW_RATIONAL);
+  if (!isRat)
+    On (SW_RATIONAL);
 
   fmpq_poly_init2 (result, degree (f)+1);
@@ -234 +247 @@
   convertFacCF2Fmpz_array (fmpq_poly_numref (result), f*den);
   convertCF2Fmpz (fmpq_poly_denref (result), den);
+
+  if (!isRat)
+    Off (SW_RATIONAL);
 }