Changeset 587f72 in git

Timestamp:

Jul 23, 2010, 11:18:37 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

562b0c9545c1092666922dfc0979b71a2c7dd225

Parents:

40e810dce492e702bf0e751809ae911eaf670a12

Message:

primefactors

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

File:

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

Singular/misc_ip.cc

@@ -400 +400 @@
     mpz_div (n, n, g);        /* divide by g, before g is overwritten */
 
-    if (!mpz_probab_prime_p (g, 3))
+    if (!mpz_probab_prime_p (g, 10))
     {
       do
@@ -424 +424 @@
     mpz_mod (x1, x1, n);
     mpz_mod (y, y, n);
-    if (mpz_probab_prime_p (n, 3))
-    {
-      if ((L_ind>0) && (mpz_cmp_si(n,L[L_ind-1])==0)) ex[L_ind-1]++;
-      else
-      {
-        L[L_ind]=mpz_get_si(n);
-        L_ind++;
+    if (mpz_probab_prime_p (n, 10))
+    {
+      int te=mpz_get_si(n);
+      if (mpz_cmp_si(n,te)==0) /* does it fit into an int ? */
+      {
+        if ((L_ind>0) && (mpz_cmp_si(n,L[L_ind-1])==0)) ex[L_ind-1]++;
+        else
+        {
+          L[L_ind]=mpz_get_si(n);
+          L_ind++;
+        }
+        mpz_set_si(n,1); // add n itself the list of divisors, rest is 1
       }
       break;