Changeset cacfb6 in git

Timestamp:

Apr 9, 2010, 10:11:55 AM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

8fc10886f09496df82af0116fe80edeeaeeaadc8

Parents:

f91fddc43db014d7355e8386a068d0a3772d2dcd

Message:

renamed some old gmp functions

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

Location:

factory

Files:

• fac_cantzass.cc (modified) (3 diffs)
• int_int.cc (modified) (1 diff)
• int_pp.cc (modified) (2 diffs)
• int_rat.cc (modified) (9 diffs)

factory/fac_cantzass.cc

@@ -236 +236 @@
     mpz_init( &m );
     mpz_mypow_ui( &m, p, s );
-    while ( mpz_cmp_si( &m, 0 ) != 0 ) {
-        odd = mpz_mdivmod_ui( &m, 0, &m, 2 );
+    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    {
+        odd = mpz_fdiv_q_ui( &m, &m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;
@@ -258 +259 @@
     mpz_mypow_ui( &m, p, s );
     mpz_sub_ui( &m, &m, 1 );
-    mpz_div_ui( &m, &m, 2 );
-    while ( mpz_cmp_si( &m, 0 ) != 0 ) {
-        odd = mpz_mdivmod_ui( &m, 0, &m, 2 );
+    mpz_fdiv_q_ui( &m, &m, 2 );
+    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    {
+        odd = mpz_fdiv_q_ui( &m, &m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;
@@ -281 +283 @@
     mpz_mypow( &m, q, s );
     mpz_sub_ui( &m, &m, 1 );
-    mpz_div_ui( &m, &m, 2 );
-    while ( mpz_cmp_si( &m, 0 ) != 0 ) {
-        odd = mpz_mdivmod_ui( &m, 0, &m, 2 );
+    mpz_fdiv_q_ui( &m, &m, 2 );
+    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    {
+        odd = mpz_fdiv_q_ui( &m, &m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;

factory/int_int.cc

@@ -521 +521 @@
 int InternalInteger::intmod( int p ) const
 {
-  return (int)mpz_mmod_ui( 0, &thempi, (unsigned long)p );
+  return (int)mpz_fdiv_ui( &thempi, (unsigned long)p );
 }
 

factory/int_pp.cc

@@ -91 +91 @@
         mpz_set_si( &primepow, p );
         mpz_pow_ui( &primepow, &primepow, (unsigned int)k );
-        mpz_div_ui( &primepowhalf, &primepow, 2 );
+        mpz_fdiv_q_ui( &primepowhalf, &primepow, 2 );
         prime = p;
         exp = k;
@@ -404 +404 @@
 InternalPrimePower::intmod( int p ) const
 {
-  return (int)mpz_mmod_ui( 0, &thempi, (unsigned long)p );
+  return (int)mpz_fdiv_ui( &thempi, (unsigned long)p );
 }
 

factory/int_rat.cc

@@ -210 +210 @@
         MP_INT tmp2;
         mpz_init( &tmp1 );
-        mpz_div( &tmp1, &_den, &g );
+        mpz_fdiv_q( &tmp1, &_den, &g );
         mpz_init( &tmp2 );
-        mpz_div( &tmp2, &MPQDEN( c ), &g );
+        mpz_fdiv_q( &tmp2, &MPQDEN( c ), &g );
         mpz_mul( &d, &tmp2, &_den );
         mpz_mul( &tmp2, &tmp2, &_num );
@@ -220 +220 @@
         if ( mpz_cmp_si( &g, 1 ) != 0 )
         {
-            mpz_div( &n, &n, &g );
-            mpz_div( &d, &d, &g );
+            mpz_fdiv_q( &n, &n, &g );
+            mpz_fdiv_q( &d, &d, &g );
         }
         mpz_clear( &tmp1 );
@@ -266 +266 @@
         MP_INT tmp2;
         mpz_init( &tmp1 );
-        mpz_div( &tmp1, &_den, &g );
+        mpz_fdiv_q( &tmp1, &_den, &g );
         mpz_init( &tmp2 );
-        mpz_div( &tmp2, &MPQDEN( c ), &g );
+        mpz_fdiv_q( &tmp2, &MPQDEN( c ), &g );
         mpz_mul( &d, &tmp2, &_den );
         mpz_mul( &tmp2, &tmp2, &_num );
@@ -276 +276 @@
         if ( mpz_cmp_si( &g, 1 ) != 0 )
         {
-            mpz_div( &n, &n, &g );
-            mpz_div( &d, &d, &g );
+            mpz_fdiv_q( &n, &n, &g );
+            mpz_fdiv_q( &d, &d, &g );
         }
         mpz_clear( &tmp1 );
@@ -324 +324 @@
         mpz_init( &tmp1 ); mpz_init( &tmp2 );
         if ( ! g1is1 )
-            mpz_div( &tmp1, &_num, &g1 );
+            mpz_fdiv_q( &tmp1, &_num, &g1 );
         else
             mpz_set( &tmp1, &_num );
         if ( ! g2is1 )
-            mpz_div( &tmp2, &MPQNUM( c ), &g2 );
+            mpz_fdiv_q( &tmp2, &MPQNUM( c ), &g2 );
         else
             mpz_set( &tmp2, &MPQNUM( c ) );
         mpz_mul( &n, &tmp1, &tmp2 );
         if ( ! g1is1 )
-            mpz_div( &tmp1, &MPQDEN( c ), &g1 );
+            mpz_fdiv_q( &tmp1, &MPQDEN( c ), &g1 );
         else
             mpz_set( &tmp1, &MPQDEN( c ) );
         if ( ! g2is1 )
-            mpz_div( &tmp2, &_den, &g2 );
+            mpz_fdiv_q( &tmp2, &_den, &g2 );
         else
             mpz_set( &tmp2, &_den );
@@ -384 +384 @@
         mpz_init( &tmp1 ); mpz_init( &tmp2 );
         if ( ! g1is1 )
-            mpz_div( &tmp1, &_num, &g1 );
+            mpz_fdiv_q( &tmp1, &_num, &g1 );
         else
             mpz_set( &tmp1, &_num );
         if ( ! g2is1 )
-            mpz_div( &tmp2, &MPQDEN( c ), &g2 );
+            mpz_fdiv_q( &tmp2, &MPQDEN( c ), &g2 );
         else
             mpz_set( &tmp2, &MPQDEN( c ) );
         mpz_mul( &n, &tmp1, &tmp2 );
         if ( ! g1is1 )
-            mpz_div( &tmp1, &MPQNUM( c ), &g1 );
+            mpz_fdiv_q( &tmp1, &MPQNUM( c ), &g1 );
         else
             mpz_set( &tmp1, &MPQNUM( c ) );
         if ( ! g2is1 )
-            mpz_div( &tmp2, &_den, &g2 );
+            mpz_fdiv_q( &tmp2, &_den, &g2 );
         else
             mpz_set( &tmp2, &_den );
@@ -632 +632 @@
     else
     {
-        mpz_div( &n, &n, &g );
+        mpz_fdiv_q( &n, &n, &g );
         mpz_mul( &n, &n, &_num );
         mpz_init( &d );
-        mpz_div( &d, &_den, &g );
+        mpz_fdiv_q( &d, &_den, &g );
     }
     mpz_clear( &g );
@@ -709 +709 @@
     if ( mpz_cmp_si( &g, 1 ) != 0 )
     {
-        mpz_div( &d, &d, &g );
-        mpz_div( &n, &n, &g );
+        mpz_fdiv_q( &d, &d, &g );
+        mpz_fdiv_q( &n, &n, &g );
     }
     mpz_clear( &g );
@@ -808 +808 @@
     if ( mpz_cmp_si( &g, 1 ) != 0 )
     {
-        mpz_div( &_num, &_num, &g );
-        mpz_div( &_den, &_den, &g );
+        mpz_fdiv_q( &_num, &_num, &g );
+        mpz_fdiv_q( &_den, &_den, &g );
     }
     // Hier brauchen wir ein mpz_clear, J.M.