Changeset 001cc15 in git for factory/facSparseHensel.cc

Timestamp:

Sep 6, 2012, 7:11:17 PM (12 years ago)

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0b27942997f2964b33d7b6fb15f97e372d54fc5f

Parents:

24a77fb14c59fc78cc67eb5f6934a45d8862d99e107aac1a78fd9b689a33a864d23b7cfb1caa5bdf

Message:

Merge pull request #179 from mmklee/factory_fix_sw

Factory fix sw

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());
+  result= CFList();
   do
   {
@@ -112 +118 @@
     {
       delete [] stripped2;
-      return false;
+      return 0;
     }
     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 +138 @@
     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;
 }