Changeset 6dfc39 in git for factory/facHensel.cc

Timestamp:

Nov 9, 2012, 7:27:54 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

b2c7a216311d3bac9e82e892f71b35269aa0886e

Parents:

86faffa8f6328861e386b04ff4aa1238a2145d25

git-author:

Martin Lee <martinlee84@web.de>2012-11-09 19:27:54+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-16 13:19:32+01:00

Message:

fix: bug in diophantineHenselQa

File:

• factory/facHensel.cc (modified) (5 diffs)

factory/facHensel.cc

@@ -535 +535 @@
   Variable beta;
   Off (SW_RATIONAL);
-  if (mipoHasDen)
-  {
-    setReduce (alpha, false);
-    modMipo= modMipo.mapinto();
-    modMipo /= lc (modMipo);
-    beta= rootOf (modMipo);
-    setReduce (alpha, true);
-  }
+  setReduce (alpha, false);
+  modMipo= modMipo.mapinto();
+  modMipo /= lc (modMipo);
+  beta= rootOf (modMipo);
+  setReduce (alpha, true);
 
   setReduce (alpha, false);
   for (k= 0; k < factors.length(); k++)
   {
-    if (!mipoHasDen)
-      bufFactors [k]= bufFactors[k].mapinto();
-    else
-    {
-      bufFactors [k]= bufFactors[k].mapinto();
-      bufFactors [k]= replacevar (bufFactors[k], alpha, beta);
-    }
+    bufFactors [k]= bufFactors[k].mapinto();
+    bufFactors [k]= replacevar (bufFactors[k], alpha, beta);
   }
   setReduce (alpha, true);
@@ -596 +588 @@
   recResult= mapinto (recResult);
   setReduce (alpha, true);
-  if (mipoHasDen)
-  {
-    for (CFListIterator i= recResult; i.hasItem(); i++)
-      i.getItem()= replacevar (i.getItem(), alpha, beta);
-  }
+
+  for (CFListIterator i= recResult; i.hasItem(); i++)
+    i.getItem()= replacevar (i.getItem(), alpha, beta);
 
   setCharacteristic (0);
@@ -621 +611 @@
     if (mipoHasDen)
       coeffE= replacevar (coeffE, gamma, beta);
+    else
+      coeffE= replacevar (coeffE, alpha, beta);
     setCharacteristic (0);
     if (!coeffE.isZero())
@@ -631 +623 @@
       {
         setCharacteristic (p);
-        setReduce (alpha, false);
         g= mulNTL (coeffE, j.getItem());
         g= modNTL (g, bufFactors[ii]);
-        setReduce (alpha, true);
         setCharacteristic (0);
         if (mipoHasDen)
@@ -641 +631 @@
           k.getItem() += replacevar (g.mapinto()*modulus, beta, gamma);
           e -= mulNTL (replacevar (g.mapinto(), beta, gamma)*modulus,
-                                   l.getItem(), b);
+                       l.getItem(), b);
           setReduce (beta, true);
         }
         else
         {
-          k.getItem() += g.mapinto()*modulus;
-          e -= mulNTL (g.mapinto()*modulus, l.getItem(), b);
+          k.getItem() += replacevar (g.mapinto()*modulus, beta, alpha);
+          e -= mulNTL (replacevar (g.mapinto()*modulus, beta, alpha),
+                       l.getItem(), b);
         }
         e= b(e);