Changeset 7b5cb2 in git for factory/facSparseHensel.cc

Timestamp:

Aug 8, 2012, 1:31:30 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

8267b8f9ab43170a4026e7e570df48db4601a748

Parents:

97686ecde8614d72ee9d26e96dc9344df8a7da32

git-author:

Martin Lee <martinlee84@web.de>2012-08-08 13:31:30+02:00

git-committer:

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

Message:

chg: faster retrieval of terms
chg: LucksWangSparseHeuristic now returns also partial factors

File:

• factory/facSparseHensel.cc (modified) (7 diffs)

factory/facSparseHensel.cc

@@ -21 +21 @@
 #include "facFqFactorize.h"
 
-bool
+int
 LucksWangSparseHeuristic (const CanonicalForm& F, const CFList& factors,
                           int level, const CFList& leadingCoeffs, CFList& result)
@@ -66 +66 @@
   delete [] monomsLead;
 
-  CFArray termsF= getTerms (F);
-  sort (termsF);
+  CFArray termsF= getBiTerms (F);
+  if (termsF.size() > 450)
+  {
+    delete [] monoms;
+    return 0;
+  }
+  sort (termsF, level);
 
   CFList tmp;
@@ -80 +85 @@
   CanonicalForm H= prod (tmp);
   CFArray monomsH= getMonoms (H);
-  sort (monomsH);
-
-  groupTogether (termsF, level);
+  sort (monomsH,F.level());
+
   groupTogether (monomsH, F.level());
 
@@ -88 +92 @@
   {
     delete [] stripped2;
-    return false;
+    return 0;
   }
 
@@ -99 +103 @@
   {
     delete [] stripped2;
-    return false;
+    return 0;
   }
 
   CFArray A= getEquations (monomsH, termsF);
+  CFArray startingSolution= solution;
   CFArray newSolution= CFArray (solution.size());
   do
@@ -110 +115 @@
       break;
     if (!simplify (A, newSolution, F.level() + 1))
-    {
-      delete [] stripped2;
-      return false;
-    }
+      break;
     if (isZero (newSolution))
-    {
-      delete [] stripped2;
-      return false;
-    }
+      break;
     if (!merge (solution, newSolution))
-    {
-      delete [] stripped2;
-      return false;
-    }
+      break;
   } while (1);
 
 
   result= CFList();
+  if (isEqual (startingSolution, solution))
+  {
+    delete [] stripped2;
+    return 0;
+  }
   CanonicalForm factor;
   num= 0;
@@ -135 +136 @@
     factor= 0;
     for (j= 0; j < k; j++, num++)
+    {
+      if (solution [num].isZero())
+        continue;
       factor += solution [num]*stripped2[i][j];
+    }
     result.append (factor);
   }
 
   delete [] stripped2;
-  return true;
+  if (result.length() > 0)
+    return 1;
+  return 0;
 }