Changeset 38f32d in git for Singular/misc_ip.cc

Timestamp:

Jul 13, 2010, 4:08:38 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

512f05c5a1ab245e49d1b2471320fe775eba0d43

Parents:

2545e05be20341593d047f69dc1f2f4d599ec80f

Message:

primefactors

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

File:

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

Singular/misc_ip.cc

@@ -282 +282 @@
   {
     mpz_tdiv_qr_ui (q, r, t, 3);
-    if (mpz_cmp_ui (r, 0) != 0) break;
+    if (mpz_cmp_ui (r, 0) != 0)  break;
     mpz_set (t, q);
     if ((L_ind>0) && (L[L_ind-1]==3)) ex[L_ind-1]++;
@@ -323 +323 @@
     {
       mpz_swap (t, q);
+      //gmp_printf("%d: %Zd\n",f,t);
       // here: f in 0,,2^28-1:
       if ((L_ind>0) && (L[L_ind-1]==(int)f)) ex[L_ind-1]++;
@@ -463 +464 @@
   if (mpz_cmp_ui (t, 1) != 0)
   {
-    if (mpz_probab_prime_p (t, 3))
-    {
-      if ((L_ind>0) && (mpz_cmp_si(t,L[L_ind-1])==0))
-      {
-        ex[L_ind-1]++;
-      }
-      else
+    if (mpz_probab_prime_p (t, 10))
+    {
+      int tt=mpz_get_si(t);
+      // check if t fits into int:
+      if ((mpz_size1(t)==1)&&(mpz_cmp_si(t,tt)==0))
       {
         L[L_ind]=mpz_get_si(t);
         L_ind++;
-      }
-      mpz_set_si(t,1);
+        mpz_set_si(t,1);
+      }
     }
     else
@@ -496 +495 @@
   else
   {
-    mpz_init_set(t,(mpz_ptr)nn);
+    mpz_init_set(t,(mpz_ptr)nn->z);
   }
   int *LL=(int*)omAlloc0(1000*sizeof(int));
@@ -504 +503 @@
 
   nnAsInt = mpz_get_si(t);
-  nlDelete(&nn,NULL);
-  if (mpz_cmp_si(t,nnAsInt)==0)
-  {
+  if ((mpz_size1(t)==1) && (mpz_cmp_si(t,nnAsInt)==0))
+  {
+    nlDelete(&nn,NULL);
     L->m[0].rtyp = INT_CMD;
     L->m[0].data = (void *)nnAsInt;
@@ -512 +511 @@
   else
   {
+    mpz_set(nn->z,t);
     L->m[0].rtyp = BIGINT_CMD;
-    L->m[0].data = (void *)t;
-  }
+    L->m[0].data = (void *)nn;
+  }
+  mpz_clear(t);
   int i;
   for(i=0;i<L_ind;i++) ex[i]++;