Changeset c89740 in git for factory/facFqFactorize.cc

Timestamp:

Aug 21, 2012, 5:22:07 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

b30017f937034d50539db11d0bee89dc2991375c

Parents:

5dad7c78535e5d3163be097e8a0d3e8d69c6593e

git-author:

Martin Lee <martinlee84@web.de>2012-08-21 17:22:07+02:00

git-committer:

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

Message:

chg: minor improvements
chg: prepare for adding heuristics

File:

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

factory/facFqFactorize.cc

@@ -2287 +2287 @@
   CFList biFactors, bufBiFactors;
   CanonicalForm evalPoly;
-  int lift, bufLift;
+  int lift, bufLift, lengthAeval2= A.level()-2;
   double logarithm= (double) ilog2 (totaldegree (A));
   logarithm /= log2exp;
@@ -2293 +2293 @@
   if (factorNums < (int) logarithm)
     factorNums= (int) logarithm;
-  CFList* bufAeval2= new CFList [A.level() - 2];
-  CFList* Aeval2= new CFList [A.level() - 2];
+  CFList* bufAeval2= new CFList [lengthAeval2];
+  CFList* Aeval2= new CFList [lengthAeval2];
   int counter;
   int differentSecondVar= 0;
@@ -2351 +2351 @@
     evaluationWRTDifferentSecondVars (bufAeval2, bufEvaluation, A);
 
-    for (int j= 0; j < A.level() - 2; j++)
+    for (int j= 0; j < lengthAeval2; j++)
     {
       if (!bufAeval2[j].isEmpty())
@@ -2392 +2392 @@
       biFactors= bufBiFactors;
       lift= bufLift;
-      for (int j= 0; j < A.level() - 2; j++)
+      for (int j= 0; j < lengthAeval2; j++)
         Aeval2 [j]= bufAeval2 [j];
       differentSecondVar= counter;
@@ -2406 +2406 @@
         biFactors= bufBiFactors;
         lift= bufLift;
-        for (int j= 0; j < A.level() - 2; j++)
+        for (int j= 0; j < lengthAeval2; j++)
           Aeval2 [j]= bufAeval2 [j];
         differentSecondVar= counter;
@@ -2446 +2446 @@
   minFactorsLength= tmin (minFactorsLength, biFactors.length());
 
-  if (differentSecondVar == A.level() - 2)
+  if (differentSecondVar == lengthAeval2)
   {
     bool zeroOccured= false;
@@ -2480 +2480 @@
   CFList uniFactors= buildUniFactors (biFactors, evaluation.getLast(), y);
 
-  sortByUniFactors (Aeval2, A.level() - 2, uniFactors, evaluation);
-
-  CFList * oldAeval= new CFList [A.level() - 2]; //TODO use bufAeval2 for this
-  for (int i= 0; i < A.level() - 2; i++)
+  sortByUniFactors (Aeval2, lengthAeval2, uniFactors, evaluation);
+
+  CFList * oldAeval= new CFList [lengthAeval2]; //TODO use bufAeval2 for this
+  for (int i= 0; i < lengthAeval2; i++)
     oldAeval[i]= Aeval2[i];
 
@@ -2494 +2494 @@
   Variable v;
   CFList leadingCoeffs= precomputeLeadingCoeff (LC (A, 1), biFactorsLCs, alpha,
-                                          evaluation, Aeval2, A.level() - 2, v);
+                                          evaluation, Aeval2, lengthAeval2, v);
 
   if (v.level() != 1)
@@ -2512 +2512 @@
       }
     }
-    for (i= 0; i < A.level() - 2; i++)
+    for (i= 0; i < lengthAeval2; i++)
     {
       if (oldAeval[i].isEmpty())
@@ -2560 +2560 @@
   }
 
+  CanonicalForm LCmultiplier= leadingCoeffs.getFirst();
+  bool LCmultiplierIsConst= LCmultiplier.inCoeffDomain();
   leadingCoeffs.removeFirst();
 
   //prepare leading coefficients
-  CFList* leadingCoeffs2= new CFList [A.level() - 2];
+  CFList* leadingCoeffs2= new CFList [lengthAeval2];
   prepareLeadingCoeffs (leadingCoeffs2, A.level(), leadingCoeffs, biFactors,
                         evaluation);
@@ -2574 +2576 @@
   A /= hh;
 
+  CFListIterator iter2;
+  CFList bufLeadingCoeffs2= leadingCoeffs2[lengthAeval2-1];
+  bufBiFactors= biFactors;
+  bufA= A;
+  CanonicalForm bufLCmultiplier= LCmultiplier;
+  CanonicalForm testVars;
+  if (!LCmultiplierIsConst)
+  {
+    testVars= Variable (2);
+    for (int i= 0; i < lengthAeval2; i++)
+    {
+      if (!oldAeval[i].isEmpty())
+        testVars *= oldAeval[i].getFirst().mvar();
+    }
+  }
   CFList bufFactors= CFList();
-  if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level() - 3],
+  bool LCheuristic= false;
+  if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [lengthAeval2-1],
                                  factors))
   {
@@ -2586 +2604 @@
     {
       if (extension)
-        factors= extNonMonicFactorRecombination (factors, A, info);
+        factors= extNonMonicFactorRecombination (factors, bufA, info);       //TODO brauche hier ein bufA statt A
 
       if (v.level() != 1)
@@ -2613 +2631 @@
             iter++;
           iter.remove (1);
-          for (int j= 0; j < A.level() -2; j++)
+          for (int j= 0; j < lengthAeval2; j++)
           {
             l= leadingCoeffs2[j];
@@ -2638 +2656 @@
     iter.getItem()= iter.getItem () (y + evaluation.getLast(), y);
 
-  for (int i= 0; i < A.level() - 3; i++)
+  for (int i= 0; i < lengthAeval2-1; i++)
     leadingCoeffs2[i]= CFList();
-  for (iter= leadingCoeffs2[A.level() - 3]; iter.hasItem(); iter++)
+  for (iter= leadingCoeffs2[lengthAeval2-1]; iter.hasItem(); iter++)
   {
     iter.getItem()= shift2Zero (iter.getItem(), list, evaluation);
     for (int i= A.level() - 4; i > -1; i--)
     {
-      if (i + 1 == A.level() - 3)
+      if (i + 1 == lengthAeval2-1)
         leadingCoeffs2[i].append (iter.getItem() (0, i + 4));
       else