Changeset 03ac3b in git for Singular/misc_ip.cc

Timestamp:

Oct 4, 2010, 12:59:20 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3dabc0a263c826086e25e57f280b9aa6a32bdec4

Parents:

2a33e61c9baf5e72b38a197992a67ff69c2caac4

Message:

primefactors: limits

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

File:

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

Singular/misc_ip.cc

@@ -186 +186 @@
 
 /* n and pBound are assumed to be bigint numbers */
-lists primeFactorisation(const number n, const number pBound)
+lists primeFactorisation(const number n, number pBound)
 {
   mpz_t nn; number2mpz(n, nn);
@@ -220 +220 @@
     unsigned long p_ui=5; add = 2;
     mpz_sqrt(sr, nn);
-    if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
-    unsigned long  limit=mpz_get_ui(pb);
-    if ((limit==0)||(mpz_cmp_ui(pb,limit)!=0)) limit=1<<31;
+    unsigned long  limit=nlInt(pBound,NULL);
+    if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) 
+    {
+      mpz_set(pb, sr);
+      mpz_set(b, sr);
+      limit=mpz_get_ui(sr);
+    }
+    else if (limit==0)
+    {
+      limit=1<<31;
+      mpz_set_ui(pb,limit);
+      mpz_set_ui(b,limit);
+    }
     while (p_ui <=limit)
     {
@@ -232 +242 @@
         //mpz_sqrt(sr, nn);
         //if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
-        if (mpz_size1(nn)<=2)
+        if (mpz_size1(nn)<=1)
         {
           mpz_sqrt(sr, nn);
-          if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
+          if (mpz_cmp(pb, sr) > 0) mpz_set(pb, sr);
           unsigned long l=mpz_get_ui(sr);
-          if (l<limit) limit=l;
+          if (l<limit) { limit=l; }
           if (mpz_size1(nn)<=1)
           {
@@ -248 +258 @@
                 setListEntry_ui(primes, index, p_ui);
                 multiplicities[index++] = tt;
-                if (nn_ui>(limit/6)) limit=nn_ui/6;
+                if (nn_ui<(limit/6)) { limit=nn_ui/6;}
               }
               p_ui +=add;