Changeset 9905e9 in git

Timestamp:

Nov 26, 2014, 11:35:13 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

4d2a3539c40e545a3b264f0885793cdf5294ba00

Parents:

f4fc9b40c900a9c6dce877b3b60856d2c433e96224a96f82dce569832b57f81538dccd6dfab95db3

Message:

Merge pull request #676 from mmklee/lcheuristic

fix: LCHeuristic

File:

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

factory/facFqFactorize.cc

@@ -2621 +2621 @@
       iter2.getItem() *= power (xx, degree (LC (iter.getItem(),1), xx));
   }
-  CanonicalForm tmp;
+  CanonicalForm tmp, quot1, quot2, quot3;
   iter2= vars1;
   for (iter= leadingCoeffs[lengthAeval-1]; iter.hasItem(); iter++, iter2++)
@@ -2661 +2661 @@
             {
               tmp= ii.getItem().factor();
-              iter2.getItem() /= tmp;
-              CFListIterator iter3= evaluation;
-              for (int jj= A.level(); jj > 2; jj--, iter3++)
-                tmp= tmp (iter3.getItem(), jj);
-              if (!tmp.inCoeffDomain())
+              if (fdivides (tmp, iter2.getItem(), quot1))
               {
-                int index3= 1;
-                for (iter3= biFactors; iter3.hasItem(); iter3++, index3++)
+                CFListIterator iter3= evaluation;
+                for (int jj= A.level(); jj > 2; jj--, iter3++)
+                  tmp= tmp (iter3.getItem(), jj);
+                if (!tmp.inCoeffDomain())
                 {
-                  if (index3 == index2)
+                  int index3= 1;
+                  for (iter3= biFactors; iter3.hasItem(); iter3++, index3++)
                   {
-                    iter3.getItem() /= tmp;
-                    iter3.getItem() /= Lc (iter3.getItem());
-                    break;
+                    if (index3 == index2)
+                    {
+                      if (fdivides (tmp, iter3.getItem(), quot2))
+                      {
+                        if (fdivides (ii.getItem().factor(), A, quot3))
+                        {
+                          A               = quot3;
+                          iter2.getItem() = quot2;
+                          iter3.getItem() = quot3;
+                          iter3.getItem() /= Lc (iter3.getItem());
+                          break;
+                        }
+                      }
+                    }
                   }
                 }
               }
-              A /= ii.getItem().factor();
             }
           }
@@ -2699 +2708 @@
             {
               tmp= power (ii.getItem().factor(), ii.getItem().exp());
-              iter2.getItem() /= tmp;
-              A /= tmp;
-              CFListIterator iter3= evaluation;
-              for (int jj= A.level(); jj > 2; jj--, iter3++)
-                tmp= tmp (iter3.getItem(), jj);
-              if (!tmp.inCoeffDomain())
+              if (fdivides (tmp, A, quot1))
               {
-                int index3= 1;
-                for (iter3= biFactors; iter3.hasItem(); iter3++, index3++)
+                if (fdivides (tmp, iter2.getItem()))
                 {
-                  if (index3 == index2)
+                  CFListIterator iter3= evaluation;
+                  for (int jj= A.level(); jj > 2; jj--, iter3++)
+                    tmp= tmp (iter3.getItem(), jj);
+                  if (!tmp.inCoeffDomain())
                   {
-                    iter3.getItem() /= tmp;
-                    iter3.getItem() /= Lc (iter3.getItem());
-                    break;
+                    int index3= 1;
+                    for (iter3= biFactors; iter3.hasItem(); iter3++, index3++)
+                    {
+                      if (index3 == index2)
+                      {
+                        if (fdivides (tmp, iter3.getItem(), quot3))
+                        {
+                          A               =  quot1;
+                          iter2.getItem() =  quot2;
+                          iter3.getItem() =  quot3;
+                          iter3.getItem() /= Lc (iter3.getItem());
+                          break;
+                        }
+                      }
+                    }
                   }
                 }