Changeset 4553b1 in git for factory

Timestamp:

Apr 19, 2013, 3:56:48 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

809d634e3370e14c61f7b1ee234231400c570c0f

Parents:

f7ed7dc2ce876bee21478ae1bf88e2734992bcd8

git-author:

Martin Lee <martinlee84@web.de>2013-04-19 15:56:48+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-05-02 11:42:39+02:00

Message:

fix: univariate abs. factorization

File:

• factory/facAbsFact.h (modified) (5 diffs)

factory/facAbsFact.h

@@ -37 +37 @@
   CFFListIterator i= rationalFactors;
   i++;
-  CanonicalForm mipo;
+  Variable alpha;
   CFAFList result;
+  CFFList QaFactors;
+  CFFListIterator iter;
   for (; i.hasItem(); i++)
   {
-    mipo= rootOf (i.getItem().factor());
-    result.append (CFAFactor (i.getItem().factor(), mipo, i.getItem().exp()));
+    if (degree (i.getItem().factor()) == 1)
+    {
+      alpha= rootOf (Variable (1));
+      result.append (CFAFactor (i.getItem().factor(), getMipo (alpha),
+                                i.getItem().exp()));
+      continue;
+    }
+    alpha= rootOf (i.getItem().factor());
+    QaFactors= factorize (i.getItem().factor(), alpha);
+    iter= QaFactors;
+    if (iter.getItem().factor().inCoeffDomain())
+      iter++;
+    for (;iter.hasItem(); iter++)
+    {
+      if (degree (iter.getItem().factor()) == 1)
+      {
+        result.append (CFAFactor (iter.getItem().factor(), getMipo (alpha),
+                                  i.getItem().exp()));
+        break;
+      }
+    }
   }
   result.insert (CFAFactor (rationalFactors.getFirst().factor(), 1, 1));
@@ -58 +79 @@
   //TODO handle homogeneous input
   ASSERT (getNumVars (F) == 2, "expected bivariate input");
-  ASSERT (getCharacteristic() == 0 && isOn (SW_RATIONAL), "expected poly over Q");
+  ASSERT (getCharacteristic() == 0 && isOn (SW_RATIONAL),
+          "expected poly over Q");
 
   CFMap N;
@@ -64 +86 @@
   bool isRat= isOn (SW_RATIONAL);
   if (isRat)
-  {
     F *= bCommonDen (F);
-    Off (SW_RATIONAL);
-  }
+
+  Off (SW_RATIONAL);
   F /= icontent (F);
   if (isRat)
@@ -112 +133 @@
   }
 
-
   for (CFAFListIterator i= result; i.hasItem(); i++)
     i.getItem()= CFAFactor (N (i.getItem().factor()), i.getItem().minpoly(),
@@ -124 +144 @@
   normalize (result);
   result.insert (CFAFactor (Lc(G), 1, 1));
+
   return result;
 }