Changeset 93134c in git for factory/facFqFactorize.cc

Timestamp:

Jan 19, 2011, 8:01:25 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

faacc9af4993a2cd9baf5e2c3630559360675eb3

Parents:

4de1db931b2c71801f39c4b547b80ca57afb81a5

Message:

bug fixes for factor recombination in case an extension is needed


git-svn-id: file:///usr/local/Singular/svn/trunk@13801 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/facFqFactorize.cc (modified) (4 diffs)

factory/facFqFactorize.cc

@@ -643 +643 @@
   TT= copy (factors);
   bool recombination= false;
+  bool trueFactor= false;
   while (T.length() >= 2*s)
   {
@@ -687 +688 @@
             LCBuf= LC (buf, Variable (1));
             recombination= true;
+            trueFactor= true;
           }
         }
@@ -697 +699 @@
             LCBuf= LC (buf, Variable (1));
             recombination= true;
+            trueFactor= true;
           }
         }
-        T= Difference (T, S);
-
-        if (T.length() < 2*s || T.length() == s)
-        {
-          buf= reverseShift (buf, evaluation);
-          buf /= Lc (buf);
-          appendTestMapDown (result, buf, info, source, dest);
-          return result;
-        }
-        TT= copy (T);
-        indexUpdate (v, s, T.length(), noSubset);
-        if (noSubset) break;
+
+        if (trueFactor)
+        {
+          T= Difference (T, S);
+
+          if (T.length() < 2*s || T.length() == s)
+          {
+            buf= reverseShift (buf, evaluation);
+            buf /= Lc (buf);
+            appendTestMapDown (result, buf, info, source, dest);
+            return result;
+          }
+          trueFactor= false;
+          TT= copy (T);
+          indexUpdate (v, s, T.length(), noSubset);
+          if (noSubset) break;
+        }
       }
     }
@@ -1064 +1072 @@
       gg= reverseShift (g, eval);
       gg /= Lc (gg);
-          if (!k && beta == Variable (1))
-          {
-            if (degree (gg, alpha) < degMipoBeta)
-            {
-              appendTestMapDown (result, gg, info, source, dest);
-              buf /= g;
-              nBuf= degree (g, y) + degree (LC (g, Variable (1)), y);
-              d -= nBuf;
-              e= tmax (e, nBuf);
-              LCBuf= LC (buf, Variable (1));
-            }
-          }
-          else
-          {
-            if (!isInExtension (gg, delta, k))
-            {
-              appendTestMapDown (result, gg, info, source, dest);
-              buf /= g;
-              nBuf= degree (g, y) + degree (LC (g, Variable (1)), y);
-              d -= nBuf;
-              e= tmax (e, nBuf);
-              LCBuf= LC (buf, Variable (1));
-            }
-          }
-      T= Difference (T, CFList (i.getItem()));
+      if (!k && beta == Variable (1))
+      {
+        if (degree (gg, alpha) < degMipoBeta)
+        {
+          appendTestMapDown (result, gg, info, source, dest);
+          buf /= g;
+          nBuf= degree (g, y) + degree (LC (g, Variable (1)), y);
+          d -= nBuf;
+          e= tmax (e, nBuf);
+          LCBuf= LC (buf, Variable (1));
+          T= Difference (T, CFList (i.getItem()));
+        }
+      }
+      else
+      {
+        if (!isInExtension (gg, delta, k))
+        {
+          appendTestMapDown (result, gg, info, source, dest);
+          buf /= g;
+          nBuf= degree (g, y) + degree (LC (g, Variable (1)), y);
+          d -= nBuf;
+          e= tmax (e, nBuf);
+          LCBuf= LC (buf, Variable (1));
+          T= Difference (T, CFList (i.getItem()));
+         }
+      }
     }
   }