Changeset 8c2051 in git

Timestamp:

Oct 4, 2010, 7:28:36 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

3112fe486f6ef925872fb0f70c02d25ff6328060

Parents:

4326e5b680361011d38f1ddc9d4295b9176cb475

Message:

primefactors: opt.

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

File:

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

Singular/misc_ip.cc

@@ -219 +219 @@
 
     unsigned long p_ui=5; add = 2;
+    BOOLEAN b_is_0=(mpz_cmp_ui(b, 0) == 0);
     mpz_sqrt(sr, nn);
     // there are 3 possible limits, we take the minimum:
@@ -224 +225 @@
     // - sr = sqrt(nn)
     // - 1<<31
-    unsigned long  limit=1<<31;
-    if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0))
+    unsigned long  limit=~(0L);
+    if (b_is_0 || (mpz_cmp(pb, sr) > 0))
     {
       mpz_set(pb, sr);
     }
-    if (mpz_cmp_ui(b, limit)<0)
+    if (mpz_cmp_ui(pb, limit)<0)
     {
      limit=mpz_get_ui(pb);
@@ -278 +279 @@
     mpz_set_ui(p, p_ui);
     mpz_sqrt(sr, nn);
-    if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
+    if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
     while (mpz_cmp(pb, p) >= 0)
     {
@@ -287 +288 @@
         multiplicities[index++] = tt;
         mpz_sqrt(sr, nn);
-        if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
+        if (b_is_0 || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
         if (mpz_cmp_ui(nn,1)==0) break;
       }
@@ -294 +295 @@
     }
     if ((mpz_cmp_ui(nn, 1) > 0) &&
-        ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(nn, pb) <= 0)))
+        (b_is_0 || (mpz_cmp(nn, pb) <= 0)))
     {
       setListEntry(primes, index, nn);