Changeset 41fea7 in git for factory

Timestamp:

Mar 9, 2012, 12:46:16 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b4af1bcc6d94130065fbe01fbd2210fee3f1983e

Parents:

ca058cdd63fd41f47dfc543efa0ec6a1fd26553d

git-author:

Martin Lee <martinlee84@web.de>2012-03-09 12:46:16+01:00

git-committer:

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

Message:

fix: divisibility testing
chg: coeff bound for factorization over Q(a)

File:

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

factory/facFqBivar.cc

@@ -487 +487 @@
   bool recombination= false;
   CanonicalForm test;
-  CanonicalForm buf0= mulNTL (buf (0, x), LCBuf, b);
+  CanonicalForm buf0= mulNTL (buf (0, x), LCBuf);
   bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
   while (T.length() >= 2*s && s <= thres)
@@ -546 +546 @@
             if (!isRat)
               Off (SW_RATIONAL);
-            buf0= mulNTL (buf (0, x), LCBuf, b);
+            buf0= mulNTL (buf (0, x), LCBuf);
             // compute new possible degree pattern
             bufDegs2= DegreePattern (T);
@@ -663 +663 @@
   adaptedLiftBound= 0;
   int d= degree (F), l= 0;
-  CanonicalForm buf0= mulNTL (buf (0,x), LCBuf, b);
-  CanonicalForm buf1= mulNTL (buf (1,x), LCBuf, b);
+  CanonicalForm buf0= mulNTL (buf (0,x), LCBuf);
+  CanonicalForm buf1= mulNTL (buf (1,x), LCBuf);
   CanonicalForm test0, test1;
   bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
@@ -694 +694 @@
             if (!isRat)
               Off (SW_RATIONAL);
-            buf0= mulNTL (buf (0,x), LCBuf, b);
-            buf1= mulNTL (buf (1,x), LCBuf, b);
+            buf0= mulNTL (buf (0,x), LCBuf);
+            buf1= mulNTL (buf (1,x), LCBuf);
             T= Difference (T, CFList (i.getItem()));
             F= buf;
@@ -914 +914 @@
   if (getCharacteristic() == 0 && b.getp() != 0)
   {
-    lcA0= lc (A (0, 2));
-    A *= b.inverse (lcA0);
-    A= b (A);
-    for (CFListIterator i= bufUniFactors; i.hasItem(); i++)
-      i.getItem()= b (i.getItem()*b.inverse (lc (i.getItem())));
+    if (alpha.level() == 1)
+    {
+      lcA0= lc (A (0, 2));
+      A *= b.inverse (lcA0);
+      A= b (A);
+      for (CFListIterator i= bufUniFactors; i.hasItem(); i++)
+        i.getItem()= b (i.getItem()*b.inverse (lc (i.getItem())));
+    }
+    else
+    {
+      lcA0= Lc (A (0,2));
+      ZZX NTLlcA0= convertFacCF2NTLZZX (lcA0);
+      ZZX NTLmipo= convertFacCF2NTLZZX (getMipo (alpha));
+      ZZ NTLpk= power_ZZ (b.getp(), b.getk());
+      ZZ_p::init (NTLpk);
+      ZZ_pX S, T, G;
+      XGCD (G, S, T, to_ZZ_pX (NTLlcA0), to_ZZ_pX(NTLmipo));
+      CanonicalForm lcA0inverse= convertNTLZZX2CF (to_ZZX (S), alpha);
+      A *= lcA0inverse;
+      A= b (A);
+      // Lc of bufUniFactors is in Z
+      for (CFListIterator i= bufUniFactors; i.hasItem(); i++)
+        i.getItem()= b (i.getItem()*b.inverse (lc (i.getItem())));
+    }
   }
   bufUniFactors.insert (LC (A, x));