Changeset 6f68e2b in git

Timestamp:

Sep 17, 2020, 4:45:37 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bbbc309031ddb6d2d4aaaa85bead583fd1860c07

Parents:

f61c736770348c2dfd0c8aa73d011e971b25ed16

Message:

fix: Singular.jl/issues/270

Location:

factory

Files:

• cf_factor.cc (modified) (4 diffs)
• fac_multivar.cc (modified) (4 diffs)

factory/cf_factor.cc

@@ -616 +616 @@
     else // multivariate,  char 0
     {
-      On (SW_RATIONAL);
       if (issqrfree)
       {
         #ifdef HAVE_NTL
+        On (SW_RATIONAL);
         CFList factors= ratSqrfFactorize (fz);
         for (CFListIterator i= factors; i.hasItem(); i++)
@@ -630 +630 @@
       {
         #ifdef HAVE_NTL
+        On (SW_RATIONAL);
         F = ratFactorize (fz);
         #else
@@ -635 +636 @@
         #endif
       }
-      Off (SW_RATIONAL);
     }
 
@@ -641 +641 @@
     if ( on_rational )
       On(SW_RATIONAL);
+    else
+      Off(SW_RATIONAL);
     if ( ! cd.isOne() )
     {

factory/fac_multivar.cc

@@ -161 +161 @@
       {
         find_good_prime(i.coeff(),start);
-        if (0==cf_getSmallPrime(start)) return;
+        if (start==cf_getNumSmallPrimes()) return;
         if((i.exp()!=0) && ((i.exp() % cf_getSmallPrime(start))==0))
         {
           start++;
+          if (start==cf_getNumSmallPrimes()) return;
           i=f;
         }
@@ -176 +177 @@
     if (f.inZ())
     {
-      if (0==cf_getSmallPrime(start)) return;
+      if (start==cf_getNumSmallPrimes()) return;
       while((!f.isZero()) && (mod(f,cf_getSmallPrime(start))==0))
       {
         start++;
-        if (0==cf_getSmallPrime(start)) return;
+        if (start==cf_getNumSmallPrimes()) return;
       }
     }
@@ -271 +272 @@
           find_good_prime(U0,i);
           find_good_prime(U,i);
-          int p=cf_getSmallPrime(i);
+          int p;
+          if (i==cf_getNumSmallPrimes()) p=0;
+          else p=cf_getSmallPrime(i);
           //printf("found:p=%d (%d)\n",p,i);
           if (p==0)
@@ -283 +286 @@
             prime_number=i;
           }
-          else prime_number++;
+          else prime_number++;
           // p!=0:
           modpk bb=coeffBound_old(U0,p);