Changeset eb481b in git for factory

Timestamp:

Feb 16, 2012, 3:55:49 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

583cb9fa220ca5d883a84c81ca72035b15d62ec1

Parents:

de222ec7eb2bfb6e75b27248dbeeebb1d1228587

git-author:

Martin Lee <martinlee84@web.de>2012-02-16 15:55:49+01:00

git-committer:

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

Message:

chg: more coeff bounds

File:

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

factory/facFqBivar.cc

@@ -499 +499 @@
           T.insert (LCBuf);
           g= prodMod (T, M);
+          if (b.getp() != 0)
+            g= b(g);
           T.removeFirst();
           result.append (g/content (g, x));
@@ -522 +524 @@
         test *= LCBuf;
         test = mod (test, M);
+        if (b.getp() != 0)
+          test= b(test);
         if (fdivides (test, buf0))
         {
@@ -527 +531 @@
           g= prodMod (S, M);
           S.removeFirst();
+          if (b.getp() != 0)
+            g= b(g);
           g /= content (g, x);
           if (fdivides (g, buf, quot))
@@ -892 +898 @@
   CFList diophant;
   CFList bufUniFactors= uniFactors;
+  CanonicalForm bufA= A;
+  CanonicalForm lcA0= 0;
+  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())));
+  }
   bufUniFactors.insert (LC (A, x));
   CFMatrix M= CFMatrix (liftBound, bufUniFactors.length() - 1);
@@ -902 +918 @@
   for (int i= 0; i < uniFactors.length(); i++)
     factorsFoundIndex [i]= 0;
-  CanonicalForm bufA= A;
 
   if (smallFactorDeg >= liftBound || degree (A,y) <= 4)
-    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, liftBound, Pi, diophant, M, true, b);
   else if (sizeOfLiftPre > 1 && sizeOfLiftPre < 30)
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, true, b);
     if (!extension)
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg);
+                            smallFactorDeg, b);
     else
       extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -924 +939 @@
         bufUniFactors.insert (LC (A, x));
         henselLiftResume12 (A, bufUniFactors, smallFactorDeg,
-                            liftPre[sizeOfLiftPre-1] + 1, Pi, diophant, M);
+                            liftPre[sizeOfLiftPre-1] + 1, Pi, diophant, M, b);
         if (!extension)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[sizeOfLiftPre-1] + 1);
+                                liftPre[sizeOfLiftPre-1] + 1, b);
         else
           extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -945 +960 @@
         bufUniFactors.insert (LC (A, x));
         henselLiftResume12 (A, bufUniFactors, liftPre[i] + 1,
-                            liftPre[i-1] + 1, Pi, diophant, M);
+                            liftPre[i-1] + 1, Pi, diophant, M, b);
         if (!extension)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                                 factorsFoundIndex, degs, earlySuccess,
-                                liftPre[i-1] + 1);
+                                liftPre[i-1] + 1, b);
         else
           extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -968 +983 @@
   else
   {
-    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M);
+    henselLift12 (A, bufUniFactors, smallFactorDeg, Pi, diophant, M, true, b);
     if (!extension)
       earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
                             factorsFoundIndex, degs, earlySuccess,
-                            smallFactorDeg);
+                            smallFactorDeg, b);
     else
       extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -985 +1000 @@
       bufUniFactors.insert (LC (A, x));
       henselLiftResume12 (A, bufUniFactors, smallFactorDeg,
-                          dummy, Pi, diophant, M);
+                          dummy, Pi, diophant, M, b);
       if (!extension)
         earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                              factorsFoundIndex, degs, earlySuccess, dummy);
+                              factorsFoundIndex, degs, earlySuccess, dummy, b);
       else
         extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
@@ -1001 +1016 @@
         dummy= tmin (degree (A,y)+1, (degree (A,y)/4)*(i+1)+4);
         henselLiftResume12 (A, bufUniFactors, (degree (A,y)/4)*i + 4,
-                            dummy, Pi, diophant, M);
+                            dummy, Pi, diophant, M, b);
         if (!extension)
           earlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,
-                                factorsFoundIndex, degs, earlySuccess, dummy);
+                                factorsFoundIndex, degs, earlySuccess, dummy,b);
         else
           extEarlyFactorDetection (earlyFactors, bufA, bufUniFactors, newLiftBound,