Changeset a07784 in git for factory/facFqBivar.cc

Timestamp:

Dec 5, 2012, 4:03:45 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ae900ff750a6fe0dbab70a5aa87cc48fc3dd280e

Parents:

b3646035aca6a8d660df952d443268649a51090907ff965ddd552fe3a981f417b2da928dca53a8f2

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese-pyobject

File:

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

factory/facFqBivar.cc

@@ -412 +412 @@
                 if (recombination)
                 {
-                  appendTestMapDown (result, buf (y - eval, y), info, source,
+                  buf= buf (y-eval,y);
+                  buf /= Lc (buf);
+                  appendTestMapDown (result, buf, info, source,
                                       dest);
                   F= 1;
@@ -439 +441 @@
       if (recombination)
       {
-        appendTestMapDown (result, buf (y - eval, y), info, source, dest);
+        buf= buf (y-eval,y);
+        buf /= Lc (buf);
+        appendTestMapDown (result, buf, info, source, dest);
         F= 1;
         return result;
@@ -591 +595 @@
             On (SW_RATIONAL);
           g /= content (g, x);
+          if (!isRat)
+          {
+            On (SW_RATIONAL);
+            g *= bCommonDen (g);
+            Off (SW_RATIONAL);
+            g /= icontent (g);
+            On (SW_RATIONAL);
+          }
           if (fdivides (g, buf, quot))
           {
@@ -762 +774 @@
             On (SW_RATIONAL);
           g /= content (g, x);
+          if (!isRat)
+          {
+            On (SW_RATIONAL);
+            g *= bCommonDen (g);
+            Off (SW_RATIONAL);
+            g /= icontent (g);
+            On (SW_RATIONAL);
+          }
           if (fdivides (g, buf, quot))
           {
@@ -1772 +1792 @@
     buf /= content (buf, x);
     buf2= buf (y-evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -1852 +1873 @@
     buf /= content (buf, x);
     buf2= buf (y-evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -2027 +2049 @@
       tmp1= tmp1 (y - evaluation, y);
       tmp2= tmp2 (y - evaluation, y);
+      tmp1 /= Lc (tmp1);
+      tmp2 /= Lc (tmp2);
       if (!k && beta == x && degree (tmp2, alpha) < 1 &&
           degree (tmp1, alpha) < 1)
@@ -2081 +2105 @@
     buf /= content (buf, x);
     buf2= buf (y - evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -2156 +2181 @@
       tmp1= tmp1 (y - evaluation, y);
       tmp2= tmp2 (y - evaluation, y);
+      tmp1 /= Lc (tmp1);
+      tmp2 /= Lc (tmp2);
       if (!k && beta == x && degree (tmp2, alpha) < 1 &&
           degree (tmp1, alpha) < 1)
@@ -2210 +2237 @@
     buf /= content (buf, x);
     buf2= buf (y - evaluation, y);
+    buf2 /= Lc (buf2);
     if (!k && beta == x)
     {
@@ -3556 +3584 @@
   {
     delete [] bounds;
-    CanonicalForm G= F;
+    Variable y= Variable (2);
+    CanonicalForm tmp= F (y - evaluation, y);
+    CFList source, dest;
+    tmp= mapDown (tmp, info, source, dest);
     F= 1;
-    return CFList (G);
+    return CFList (tmp);
   }
 
@@ -5663 +5694 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while (((degree (F,y)/4)*i+1) + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, ((degree (F,y)/4)+1)*i+4);
       if (l < dummy)
       {
@@ -5822 +5853 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
       if (l < dummy)
       {
@@ -5970 +6001 @@
   {
     i= 1;
-    while ((degree (F,y)/4)*i + 4 <= smallFactorDeg)
+    while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg)
       i++;
     while (i < 5)
     {
-      dummy= tmin (degree (F,y)+1, (degree (F,y)/4)*i+4);
+      dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4);
       if (l < dummy)
       {
@@ -6443 +6474 @@
     int factorsFound= 0;
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
-      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-#ifdef HAVE_FLINT
-                         (LCF), factorsFound, factorsFoundIndex, FLINTN, false
-#else
-                         (LCF), factorsFound, factorsFoundIndex, NTLN, false
+      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+#ifdef HAVE_FLINT
+                         factorsFound, factorsFoundIndex, FLINTN, false
+#else
+                         factorsFound, factorsFoundIndex, NTLN, false
 #endif
                         );
     else
-      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-                         (LCF), factorsFound, factorsFoundIndex, NTLNe, false
+      reconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+                         factorsFound, factorsFoundIndex, NTLNe, false
                         );
     if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
@@ -6879 +6910 @@
   {
     result= Union (result, smallFactors);
-    CanonicalForm MODl= power (y, degree (F) + 1 + degree (LC (F, 1)));
+    CanonicalForm MODl= power (y, degree (F) + 1);
     delete [] bounds;
     return Union (result, factorRecombination (bufUniFactors, F, MODl, degs, 1,
@@ -7132 +7163 @@
     return Union (smallFactors, extFactorRecombination
                                 (bufUniFactors, F,
-                                 power (y, degree (F) + 1 + degree (LCF)),info,
+                                 power (y, degree (F) + 1),info,
                                  degs, evaluation, 1, bufUniFactors.length()/2
                                 )
@@ -7185 +7216 @@
     int factorsFound= 0;
 
-    extReconstructionTry (result, bufF, bufUniFactors, degree (F) + 1 + degree
-                          (LCF), factorsFound, factorsFoundIndex, NTLN, false,
+    extReconstructionTry (result, bufF, bufUniFactors, degree (F) + 1,
+                          factorsFound, factorsFoundIndex, NTLN, false,
                           info, evaluation
                          );
@@ -7314 +7345 @@
     if (degs.getLength() == 1 || bufUniFactors.length() == 1)
     {
-      result.append (bufF);
+      CFList source, dest;
+      CanonicalForm tmp= bufF (y - evaluation, y);
+      tmp= mapDown (tmp, info, source, dest);
+      result.append (tmp);
       return result;
     }
@@ -7381 +7415 @@
   {
     result= Union (result, smallFactors);
-    CanonicalForm MODl= power (y, degree (F) + 1 + degree (LC (F, 1)));
+    CanonicalForm MODl= power (y, degree (F) + 1);
     delete [] bounds;
     return Union (result, extFactorRecombination (bufUniFactors, F, MODl, info,
@@ -7671 +7705 @@
     }
 
-    if (i == 0)
+    if (i == 0 && !extension)
     {
       if (subCheck1 > 0)