Changeset 4fe8a3 in git for factory

Timestamp:

Dec 1, 2011, 6:39:27 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

ec16f0199ed44b447d2ee4b422e70390f093a942

Parents:

eefc3a498c04d352c93280e8e8d0cafe97f4e754

git-author:

Martin Lee <martinlee84@web.de>2011-12-01 18:39:27+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 18:00:42+01:00

Message:

add: switched on Lucks/Wang sparse heuristic

Location:

factory

Files:

• facFactorize.cc (modified) (1 diff)
• facFqFactorize.cc (modified) (1 diff)

factory/facFactorize.cc

@@ -846 +846 @@
   A /= hh;
 
+  if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
+      factors))
+  {
+    int check= factors.length();
+    factors= recoverFactors (A, factors);
+
+    if (check == factors.length())
+    {
+      appendSwapDecompress (factors, contentAFactors, N, 0, 0, x);
+      normalize (factors);
+      delete [] Aeval2;
+      return factors;
+    }
+    else
+      factors= CFList();
+  }
+
+
   //shifting to zero
   A= shift2Zero (A, Aeval, evaluation);

factory/facFqFactorize.cc

@@ -2571 +2571 @@
   A /= hh;
 
+  if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
+      factors))
+  {
+    int check= factors.length();
+    factors= recoverFactors (A, factors);
+
+    if (check == factors.length())
+    {
+      if (extension)
+        factors= extNonMonicFactorRecombination (factors, A, info);
+
+      appendSwapDecompress (factors, contentAFactors, N, swapLevel,
+                            swapLevel2, x);
+      normalize (factors);
+      delete [] Aeval2;
+      return factors;
+    }
+    else
+      factors= CFList();
+    //TODO handle this case
+  }
+
   A= shift2Zero (A, Aeval, evaluation);