Changeset 9e74d36 in git

Timestamp:

May 22, 2014, 3:12:08 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

311dbd7ee168c47e2035bb6610892cdcc61130eb

Parents:

42aa8b885057d0efb3d7c9eb85289d8d9b2e1e7f

git-author:

Martin Lee <martinlee84@web.de>2014-05-22 15:12:08+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-06-04 11:54:57+02:00

Message:

chg: break factor recovery earlier
chg: make sure factor's not a constant from the alg. func. field

Location:

factory

Files:

• facAlgExt.cc (modified) (1 diff)
• facAlgFunc.cc (modified) (6 diffs)

factory/facAlgExt.cc

@@ -225 +225 @@
         else
           tmp2.append (factor);
+        if (buf.inCoeffDomain())
+          break;
         count++;
         if (normFactors.length() - 1 == count)

factory/facAlgFunc.cc

@@ -430 +430 @@
 {
   bool isRat= isOn (SW_RATIONAL);
-  CFFList L, sqrfFactors, Factorlist, tmp;
+  CFFList L, normFactors, tmp;
   CFFListIterator iter, iter2;
   CanonicalForm R, Rstar, s, g, h, f= F;
@@ -448 +448 @@
     if (!isRat && getCharacteristic() == 0)
       On (SW_RATIONAL);
-    Factorlist= factorize (g, alpha);
-
-    for (iter= Factorlist; iter.hasItem(); iter++)
+    tmp= factorize (g, alpha); // factorization over number field
+
+    for (iter= tmp; iter.hasItem(); iter++)
     {
       h= iter.getItem().factor();
@@ -508 +508 @@
     {
       f= iter.getItem().factor();
-      sqrfFactors= norm (f, Rstar, *Gen, s, g, R, false);
+      (void) norm (f, Rstar, *Gen, s, g, R, false);
 
       if (hasFirstAlgVar (R, X))
-        Factorlist= factorize (R, X);
+        normFactors= factorize (R, X);
       else
-        Factorlist= factorize (R);
-
-      if (!Factorlist.getFirst().factor().inCoeffDomain())
-        Factorlist.insert (CFFactor (1, 1));
-      if (Factorlist.length() == 2 && Factorlist.getLast().exp() == 1)
+        normFactors= factorize (R);
+
+      if (normFactors.getFirst().factor().inCoeffDomain())
+        normFactors.removeFirst();
+      if (normFactors.length() == 1 && normFactors.getLast().exp() == 1)
       {
         f= backSubst (f, backSubsts, Astar);
@@ -530 +530 @@
       {
         g= f;
-        for (iter2= Factorlist; iter2.hasItem(); iter2++)
+        int count= 0;
+        for (iter2= normFactors; iter2.hasItem(); iter2++)
         {
           CanonicalForm fnew= iter2.getItem().factor();
-          if (fnew.level() < Rstar.level()) //factor is a constant from the function field
+          if (fnew.level() <= Rstar.level()) //factor is a constant from the function field
             continue;
           else
@@ -547 +548 @@
           h /= vcontent (h, Rstar.mvar());
 
-          if (h.level() >= Rstar.level())
+          if (h.level() > Rstar.level())
           {
             g= divide (g, h, Rstarlist);
@@ -560 +561 @@
             else
               tmp.append (CFFactor (h, iter2.getItem().exp()));
+          }
+          count++;
+          if (g.level() <= Rstar.level())
+            break;
+          if (count == normFactors.length() - 1)
+          {
+            if (normFactors.getLast().exp() == 1 && g.level() > Rstar.level())
+            {
+              g= backSubst (g, backSubsts, Astar);
+              g= Prem (g, as);
+              g *= bCommonDen (g);
+              g /= vcontent (g, as.getFirst().mvar());
+              L.append (CFFactor (g, 1));
+            }
+            else if (normFactors.getLast().exp() > 1 &&
+                     g.level() > Rstar.level())
+            {
+              g /= vcontent (g, Rstar.mvar());
+              tmp.append (CFFactor (g, normFactors.getLast().exp()));
+            }
+            break;
           }
         }