Changeset 4e6d2a in git

Timestamp:

Mar 6, 2012, 11:37:13 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5f92d88b0eec18a7d7e49c0c59e91b75d6d487ee

Parents:

2fbb9e6eb79d5cf73b07f1b64fb533282be9a0e2

git-author:

Martin Lee <martinlee84@web.de>2012-03-06 11:37:13+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:26+02:00

Message:

chg: use a big prime instead of a small prime in coeff bound
fix: map recResult in Z/p in diophantineHensel

Location:

factory

Files:

• facBivar.cc (modified) (3 diffs)
• facHensel.cc (modified) (2 diffs)

factory/facBivar.cc

@@ -58 +58 @@
       {
         find_good_prime(i.coeff(),start);
-        if (0==cf_getSmallPrime(start)) return;
-        if((i.exp()!=0) && ((i.exp() % cf_getSmallPrime(start))==0))
+        if (0==cf_getBigPrime(start)) return;
+        if((i.exp()!=0) && ((i.exp() % cf_getBigPrime(start))==0))
         {
           start++;
@@ -73 +73 @@
     if (f.inZ())
     {
-      if (0==cf_getSmallPrime(start)) return;
-      while((!f.isZero()) && (mod(f,cf_getSmallPrime(start))==0))
+      if (0==cf_getBigPrime(start)) return;
+      while((!f.isZero()) && (mod(f,cf_getBigPrime(start))==0))
       {
         start++;
-        if (0==cf_getSmallPrime(start)) return;
+        if (0==cf_getBigPrime(start)) return;
       }
     }
@@ -594 +594 @@
     find_good_prime(Aeval,i);
     find_good_prime(A,i);
-    if (i >= cf_getNumSmallPrimes())
+    if (i >= cf_getNumBigPrimes())
       printf ("out of primes\n"); //TODO exit
 
-    int p=cf_getSmallPrime(i);
+    int p=cf_getBigPrime(i);
     b = coeffBound( A, p );
     modpk bb= coeffBound (Aeval, p);

factory/facHensel.cc

@@ -412 +412 @@
   CFList s;
   CFList result= recResult;
+  setCharacteristic (p);
+  recResult= mapinto (recResult);
+  setCharacteristic (0);
   CanonicalForm g;
   CanonicalForm modulus= p;
@@ -430 +433 @@
       {
         setCharacteristic (p);
-        g= coeffE*j.getItem();
+        g= mulNTL (coeffE, j.getItem());
         g= modNTL (g, bufFactors[ii]);
         setCharacteristic (0);