Changeset 8e89a3 in git

Timestamp:

Nov 29, 2021, 2:48:20 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

eccae75d9df69c8235bdc90b5a36a2161eb0654d

Parents:

b9ded9215c1f31f52c684d1560787b9c150d904e

Message:

format (Farey)

File:

• factory/cf_chinese.cc (modified) (1 diff)

factory/cf_chinese.cc

@@ -202 +202 @@
 CanonicalForm Farey ( const CanonicalForm & f, const CanonicalForm & q )
 {
-    int is_rat=isOn(SW_RATIONAL);
-    Off(SW_RATIONAL);
-    Variable x = f.mvar();
-    CanonicalForm result = 0;
-    CanonicalForm c;
-    CFIterator i;
+  int is_rat=isOn(SW_RATIONAL);
+  Off(SW_RATIONAL);
+  Variable x = f.mvar();
+  CanonicalForm result = 0;
+  CanonicalForm c;
+  CFIterator i;
 #ifdef HAVE_FLINT
-   fmpz_t FLINTq;
-   fmpz_init(FLINTq);
-   convertCF2initFmpz(FLINTq,q);
-   fmpz_t FLINTc;
-   fmpz_init(FLINTc);
-   fmpq_t FLINTres;
-   fmpq_init(FLINTres);
+  fmpz_t FLINTq;
+  fmpz_init(FLINTq);
+  convertCF2initFmpz(FLINTq,q);
+  fmpz_t FLINTc;
+  fmpz_init(FLINTc);
+  fmpq_t FLINTres;
+  fmpq_init(FLINTres);
 #elif defined(HAVE_NTL)
-    ZZ NTLq= convertFacCF2NTLZZ (q);
-    ZZ bound;
-    SqrRoot (bound, NTLq/2);
+  ZZ NTLq= convertFacCF2NTLZZ (q);
+  ZZ bound;
+  SqrRoot (bound, NTLq/2);
 #else
-   factoryError("NTL/FLINT missing:Farey");
-#endif
-    for ( i = f; i.hasTerms(); i++ )
+  factoryError("NTL/FLINT missing:Farey");
+#endif
+  for ( i = f; i.hasTerms(); i++ )
+  {
+    c = i.coeff();
+    if ( c.inCoeffDomain())
     {
-        c = i.coeff();
-        if ( c.inCoeffDomain())
+#ifdef HAVE_FLINT
+      if (c.inZ())
+      {
+        convertCF2initFmpz(FLINTc,c);
+        fmpq_reconstruct_fmpz(FLINTres,FLINTc,FLINTq);
+        result += power (x, i.exp())*(convertFmpq2CF(FLINTres));
+      }
+#elif defined(HAVE_NTL)
+      if (c.inZ())
+      {
+        ZZ NTLc= convertFacCF2NTLZZ (c);
+        bool lessZero= (sign (NTLc) == -1);
+        if (lessZero)
+          NTL::negate (NTLc, NTLc);
+        ZZ NTLnum, NTLden;
+        if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))
         {
+          if (lessZero)
+            NTL::negate (NTLnum, NTLnum);
+          CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
+          CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));
+          On (SW_RATIONAL);
+          result += power (x, i.exp())*(num/den);
+          Off (SW_RATIONAL);
+        }
+      }
+#else
+      if (c.inZ())
+        result += power (x, i.exp()) * Farey_n(c,q);
+#endif
+      else
+        result += power( x, i.exp() ) * Farey(c,q);
+    }
+    else
+      result += power( x, i.exp() ) * Farey(c,q);
+  }
+  if (is_rat) On(SW_RATIONAL);
 #ifdef HAVE_FLINT
-          if (c.inZ())
-          {
-             convertCF2initFmpz(FLINTc,c);
-             fmpq_reconstruct_fmpz(FLINTres,FLINTc,FLINTq);
-             result += power (x, i.exp())*(convertFmpq2CF(FLINTres));
-          }
-#elif defined(HAVE_NTL)
-          if (c.inZ())
-          {
-            ZZ NTLc= convertFacCF2NTLZZ (c);
-            bool lessZero= (sign (NTLc) == -1);
-            if (lessZero)
-              NTL::negate (NTLc, NTLc);
-            ZZ NTLnum, NTLden;
-            if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))
-            {
-              if (lessZero)
-                NTL::negate (NTLnum, NTLnum);
-              CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
-              CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));
-              On (SW_RATIONAL);
-              result += power (x, i.exp())*(num/den);
-              Off (SW_RATIONAL);
-            }
-          }
-#else
-          if (c.inZ())
-            result += power (x, i.exp()) * Farey_n(c,q);
-#endif
-          else
-            result += power( x, i.exp() ) * Farey(c,q);
-        }
-        else
-          result += power( x, i.exp() ) * Farey(c,q);
-    }
-    if (is_rat) On(SW_RATIONAL);
-#ifdef HAVE_FLINT
-    fmpq_clear(FLINTres);
-    fmpz_clear(FLINTc);
-    fmpz_clear(FLINTq);
-#endif
-    return result;
+  fmpq_clear(FLINTres);
+  fmpz_clear(FLINTc);
+  fmpz_clear(FLINTq);
+#endif
+  return result;
 }