Changeset c79a9d in git for factory/facFqFactorize.cc

Timestamp:

Oct 13, 2011, 1:21:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

5f9b47ed5a8e9e527497f05d9afe96ec3e076cbf

Parents:

3e70950f6eff7e879a05817dd9e4bb45aeb175ca

Message:

bug fix in squarefree factorization and faster way to recover factors in factorization


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

File:

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

factory/facFqFactorize.cc

@@ -1990 +1990 @@
 }
 
+CFList recoverFactors (const CanonicalForm& F, const CFList& factors,
+                       const CFList& evaluation)
+{
+  CFList result;
+  CanonicalForm tmp, tmp2;
+  CanonicalForm G= F;
+  for (CFListIterator i= factors; i.hasItem(); i++)
+  {
+    tmp= reverseShift (i.getItem(), evaluation);
+    tmp /= content (tmp, 1);
+    if (fdivides (tmp, G, tmp2))
+    {
+      G= tmp2;
+      result.append (tmp);
+    }
+  }
+  return result;
+}
+
 CFList
 extNonMonicFactorRecombination (const CFList& factors, const CanonicalForm& F,
-                                const ExtensionInfo& info,
-                                const CFList& evaluation)
+                                const ExtensionInfo& info)
 {
   Variable alpha= info.getAlpha();
@@ -2034 +2052 @@
           T.removeFirst();
           result.append (g/myContent (g));
-          g= reverseShift (g, evaluation);
           g /= Lc (g);
           appendTestMapDown (result, g, info, source, dest);
@@ -2040 +2057 @@
         }
         else
-        {
-          buf= reverseShift (buf, evaluation);
           return CFList (buf);
-        }
       }
 
@@ -2053 +2067 @@
       if (fdivides (g, buf, quot))
       {
-        buf2= reverseShift (g, evaluation);
+        buf2= g;
         buf2 /= Lc (buf2);
         if (!k && beta == Variable (1))
@@ -2082 +2096 @@
           {
             delete [] v;
-            buf= reverseShift (buf, evaluation);
             buf /= Lc (buf);
             appendTestMapDown (result, buf, info, source, dest);
@@ -2098 +2111 @@
     {
       delete [] v;
-      buf= reverseShift (buf, evaluation);
       appendTestMapDown (result, buf, info, source, dest);
       return result;
@@ -2107 +2119 @@
   }
   if (T.length() < 2*s)
-  {
-    buf= reverseShift (F, evaluation);
-    appendMapDown (result, buf, info, source, dest);
-  }
+    appendMapDown (result, F, info, source, dest);
 
   delete [] v;
@@ -2317 +2326 @@
     evaluationWRTDifferentSecondVars (bufAeval2, bufEvaluation, A);
 
-    for (int j= 0; j < A.level() - 1; j++)
+    for (int j= 0; j < A.level() - 2; j++)
     {
       if (!bufAeval2[j].isEmpty())
@@ -2515 +2524 @@
                                Pi, liftBounds, liftBoundsLength, noOneToOne);
 
+
   if (!noOneToOne)
   {
     int check= factors.length();
-    factors= recoverFactors (A, factors);
+    A= reverseShift (oldA, evaluation);
+    factors= recoverFactors (A, factors, evaluation);
     if (check != factors.length())
       noOneToOne= true;
 
     if (extension && !noOneToOne)
-      factors= extNonMonicFactorRecombination (factors, oldA, info, evaluation);
+      factors= extNonMonicFactorRecombination (factors, A, info);
   }
   if (noOneToOne)
@@ -2580 +2591 @@
     if (earlySuccess)
       factors= Union (factors, earlyFactors);
-  }
-
-  if (!extension)
-  {
-    for (CFListIterator i= factors; i.hasItem(); i++)
-    {
-      int kk= Aeval.getLast().level();
-      for (CFListIterator j= evaluation; j.hasItem(); j++, kk--)
-      {
-        if (i.getItem().level() < kk)
-          continue;
-        i.getItem()= i.getItem() (Variable (kk) - j.getItem(), kk);
-      }
-    }
-  }
+    if (!extension)
+    {
+      for (CFListIterator i= factors; i.hasItem(); i++)
+      {
+        int kk= Aeval.getLast().level();
+        for (CFListIterator j= evaluation; j.hasItem(); j++, kk--)
+        {
+          if (i.getItem().level() < kk)
+            continue;
+          i.getItem()= i.getItem() (Variable (kk) - j.getItem(), kk);
+        }
+      }
+    }
+  }
+
+
 
   if (v.level() != 1)