Changeset c879ee in git for factory/facHensel.cc

Timestamp:

Oct 19, 2012, 6:38:54 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

05fd55e34baa83465ce4306966c9011d1a156232

Parents:

1bc7201c1a771fb5cc842ca4f475ba3ea91e697963e72b40a6237e50811b0e8745201177d25cb979

Message:

Merge pull request #193 from mmklee/64bitIntegersFactorySW

64bit integers factory sw

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