Changeset 188d2fb in git for factory/facFqBivar.cc

Timestamp:

Apr 2, 2012, 4:44:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

d2d057ebcf8b633c14f245b0c65e698c351e38e2

Parents:

6f84545a3eb72153c8952ab0eb64df17cd00d1bb

git-author:

Martin Lee <martinlee84@web.de>2012-04-02 16:44:35+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:44:11+02:00

Message:

fix: need SW_RATIONAL to be On for computation of buf0 and buf1

File:

• factory/facFqBivar.cc (modified) (4 diffs)

factory/facFqBivar.cc

@@ -488 +488 @@
   bool recombination= false;
   CanonicalForm test;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  if (!isRat)
+    On (SW_RATIONAL);
   CanonicalForm buf0= mulNTL (buf (0, x), LCBuf);
-  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  if (!isRat)
+    Off (SW_RATIONAL);
+  buf0= buf(0,x)*LCBuf;
   while (T.length() >= 2*s && s <= thres)
   {
@@ -559 +564 @@
             l -= degree (g);
             M= power (y, l);
+            buf0= mulNTL (buf (0, x), LCBuf);
             if (!isRat)
               Off (SW_RATIONAL);
-            buf0= mulNTL (buf (0, x), LCBuf);
             // compute new possible degree pattern
             bufDegs2= DegreePattern (T);
@@ -678 +683 @@
   adaptedLiftBound= 0;
   int d= degree (F), l= 0;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  if (!isRat)
+    On (SW_RATIONAL);
   CanonicalForm buf0= mulNTL (buf (0,x), LCBuf);
   CanonicalForm buf1= mulNTL (buf (1,x), LCBuf);
+  if (!isRat)
+    Off (SW_RATIONAL);
   CanonicalForm test0, test1;
-  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+
   for (CFListIterator i= factors; i.hasItem(); i++, l++)
   {
@@ -714 +724 @@
             d -= degree (g);
             LCBuf= LC (buf, x);
+            buf0= mulNTL (buf (0,x), LCBuf);
+            buf1= mulNTL (buf (1,x), LCBuf);
             if (!isRat)
               Off (SW_RATIONAL);
-            buf0= mulNTL (buf (0,x), LCBuf);
-            buf1= mulNTL (buf (1,x), LCBuf);
             T= Difference (T, CFList (i.getItem()));
             F= buf;