Changeset 237c42 in git for factory/facHensel.cc

Timestamp:

Oct 17, 2012, 10:37:28 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b37b3984a12e1552c7bafc9fd5a7849240ea7980

Parents:

72f1e4ba707e83cf6b23e8920fb57f610d7ef8bc

git-author:

Martin Lee <martinlee84@web.de>2012-10-17 10:37:28+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-18 17:42:58+02:00

Message:

fix: factorization over Q(a) if minimal polynomial has denominator
fix: more failed assertions

File:

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

factory/facHensel.cc

@@ -544 +544 @@
   }
 
+  setReduce (alpha, false);
   for (k= 0; k < factors.length(); k++)
   {
@@ -554 +555 @@
     }
   }
+  setReduce (alpha, true);
   setCharacteristic(0);
 
@@ -591 +593 @@
   }
   setCharacteristic (p);
+  setReduce (alpha, false);
   recResult= mapinto (recResult);
+  setReduce (alpha, true);
   if (mipoHasDen)
   {
@@ -606 +610 @@
     coeffE= div (e, modulus);
     setCharacteristic (p);
+    if (mipoHasDen)
+      setReduce (gamma, false);
+    else
+      setReduce (alpha, false);
     coeffE= coeffE.mapinto();
+    if (mipoHasDen)
+      setReduce (gamma, true);
+    else
+      setReduce (alpha, true);
     if (mipoHasDen)
       coeffE= replacevar (coeffE, gamma, beta);
@@ -619 +631 @@
       {
         setCharacteristic (p);
+        setReduce (alpha, false);
         g= mulNTL (coeffE, j.getItem());
         g= modNTL (g, bufFactors[ii]);
+        setReduce (alpha, true);
         setCharacteristic (0);
         if (mipoHasDen)
         {
+          setReduce (beta, false);
           k.getItem() += replacevar (g.mapinto()*modulus, beta, gamma);
           e -= mulNTL (replacevar (g.mapinto(), beta, gamma)*modulus,
                                    l.getItem(), b);
+          setReduce (beta, true);
         }
         else