Changeset dfa849 in git

Timestamp:

Aug 15, 2013, 11:52:09 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

f36755e8e4a754eb8a49487d0e998ed26a2b2c78

Parents:

5c6ceaf5ab0029bc759f3ded4a97613e94d728b0

git-author:

Martin Lee <martinlee84@web.de>2013-08-15 11:52:09+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-08-30 13:48:32+02:00

Message:

chg: compute mipo wrt. x and y
chg: more checks of mipos

File:

• factory/facAbsBiFact.cc (modified) (7 diffs)

factory/facAbsBiFact.cc

@@ -318 +318 @@
   bool yValid= !(Gpy.inCoeffDomain() || smallestFactorEvaly.inCoeffDomain() ||
                !gcd (Gpy, smallestFactorEvaly).inCoeffDomain());
-  if (!xValid && !yValid)
+  if (!xValid || !yValid)
   {
     rec= true;
@@ -329 +329 @@
   CanonicalForm mipo;
 
-  int loop, i;
-  if (xValid && yValid)
-  {
-    loop= 3;
-    i=1;
-  }
-  else if (xValid)
-  {
-    loop= 3;
-    i=2;
-  }
-  else
-  {
-    loop= 2;
-    i=1;
-  }
-
-  CFArray mipos= CFArray (loop-i);
-  for (; i < loop; i++)
+  CFArray mipos= CFArray (2);
+  CFFList mipoFactors;
+  for (int i= 1; i < 3; i++)
   {
     CanonicalForm Fi= F(eval[i-1],i);
@@ -424 +408 @@
     if (i == 2)
     {
-      NTLFpi= convertFacCF2NTLzzpX (smallestFactorEvalx/lc (smallestFactorEvalx));
-      NTLGpi= convertFacCF2NTLzzpX (Gpx/lc (Gpx));
+      NTLFpi=convertFacCF2NTLzzpX (smallestFactorEvalx/lc(smallestFactorEvalx));
+      NTLGpi=convertFacCF2NTLzzpX (Gpx/lc (Gpx));
     }
     else
     {
-      NTLFpi= convertFacCF2NTLzzpX (smallestFactorEvaly/lc (smallestFactorEvaly));
-      NTLGpi= convertFacCF2NTLzzpX (Gpy/lc (Gpy));
+      NTLFpi=convertFacCF2NTLzzpX (smallestFactorEvaly/lc(smallestFactorEvaly));
+      NTLGpi=convertFacCF2NTLzzpX (Gpy/lc (Gpy));
     }
     vec_zz_pX modFactors;
@@ -475 +459 @@
       mipo += M (j,1)*power (x,s-j);
 
-    CFFList mipoFactors= factorize (mipo);
-    mipoFactors.removeFirst();
+    mipoFactors= factorize (mipo);
+    if (mipoFactors.getFirst().factor().inCoeffDomain())
+      mipoFactors.removeFirst();
 
 #ifdef HAVE_FLINT
@@ -490 +475 @@
 
     if (mipoFactors.length() > 1 ||
-        (mipoFactors.length() == 1 && mipoFactors.getFirst().exp() > 1))
-    {
-      if (i+1 >= loop && ((loop-i == 1) || (loop-i==2 && mipos[0].isZero())))
-      {
+        (mipoFactors.length() == 1 && mipoFactors.getFirst().exp() > 1) ||
+         mipo.inCoeffDomain())
+    {
         rec=true;
         goto differentevalpoint;
-      }
     }
     else
-      mipos[loop-i-1]= mipo;
+      mipos[i-1]= mipo;
+  }
+
+  if (degree (mipos[0]) != degree (mipos[1]))
+  {
+    rec=true;
+    goto differentevalpoint;
   }
 
   On (SW_RATIONAL);
-  if (xValid && yValid && !mipos[0].isZero() && !mipos[1].isZero())
-  {
-    if (maxNorm (mipos[0]) < maxNorm (mipos[1]))
-      alpha= rootOf (mipos[0]);
-    else
-      alpha= rootOf (mipos[1]);
-  }
-  else if (xValid && yValid)
-  {
-    if (mipos[0].isZero())
-      alpha= rootOf (mipos[1]);
-    else
-      alpha= rootOf (mipos[0]);
-  }
+  if (maxNorm (mipos[0]) < maxNorm (mipos[1]))
+    alpha= rootOf (mipos[0]);
   else
-    alpha= rootOf (mipo);
+    alpha= rootOf (mipos[1]);
+
+  int wrongMipo= 0;
+
+  Variable beta;
+  if (maxNorm (mipos[0]) < maxNorm (mipos[1]))
+  {
+    mipoFactors= factorize (mipos[1], alpha);
+    if (mipoFactors.getFirst().factor().inCoeffDomain())
+      mipoFactors.removeFirst();
+    for (iter= mipoFactors; iter.hasItem(); iter++)
+    {
+      if (degree (iter.getItem().factor()) > 1)
+        wrongMipo++;
+    }
+    if (wrongMipo == mipoFactors.length())
+    {
+      rec=true;
+      goto differentevalpoint;
+    }
+    wrongMipo= 0;
+    beta= rootOf (mipos[1]);
+    mipoFactors= factorize (mipos[0], beta);
+    if (mipoFactors.getFirst().factor().inCoeffDomain())
+      mipoFactors.removeFirst();
+    for (iter= mipoFactors; iter.hasItem(); iter++)
+    {
+      if (degree (iter.getItem().factor()) > 1)
+        wrongMipo++;
+    }
+    if (wrongMipo == mipoFactors.length())
+    {
+      rec=true;
+      goto differentevalpoint;
+    }
+  }
+  else
+  {
+    mipoFactors= factorize (mipos[0], alpha);
+    if (mipoFactors.getFirst().factor().inCoeffDomain())
+      mipoFactors.removeFirst();
+    for (iter= mipoFactors; iter.hasItem(); iter++)
+    {
+      if (degree (iter.getItem().factor()) > 1)
+        wrongMipo++;
+    }
+    if (wrongMipo == mipoFactors.length())
+    {
+      rec=true;
+      goto differentevalpoint;
+    }
+    wrongMipo= 0;
+    beta= rootOf (mipos[0]);
+    mipoFactors= factorize (mipos[1], beta);
+    if (mipoFactors.getFirst().factor().inCoeffDomain())
+      mipoFactors.removeFirst();
+    for (iter= mipoFactors; iter.hasItem(); iter++)
+    {
+      if (degree (iter.getItem().factor()) > 1)
+        wrongMipo++;
+    }
+    if (wrongMipo == mipoFactors.length())
+    {
+      rec=true;
+      goto differentevalpoint;
+    }
+  }
+
 
   CanonicalForm F1;
-  CFFList QaF1Factors;
-  int wrongMipo= 0;
-  if (xValid && yValid)
-  {
-    if (degree (F,1) > minTdeg)
-      F1= F (eval[1], 2);
-    else
-      F1= F (eval[0], 1);
-  }
-  else if (xValid)
+  if (degree (F,1) > minTdeg)
     F1= F (eval[1], 2);
   else
     F1= F (eval[0], 1);
 
+  CFFList QaF1Factors;
   bool swap= false;
   if (F1.level() == 2)
@@ -543 +579 @@
   }
 
+  wrongMipo= 0;
   QaF1Factors= factorize (F1, alpha);
   if (QaF1Factors.getFirst().factor().inCoeffDomain())
@@ -554 +591 @@
   if (wrongMipo == QaF1Factors.length())
   {
-    if (xValid && yValid && !mipos[0].isZero() && !mipos[1].isZero())
-    {
-      if (maxNorm (mipos[0]) < maxNorm (mipos[1])) //try the other minpoly
-        alpha= rootOf (mipos[1]);
-      else
-        alpha= rootOf (mipos[0]);
-    }
-    else
-    {
-      rec= true;
-      F= bufF;
-      goto differentevalpoint;
-    }
-
-    wrongMipo= 0;
-    QaF1Factors= factorize (F1, alpha);
-    if (QaF1Factors.getFirst().factor().inCoeffDomain())
-      QaF1Factors.removeFirst();
-    for (iter= QaF1Factors; iter.hasItem(); iter++)
-    {
-      if (degree (iter.getItem().factor()) > minTdeg)
-        wrongMipo++;
-    }
-    if (wrongMipo == QaF1Factors.length())
-    {
-      rec= true;
-      F= bufF;
-      goto differentevalpoint;
-    }
+    rec= true;
+    F= bufF;
+    goto differentevalpoint;
   }