Changeset b7e5d0 in git

Timestamp:

Oct 3, 2012, 2:43:02 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

e2207eba351aca1bc6ad9378cbc90bce52ff1fc3

Parents:

65b813a15472ad024e1b30ff11d4f966ec98b53a

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-10-03 14:43:02+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-01-23 11:27:17+01:00

Message:

fix: primeFactorization: bound

File:

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

Singular/misc_ip.cc

@@ -69 +69 @@
 }
 
-
 /* Factoring with Pollard's rho method. stolen from GMP/demos */
 static unsigned add[] = {4, 2, 4, 2, 4, 6, 2, 6};
 
-int factor_using_division (mpz_t t, unsigned int limit,lists primes, int *multiplicities,int &index, unsigned long bound)
+static int factor_using_division (mpz_t t, unsigned int limit,lists primes, int *multiplicities,int &index, unsigned long bound)
 {
   mpz_t q, r;
@@ -167 +166 @@
 }
 
-void factor_using_pollard_rho (mpz_t n, unsigned long a, lists primes, int * multiplicities,int &index)
+static void factor_using_pollard_rho (mpz_t n, unsigned long a, lists primes, int * multiplicities,int &index)
 {
   mpz_t x, x1, y, P;
@@ -284 +283 @@
 }
 
-void factor (mpz_t t,lists primes,int *multiplicities,int &index,unsigned long bound)
+static void factor_gmp (mpz_t t,lists primes,int *multiplicities,int &index,unsigned long bound)
 {
   unsigned int division_limit;
@@ -306 +305 @@
         setListEntry(primes, index, t);
         multiplicities[index++] = 1;
-        mpz_set_ui(t,1);
+        mpz_set_ui(t,1);
       }
       else
@@ -330 +329 @@
       mpz_neg(nn,nn);
     }
-    factor(nn,primes,multiplicities,index,pBound);
+    factor_gmp(nn,primes,multiplicities,index,pBound);
   }
 
@@ -350 +349 @@
     multiplicitiesL->m[i].data = (void*)multiplicities[i];
   }
-  delete[] multiplicities;
+  omFree(multiplicities);
 
   lists L=(lists)omAllocBin(slists_bin);