Changeset 93134c in git for factory/facFqBivar.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/facFqBivar.cc (modified) (7 diffs)

factory/facFqBivar.cc

@@ -276 +276 @@
   bool nosubset= false;
   bool recombination= false;
+  bool trueFactor= false;
   while (T.length() >= 2*s)
   {
@@ -319 +320 @@
           {
             buf2= g (y - eval, y);
-            appendTestMapDown (result, buf2, info, source, dest);
+            buf2 /= Lc (buf2);
+
             if (!k && beta == Variable (1))
             {
@@ -327 +329 @@
                 LCBuf= LC (buf, Variable (1));
                 recombination= true;
+                appendTestMapDown (result, buf2, info, source, dest);
+                trueFactor= true;
               }
             }
@@ -336 +340 @@
                 LCBuf= LC (buf, Variable (1));
                 recombination= true;
+                appendTestMapDown (result, buf2, info, source, dest);
+                trueFactor= true;
               }
             }
-            T= Difference (T, S);
-            // compute new possible degree pattern
-            bufDegs2= DegreePattern (T);
-            bufDegs1.intersect (bufDegs2);
-            bufDegs1.refine ();
-            if (T.length() < 2*s || T.length() == s ||
-                bufDegs1.getLength() == 1)
+            if (trueFactor)
             {
-              if (recombination)
+              T= Difference (T, S);
+              // compute new possible degree pattern
+              bufDegs2= DegreePattern (T);
+              bufDegs1.intersect (bufDegs2);
+              bufDegs1.refine ();
+              if (T.length() < 2*s || T.length() == s ||
+                  bufDegs1.getLength() == 1)
               {
-                appendTestMapDown (result, buf (y - eval, y), info, source,
-                                   dest);
-                return result;
+                if (recombination)
+                {
+                  appendTestMapDown (result, buf (y - eval, y), info, source,
+                                     dest);
+                  return result;
+                }
+                else
+                {
+                  appendMapDown (result, F (y - eval, y), info, source, dest);
+                  return result;
+                }
               }
-              else
-              {
-                appendMapDown (result, F (y - eval, y), info, source, dest);
-                return result;
-              }
+              trueFactor= false;
+              TT= copy (T);
+              indexUpdate (v, s, T.length(), nosubset);
+              if (nosubset) break;
             }
-            TT= copy (T);
-            indexUpdate (v, s, T.length(), nosubset);
-            if (nosubset) break;
           }
         }
@@ -609 +619 @@
   CanonicalForm M= power (y, deg);
   adaptedLiftBound= 0;
+  bool trueFactor= false;
   int d;
   if (degree (F) == degree (LCBuf))
@@ -646 +657 @@
               d -= degree (g) + degree (LC (g, Variable (1)));
               LCBuf= LC (buf, Variable (1));
+              trueFactor= true;
             }
           }
@@ -656 +668 @@
               d -= degree (g) + degree (LC (g, Variable (1)));
               LCBuf= LC (buf, Variable (1));
+              trueFactor= true;
             }
           }
-          T= Difference (T, CFList (i.getItem()));
-
-          // compute new possible degree pattern
-          bufDegs2= DegreePattern (T);
-          bufDegs1.intersect (bufDegs2);
-          bufDegs1.refine ();
-          if (bufDegs1.getLength() <= 1)
+          if (trueFactor)
           {
-            buf= buf (y - eval, y);
-            buf /= Lc (buf);
-            appendMapDown (result, buf, info, source, dest);
-            break;
+            T= Difference (T, CFList (i.getItem()));
+
+            // compute new possible degree pattern
+            bufDegs2= DegreePattern (T);
+            bufDegs1.intersect (bufDegs2);
+            bufDegs1.refine ();
+            trueFactor= false;
+            if (bufDegs1.getLength() <= 1)
+            {
+              buf= buf (y - eval, y);
+              buf /= Lc (buf);
+              appendMapDown (result, buf, info, source, dest);
+              break;
+            }
           }
         }