Changeset f377d6 in git for factory

Timestamp:

Jul 19, 2013, 5:23:05 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3e0c11d34cd0300998b687c191f99d28fea7f47c

Parents:

91ce59878acf5e8669fdebcfb3b4036d3963a6f5

git-author:

Martin Lee <martinlee84@web.de>2013-07-19 17:23:05+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-07-22 15:49:54+02:00

Message:

chg: leave Lucks sparse lifting earlier if input is too dense

Location:

factory

Files:

• facSparseHensel.cc (modified) (2 diffs)
• facSparseHensel.h (modified) (4 diffs)

factory/facSparseHensel.cc

@@ -27 +27 @@
                           int level, const CFList& leadingCoeffs, CFList& result)
 {
+  int threshold= 450;
+  CFArray termsF= getBiTerms (F, threshold);
+  if (termsF.size() > threshold)
+    return 0;
+  sort (termsF, level);
+
   CFArray* monoms= new CFArray [factors.length()];
   int i= 0;
@@ -67 +73 @@
 
   delete [] monomsLead;
-
-  CFArray termsF= getBiTerms (F);
-  if (termsF.size() > 450)
-  {
-    delete [] monoms;
-    return 0;
-  }
-  sort (termsF, level);
 
   CFList tmp;

factory/facSparseHensel.h

@@ -200 +200 @@
 /// helper function for getBiTerms
 inline CFArray
-getBiTerms_helper (const CanonicalForm& F, const CFMap& M)
+getBiTerms_helper (const CanonicalForm& F, const CFMap& M, int threshold)
 {
   CFArray buf= CFArray (size (F));
@@ -215 +215 @@
       buf[k]= M (i.coeff())*power (one,i.exp());
       k++;
+      if (k > threshold)
+        break;
       continue;
     }
     j= i.coeff();
-    for (;j.hasTerms(); j++, k++)
+    for (;j.hasTerms() && k <= threshold; j++, k++)
       buf[k]= power (one,i.exp())*power (two,j.exp())*M (j.coeff());
+    if (k > threshold)
+      break;
   }
   CFArray result= CFArray (k);
-  for (int i= 0; i < k; i++)
+  for (int i= 0; i < k && k <= threshold; i++)
     result[i]= buf[i];
   return result;
@@ -230 +234 @@
 /// Variable (2)
 inline CFArray
-getBiTerms (const CanonicalForm& F)
+getBiTerms (const CanonicalForm& F, int threshold)
 {
   if (F.inCoeffDomain())
@@ -255 +259 @@
   G= swapvar (G, Variable (2), Variable (F.level() - 1));
 
-  CFArray result= getBiTerms_helper (G, M);
+  CFArray result= getBiTerms_helper (G, M, threshold);
   return result;
 }