Changeset 9899df in git

Timestamp:

Nov 11, 2010, 5:26:41 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

8b2ef529c04c7b3517f5001ff6c69e582bb9fd09

Parents:

c73520d5d0c7a156ce1ef3256417b5157e57cc61

Message:

mpz_mypow -> mpz_pow_ui, mpz_mypow_ui ->mpz_ui_pow_ui

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

Location:

factory

Files:

• fac_cantzass.cc (modified) (4 diffs)
• gmpext.h (modified) (1 diff)

factory/fac_cantzass.cc

@@ -62 +62 @@
             n = getMipo( alpha ).degree() * getMipo( beta ).degree();
         mpz_init( &qq );
-        mpz_mypow_ui( &qq, q, n );
+        mpz_ui_pow_ui ( &qq, q, n );
     }
     if ( LC( f ).isOne() )
@@ -235 +235 @@
 
     mpz_init( &m );
-    mpz_mypow_ui( &m, p, s );
+    mpz_ui_pow_ui ( &m, p, s );
     while ( mpz_cmp_si( &m, 0 ) != 0 )
     {
@@ -257 +257 @@
 
     mpz_init( &m );
-    mpz_mypow_ui( &m, p, s );
+    mpz_ui_pow_ui ( &m, p, s );
     mpz_sub_ui( &m, &m, 1 );
     mpz_fdiv_q_ui( &m, &m, 2 );
@@ -281 +281 @@
 
     mpz_init( &m );
-    mpz_mypow( &m, q, s );
+    mpz_pow_ui( &m, q, s );
     mpz_sub_ui( &m, &m, 1 );
     mpz_fdiv_q_ui( &m, &m, 2 );

factory/gmpext.h

@@ -20 +20 @@
 }
 
-inline void
-mpz_mypow_ui( MP_INT * result, int p, int n )
-{
-    if ( p == 0 )
-        mpz_set_ui( result, 0 );
-    else  if ( n == 0 )
-        mpz_set_ui( result, 1 );
-    else {
-        mpz_set_ui( result, p );
-        n--;
-        while ( n > 0 ) {
-            mpz_mul_ui( result, result, p );
-            n--;
-        }
-    }
-}
-
-inline void
-mpz_mypow( MP_INT * result, MP_INT * p, int n )
-{
-    // p == 0 && n == 0 should not happen since this function is only used
-    // in the factorizing algorithm
-    mpz_set( result, p );
-    n--;
-    while ( n > 0 ) {
-        mpz_mul( result, result, p );
-        n--;
-    }
-}
-
 #endif /* ! INCL_GMPEXT_H */