Changeset dc52c8 in git for Singular/misc_ip.cc

Timestamp:

Oct 5, 2010, 12:15:57 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

354d57c31490c4e447bb298f2e25eaaa537479eb

Parents:

0b274ab12b79e4b7100d18558780c99b40e24db6

Message:

primefacyors: opt

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

File:

• Singular/misc_ip.cc (modified) (6 diffs)

Singular/misc_ip.cc

@@ -220 +220 @@
     unsigned long p_ui=5; add = 2;
     BOOLEAN b_is_0=(mpz_cmp_ui(b, 0) == 0);
+    BOOLEAN sr_sets_pb=FALSE;
     mpz_sqrt(sr, nn);
     // there are 3 possible limits, we take the minimum:
@@ -229 +230 @@
     {
       mpz_set(pb, sr);
+      sr_sets_pb=TRUE;
     }
     if (mpz_cmp_ui(pb, limit)<0)
@@ -250 +252 @@
         {
           mpz_sqrt(sr, nn);
-          if (mpz_cmp(pb, sr) > 0) mpz_set(pb, sr);
+          if (sr_sets_pb || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
           unsigned long l=mpz_get_ui(sr);
           if (l<limit) { limit=l; }
@@ -267 +269 @@
               }
               p_ui +=add;
-              add += 2; if (add == 6) add = 2;
+              //add += 2; if (add == 6) add = 2;
+              add =2+2*(add==2);
             }
             mpz_set_ui(nn,nn_ui);
@@ -275 +278 @@
       }
       p_ui +=add;
-      add += 2; if (add == 6) add = 2;
+      //add += 2; if (add == 6) add = 2;
+      add =2+2*(add==2);
     }
     mpz_set_ui(p, p_ui);
     mpz_sqrt(sr, nn);
-    if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
+    if (b_is_0 || sr_sets_pb || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
     while (mpz_cmp(pb, p) >= 0)
     {
@@ -287 +291 @@
         setListEntry(primes, index, p);
         multiplicities[index++] = tt;
+        if (mpz_cmp_ui(nn,1)==0) break;
         mpz_sqrt(sr, nn);
-        if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
-        if (mpz_cmp_ui(nn,1)==0) break;
+        if (b_is_0 || sr_sets_pb || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
       }
       mpz_add_ui(p, p, add);
-      add += 2; if (add == 6) add = 2;
+      //add += 2; if (add == 6) add = 2;
+      add =2+2*(add==2);
     }
     if ((mpz_cmp_ui(nn, 1) > 0) &&