Changeset fcd296 in git for factory/facFactorize.cc

Timestamp:

Aug 15, 2012, 2:31:04 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

8d2c116a855f5479558e951ec926b7e92a2c0ac0

Parents:

8797746f0462992c4a00f27f0837b923a3f847de

git-author:

Martin Lee <martinlee84@web.de>2012-08-15 14:31:04+02:00

git-committer:

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

Message:

chg: if heuristics fail try again without heuristic

File:

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

factory/facFactorize.cc

@@ -903 +903 @@
 
   CanonicalForm LCmultiplier= leadingCoeffs.getFirst();
+  bool LCmultiplierIsConst= LCmultiplier.inCoeffDomain();
   leadingCoeffs.removeFirst();
 
@@ -921 +922 @@
 
   CFListIterator iter2;
+  CFList bufLeadingCoeffs2= leadingCoeffs2[A.level()-3];
+  bufBiFactors= biFactors;
+  bufA= A;
   CFList bufFactors= CFList();
+  bool LCheuristic= false;
   if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
                                 factors))
@@ -973 +978 @@
     else if (!LCmultiplier.inCoeffDomain() && factors.length() == 0)
     {
+      LCheuristic= true;
       factors= oldFactors;
       CanonicalForm cont;
@@ -1071 +1077 @@
                 break;
               }
-              else //factor is consists of just leading coeff
+              else //factor consists of just leading coeff
               {
                 CanonicalForm vars=getVars (iter.getItem());
@@ -1084 +1090 @@
                   factor= LC (getItem (oldAeval[i], index),1);
                   if ((factor.inCoeffDomain() && degree (vars,xx) > 0) ||
-                      (degree (factor,xx) > 0 && degree (vars,xx) < 0)) //scan for bivariate factors with leading coeff that does not contain variables which occur in LCmultiplier
+                      (degree (factor,xx) > 0 && degree (vars,xx) <= 0)) //scan for bivariate factors with leading coeff that does not contain variables which occur in LCmultiplier
                   {
                     oneVariableNotInCommon= true;
@@ -1169 +1175 @@
   }
 
+tryAgainWithoutHeu:
   //shifting to zero
   A= shift2Zero (A, Aeval, evaluation);
@@ -1254 +1261 @@
   if (noOneToOne)
   {
+    if (!LCmultiplierIsConst && LCheuristic)
+    {
+      A= bufA;
+      biFactors= bufBiFactors;
+      leadingCoeffs2[A.level()-3]= bufLeadingCoeffs2;
+      delete [] liftBounds;
+      LCheuristic= false;
+      goto tryAgainWithoutHeu;
+      //something probably went wrong in the heuristic
+    }
+
     A= shift2Zero (oldA, Aeval, evaluation);
     biFactors= oldBiFactors;