Changeset 3a3393b in git

Timestamp:

Feb 11, 2013, 11:22:59 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

21526f3a3a8893e6482d468ed91fc1c149fd5a8a

Parents:

c495caf38df6b3d6e99fe5e19ec696c49630e639

git-author:

Martin Lee <martinlee84@web.de>2013-02-11 11:22:59+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-18 15:16:28+01:00

Message:

chg: switched off search for new main variable

File:

• factory/facFqFactorize.cc (modified) (4 diffs)

factory/facFqFactorize.cc

@@ -2865 +2865 @@
   bool fail= false;
   int swapLevel2= 0;
-  int level;
+  //int level;
   int factorNums= 3;
   CFList biFactors, bufBiFactors;
@@ -2894 +2894 @@
     if (fail && (i == 0))
     {
-      if (!swapLevel)
+      /*if (!swapLevel) //uncomment to reenable search for new main variable
         level= 2;
       else
-        level= swapLevel + 1;
-
-      CanonicalForm g;
-      swapLevel2= newMainVariableSearch (A, Aeval, evaluation, alpha, level, g);
-
-      if (!swapLevel2) // need to pass to an extension
-      {
+        level= swapLevel + 1;*/
+
+      //CanonicalForm g;
+      //swapLevel2= newMainVariableSearch (A, Aeval, evaluation, alpha, level, g);
+
+      /*if (!swapLevel2) // need to pass to an extension
+      {*/
         factors= extFactorize (A, info);
         appendSwapDecompress (factors, contentAFactors, N, swapLevel, x);
@@ -2910 +2910 @@
         delete [] Aeval2;
         return factors;
-      }
+      /*}
       else
       {
@@ -2929 +2929 @@
         bufA= A;
         bufEvaluation= evaluation;
-      }
+      }*/ //end uncomment
     }
     else if (fail && (i > 0))