Changeset ad0177 in git for factory/facFqBivar.cc

Timestamp:

Mar 6, 2012, 9:48:34 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

24c6177e872b135f0188fea998eb45a75e3fde6e

Parents:

54af8a51cc8091a4687fb55bf401e31a0478bc1e

git-author:

Martin Lee <martinlee84@web.de>2012-03-06 21:48:34+01:00

git-committer:

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

Message:

chg: use uniFdivides in factorRecombination
chg: take care of GF in uniFdivides and univariate *,/,%
chg: switch on SW_RATIONAL if necessary

File:

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

factory/facFqBivar.cc

@@ -43 +43 @@
 TIMING_DEFINE_PRINT(fac_hensel_lift12)
 
-CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M)
+CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M, const modpk& b)
 {
   if (L.isEmpty())
@@ -50 +50 @@
     return mod (L.getFirst()(0, 1) , M);
   else if (L.length() == 2)
-    return mod (mulNTL (L.getFirst()(0, 1),L.getLast()(0, 1)), M);
+    return mod (mulNTL (L.getFirst()(0, 1),L.getLast()(0, 1), b), M);
   else
   {
@@ -60 +60 @@
       tmp1.append (i.getItem());
     tmp2= Difference (L, tmp1);
-    buf1= prodMod0 (tmp1, M);
-    buf2= prodMod0 (tmp2, M);
-    return mod (mulNTL (buf1,buf2), M);
+    buf1= prodMod0 (tmp1, M, b);
+    buf2= prodMod0 (tmp2, M, b);
+    return mod (mulNTL (buf1,buf2, b), M);
   }
 }
@@ -487 +487 @@
   bool recombination= false;
   CanonicalForm test;
-  CanonicalForm buf0= buf (0, x)*LCBuf;
+  CanonicalForm buf0= mulNTL (buf (0, x), LCBuf, b);
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
   while (T.length() >= 2*s && s <= thres)
   {
@@ -521 +522 @@
       else
       {
-        test= prodMod0 (S, M);
-        test *= LCBuf;
-        test = mod (test, M);
-        if (b.getp() != 0)
-          test= b(test);
-        if (fdivides (test, buf0))
+        test= prodMod0 (S, M, b);
+        test= mulNTL (test, LCBuf, b);
+        test= mod (test, M);
+        if (uniFdivides (test, buf0))
         {
           S.insert (LCBuf);
@@ -534 +533 @@
             g= b(g);
           g /= content (g, x);
+          if (!isRat)
+            On (SW_RATIONAL);
           if (fdivides (g, buf, quot))
           {
@@ -543 +544 @@
             l -= degree (g);
             M= power (y, l);
-            buf0= buf (0, x)*LCBuf;
+            if (!isRat)
+              Off (SW_RATIONAL);
+            buf0= mulNTL (buf (0, x), LCBuf, b);
             // compute new possible degree pattern
             bufDegs2= DegreePattern (T);
@@ -569 +572 @@
             if (nosubset) break;
           }
+          if (!isRat)
+            Off (SW_RATIONAL);
         }
       }
@@ -661 +666 @@
   CanonicalForm buf1= mulNTL (buf (1,x), LCBuf, b);
   CanonicalForm test0, test1;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
   for (CFListIterator i= factors; i.hasItem(); i++, l++)
   {
@@ -677 +683 @@
             g= b(g);
           g /= content (g, x);
+          if (!isRat)
+            On (SW_RATIONAL);
           if (fdivides (g, buf, quot))
           {
@@ -684 +692 @@
             d -= degree (g);
             LCBuf= LC (buf, x);
+            if (!isRat)
+              Off (SW_RATIONAL);
             buf0= mulNTL (buf (0,x), LCBuf, b);
             buf1= mulNTL (buf (1,x), LCBuf, b);
@@ -699 +709 @@
             }
           }
+          if (!isRat)
+            Off (SW_RATIONAL);
         }
       }