Changeset 5079887 in git for factory/facFactorize.cc

Timestamp:

Aug 8, 2012, 5:08:59 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

79592ac0413bc31f4675cd016eba92870cff9765

Parents:

464b18c0e995f211723d02ba1f0e3764e16f8c67

git-author:

Martin Lee <martinlee84@web.de>2012-08-08 17:08:59+02:00

git-committer:

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

Message:

chg: remove factors that were successfully recovered by LucksWang

File:

• factory/facFactorize.cc (modified) (3 diffs)

factory/facFactorize.cc

@@ -906 +906 @@
   A /= hh;
 
-  if (size (A)/getNumVars (A) < 500 &&
-      LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
+  CFList bufFactors= CFList();
+  if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
                                 factors))
   {
-    int check= factors.length();
-    factors= recoverFactors (A, factors);
+    int check= biFactors.length();
+    int * index= new int [factors.length()];
+    CFList oldFactors= factors;
+    factors= recoverFactors (A, factors, index);
 
     if (check == factors.length())
     {
-
       if (w.level() != 1)
       {
-        for (CFListIterator iter= factors; iter.hasItem(); iter++)
+        for (iter= factors; iter.hasItem(); iter++)
           iter.getItem()= swapvar (iter.getItem(), w, y);
       }
@@ -924 +925 @@
       appendSwapDecompress (factors, contentAFactors, N, 0, 0, x);
       normalize (factors);
+      delete [] index;
       delete [] Aeval2;
       return factors;
     }
+    else if (factors.length() > 0)
+    {
+      int oneCount= 0;
+      CFList l;
+      for (int i= 0; i < check; i++)
+      {
+        if (index[i] == 1)
+        {
+          iter=biFactors;
+          for (int j=1; j <= i-oneCount; j++)
+            iter++;
+          iter.remove (1);
+          for (int j= 0; j < A.level() -2; j++)
+          {
+            l= leadingCoeffs2[j];
+            iter= l;
+            for (int k=1; k <= i-oneCount; k++)
+              iter++;
+            iter.remove (1);
+            leadingCoeffs2[j]=l;
+          }
+          oneCount++;
+        }
+      }
+      bufFactors= factors;
+      factors= CFList();
+    }
     else
       factors= CFList();
-  }
-
+    delete [] index;
+  }
 
   //shifting to zero
@@ -1013 +1042 @@
     if (check != factors.length())
       noOneToOne= true;
+    else
+      factors= Union (factors, bufFactors);
   }
   if (noOneToOne)