Changeset e0af3ef in git

Timestamp:

Jul 18, 2012, 9:44:06 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

8a30b16f7366d41b6243988673b9dc25cb0da4a5

Parents:

faa1b8d6e411251ef4c85b56aefa21b74f5db582

git-author:

Martin Lee <martinlee84@web.de>2012-07-18 21:44:06+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-04 17:25:37+02:00

Message:

fix: need polys over Z

Location:

factory

Files:

• facBivar.cc (modified) (2 diffs)
• facFqBivar.cc (modified) (11 diffs)

factory/facBivar.cc

@@ -645 +645 @@
   }
 
+  A *= bCommonDen (A);
   A= A (y + evaluation, y);
 
@@ -723 +724 @@
   }
 
+  On (SW_RATIONAL);
+  A *= bCommonDen (A);
+  Off (SW_RATIONAL);
+
   factors= factorRecombination (uniFactors, A, MODl, degs, 1,
                                 uniFactors.length()/2, b);

factory/facFqBivar.cc

@@ -269 +269 @@
     return CFList();
   }
+  if (F.inCoeffDomain())
+    return CFList();
 
   Variable alpha= info.getAlpha();
@@ -478 +480 @@
     return CFList ();
   }
+  if (F.inCoeffDomain())
+    return CFList();
   if (degs.getLength() <= 1 || factors.length() == 1)
   {
@@ -492 +496 @@
               (mod (b(LC (F, 1)*prodMod (factors, N)),N)/Lc (mod (b(LC (F, 1)*prodMod (factors, N)),N)) == F/Lc(F)));
 #endif
+
   CFList T, S;
 
@@ -513 +518 @@
   bool recombination= false;
   CanonicalForm test;
-  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) || getCharacteristic() > 0;
+  bool isRat= (isOn (SW_RATIONAL) && getCharacteristic() == 0) ||
+               getCharacteristic() > 0;
   if (!isRat)
     On (SW_RATIONAL);
@@ -519 +525 @@
   if (!isRat)
     Off (SW_RATIONAL);
-  buf0= buf(0,x)*LCBuf;
   while (T.length() >= 2*s && s <= thres)
   {
@@ -584 +589 @@
             recombination= true;
             result.append (g);
-            buf= quot;
+            if (b.getp() != 0)
+              buf= quot*bCommonDen (quot);
+            else
+              buf= quot;
             LCBuf= LC (buf, x);
             T= Difference (T, S);
@@ -703 +711 @@
   CanonicalForm buf= F;
   Variable x= Variable (1);
-  CanonicalForm LCBuf= LC (buf, x);
   CanonicalForm g, quot;
   CanonicalForm M= power (F.mvar(), deg);
@@ -711 +718 @@
   if (!isRat)
     On (SW_RATIONAL);
+  if (b.getp() != 0)
+    buf *= bCommonDen (buf);
+  CanonicalForm LCBuf= LC (buf, x);
   CanonicalForm buf0= mulNTL (buf (0,x), LCBuf);
   CanonicalForm buf1= mulNTL (buf (1,x), LCBuf);
@@ -746 +756 @@
             reconstructedFactors.append (g);
             factorsFoundIndex[l]= 1;
-            buf= quot;
+            if (b.getp() != 0)
+              buf= quot*bCommonDen(quot);
+            else
+              buf= quot;
             d -= degree (g);
             LCBuf= LC (buf, x);
@@ -762 +775 @@
             if (bufDegs1.getLength() <= 1)
             {
-              reconstructedFactors.append (buf);
+              if (!buf.inCoeffDomain())
+                reconstructedFactors.append (buf);
               break;
             }
@@ -858 +872 @@
           if (bufDegs1.getLength() <= 1)
           {
-            buf= buf (y - eval, y);
-            buf /= Lc (buf);
-            appendMapDown (reconstructedFactors, buf, info, source, dest);
+            if (!buf.inCoeffDomain())
+            {
+              buf= buf (y - eval, y);
+              buf /= Lc (buf);
+              appendMapDown (reconstructedFactors, buf, info, source, dest);
+            }
             break;
           }