Changeset c5230d1 in git

Timestamp:

Aug 29, 2012, 11:14:00 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

e0047d770810456c8f4c046498d6f0d039013d14

Parents:

83e5de0ee327f62a667ed0f87e050ea331b13d39

git-author:

Martin Lee <martinlee84@web.de>2012-08-29 11:14:00+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-05 15:00:01+02:00

Message:

chg: do more bivariate factorization

File:

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

factory/facFactorize.cc

@@ -126 +126 @@
   CFList factors;
   CanonicalForm LCA= LC (A,1);
-  if (!LCA.inCoeffDomain())
-  {
-    for (int j= 0; j < A.level() - 2; j++)
-    {
-      if (!Aeval[j].isEmpty() && (degree (LCA, j+3) > 0))
-      {
-        v= Variable (Aeval[j].getFirst().level());
-
-        factors= ratBiSqrfFactorize (Aeval[j].getFirst(), w);
-
-        if (factors.getFirst().inCoeffDomain())
-          factors.removeFirst();
-
-        if (minFactorsLength == 0)
-          minFactorsLength= factors.length();
-        else
-          minFactorsLength= tmin (minFactorsLength, factors.length());
-
-        if (factors.length() == 1)
-        {
-          irred= true;
-          return;
-        }
-        sortList (factors, x);
-        Aeval [j]= factors;
-      }
-      else if (!Aeval[j].isEmpty())
-      {
-        Aeval[j]=CFList();
-      }
-    }
-  }
-  else
-  {
-    for (int j= 0; j < A.level() - 2; j++)
-      Aeval[j]= CFList();
+  for (int j= 0; j < A.level() - 2; j++)
+  {
+    if (!Aeval[j].isEmpty())
+    {
+      v= Variable (Aeval[j].getFirst().level());
+
+      factors= ratBiSqrfFactorize (Aeval[j].getFirst(), w);
+      if (factors.getFirst().inCoeffDomain())
+        factors.removeFirst();
+
+      if (minFactorsLength == 0)
+        minFactorsLength= factors.length();
+      else
+        minFactorsLength= tmin (minFactorsLength, factors.length());
+
+      if (factors.length() == 1)
+      {
+        irred= true;
+        return;
+      }
+      sortList (factors, x);
+      Aeval [j]= factors;
+    }
+    else if (!Aeval[j].isEmpty())
+      Aeval[j]=CFList();
   }
 }
@@ -728 +717 @@
     evaluationWRTDifferentSecondVars (bufAeval2, bufEvaluation, A);
 
-    for (int j= 0; j < A.level() - 1; j++)
+    for (int j= 0; j < lengthAeval2; j++)
     {
       if (!bufAeval2[j].isEmpty())
@@ -807 +796 @@
     refineBiFactors (A, biFactors, Aeval2, evaluation, minFactorsLength);
 
-  if (differentSecondVar == lengthAeval2 && getNumVars(LC(A,1)) == A.level()-1)
+  if (differentSecondVar == lengthAeval2)
   {
     bool zeroOccured= false;