Changeset 493225 in git for factory/fac_multivar.cc

Timestamp:

Dec 8, 2009, 7:11:06 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

32c11ff616c40bb7c3d5c756479b0507e505f330

Parents:

42660f97810c6af10af57af395d99b9a04bb8dad

Message:

nWrite indep. from currRing

git-svn-id: file:///usr/local/Singular/svn/trunk@12377 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/fac_multivar.cc (modified) (3 diffs)

factory/fac_multivar.cc

@@ -157 +157 @@
       {
         find_good_prime(i.coeff(),start);
+        if (0==cf_getSmallPrime(start)) return;
         if((i.exp()!=0) && ((i.exp() % cf_getSmallPrime(start))==0))
         {
@@ -171 +172 @@
     if (f.inZ())
     {
-      while((f!=0) && (mod(f,cf_getSmallPrime(start))==0))
+      if (0==cf_getSmallPrime(start)) return;
+      while((!f.isZero()) && (mod(f,cf_getSmallPrime(start))==0))
       {
         start++;
+        if (0==cf_getSmallPrime(start)) return;
       }
     }
@@ -266 +269 @@
           int p=cf_getSmallPrime(i);
           //printf("found:p=%d (%d)\n",p,i);
-          if ((i==0)||(i!=prime_number))
+          if (p==0)
+          { 
+            printf("out of primes - switch ot non-NTL\n");
+            // non-NTL stuff
+             b = coeffBound( U, getZFacModulus().getp() );
+             if ( getZFacModulus().getpk() > b.getpk() )
+                b = getZFacModulus();
+          }
+          else if (((i==0)||(i!=prime_number)))
           {
             b = coeffBound( U, p );
             prime_number=i;
           }
-          modpk bb=coeffBound(U0,p);
-          if (bb.getk() > b.getk() ) b=bb;
-          bb=coeffBound(arg,p);
-          if (bb.getk() > b.getk() ) b=bb;
+          if (p!=0)
+          {
+            modpk bb=coeffBound(U0,p);
+            if (bb.getk() > b.getk() ) b=bb;
+            bb=coeffBound(arg,p);
+            if (bb.getk() > b.getk() ) b=bb;
+          }
         }
         #else