Changeset a52291 in git for factory/fac_cantzass.cc

Timestamp:

Nov 24, 2011, 2:35:53 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

8b46459e9dad8bec212484f1bfce347c45e41371

Parents:

1c48503bfae9bb885752ba741bd0a236df633d13

git-author:

Martin Lee <martinlee84@web.de>2011-11-24 14:35:53+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-24 21:10:03+01:00

Message:

replacing MP_INT by mpz_t

Conflicts:

	factory/cf_factory.h

File:

• factory/fac_cantzass.cc (modified) (10 diffs)

factory/fac_cantzass.cc

@@ -19 +19 @@
 static CFFList CantorZassenhausFactorFFGF( const CanonicalForm & f, int d, int q, const CFRandom & );
 
-static CFFList CantorZassenhausFactorExt( const CanonicalForm & g, int s, MP_INT * q, const CFRandom & gen );
+static CFFList CantorZassenhausFactorExt( const CanonicalForm & g, int s, mpz_t q, const CFRandom & gen );
 
 static CFFList distinctDegreeFactorFFGF ( const CanonicalForm & f, int q );
@@ -37 +37 @@
 static CanonicalForm powerMod2( const CanonicalForm & f, int p, int s, const CanonicalForm & d );
 
-static CanonicalForm powerMod2( const CanonicalForm & f, MP_INT * q, int s, const CanonicalForm & d );
+static CanonicalForm powerMod2( const CanonicalForm & f, mpz_t q, int s, const CanonicalForm & d );
 
 CFFList FpFactorizeUnivariateCZ( const CanonicalForm& f, bool issqrfree, int numext, const Variable alpha, const Variable beta )
@@ -46 +46 @@
     int d, q, n = 0;
     bool galoisfield = getGFDegree() > 1;
-    MP_INT qq;
+    mpz_t qq;
 
     if ( galoisfield )
@@ -57 +57 @@
         else
             n = getMipo( alpha ).degree() * getMipo( beta ).degree();
-        mpz_init( &qq );
-        mpz_ui_pow_ui ( &qq, q, n );
+        mpz_init( qq );
+        mpz_ui_pow_ui ( qq, q, n );
     }
     if ( LC( f ).isOne() )
@@ -82 +82 @@
              if ( numext == 1 ) {
                    AlgExtRandomF tmpalpha( alpha );
-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalpha );
+                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), qq, tmpalpha );
              }
              else {
                    AlgExtRandomF tmpalphabeta( alpha, beta );
-                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), &qq, tmpalphabeta );
+                    HH = CantorZassenhausFactorExt( j.getItem().factor(), j.getItem().exp(), qq, tmpalphabeta );
              }
             }
@@ -100 +100 @@
     }
     if ( numext > 0 )
-        mpz_clear( &qq );
+        mpz_clear( qq );
     return H;
 }
@@ -171 +171 @@
 }
 
-CFFList CantorZassenhausFactorExt( const CanonicalForm & g, int s, MP_INT * q, const CFRandom & gen )
+CFFList CantorZassenhausFactorExt( const CanonicalForm & g, int s, mpz_t q, const CFRandom & gen )
 {
     CanonicalForm f = g;
@@ -228 +228 @@
     int odd;
 
-    MP_INT m;
-
-    mpz_init( &m );
-    mpz_ui_pow_ui ( &m, p, s );
-    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    mpz_t m;
+
+    mpz_init( m );
+    mpz_ui_pow_ui ( m, p, s );
+    while ( mpz_cmp_si( m, 0 ) != 0 )
     {
-        odd = mpz_fdiv_q_ui( &m, &m, 2 );
+        odd = mpz_fdiv_q_ui( m, m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;
-        if ( mpz_cmp_si( &m, 0 ) != 0 )
+        if ( mpz_cmp_si( m, 0 ) != 0 )
             b = (b*b) % d;
     }
-    mpz_clear( &m );
+    mpz_clear( m );
     return prod;
 }
@@ -250 +250 @@
     int odd;
 
-    MP_INT m;
-
-    mpz_init( &m );
-    mpz_ui_pow_ui ( &m, p, s );
-    mpz_sub_ui( &m, &m, 1 );
-    mpz_fdiv_q_ui( &m, &m, 2 );
-    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    mpz_t m;
+
+    mpz_init( m );
+    mpz_ui_pow_ui ( m, p, s );
+    mpz_sub_ui( m, m, 1 );
+    mpz_fdiv_q_ui( m, m, 2 );
+    while ( mpz_cmp_si( m, 0 ) != 0 )
     {
-        odd = mpz_fdiv_q_ui( &m, &m, 2 );
+        odd = mpz_fdiv_q_ui( m, m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;
-        if ( mpz_cmp_si( &m, 0 ) != 0 )
+        if ( mpz_cmp_si( m, 0 ) != 0 )
             b = (b*b) % d;
     }
-    mpz_clear( &m );
-    return prod;
-}
-
-CanonicalForm powerMod2( const CanonicalForm & f, MP_INT * q, int s, const CanonicalForm & d )
+    mpz_clear( m );
+    return prod;
+}
+
+CanonicalForm powerMod2( const CanonicalForm & f, mpz_t q, int s, const CanonicalForm & d )
 {
     CanonicalForm prod = 1;
@@ -274 +274 @@
     int odd;
 
-    MP_INT m;
-
-    mpz_init( &m );
-    mpz_pow_ui( &m, q, s );
-    mpz_sub_ui( &m, &m, 1 );
-    mpz_fdiv_q_ui( &m, &m, 2 );
-    while ( mpz_cmp_si( &m, 0 ) != 0 )
+    mpz_t m;
+
+    mpz_init( m );
+    mpz_pow_ui( m, q, s );
+    mpz_sub_ui( m, m, 1 );
+    mpz_fdiv_q_ui( m, m, 2 );
+    while ( mpz_cmp_si( m, 0 ) != 0 )
     {
-        odd = mpz_fdiv_q_ui( &m, &m, 2 );
+        odd = mpz_fdiv_q_ui( m, m, 2 );
         if ( odd != 0 )
             prod = (prod * b) % d;
-        if ( mpz_cmp_si( &m, 0 ) != 0 )
+        if ( mpz_cmp_si( m, 0 ) != 0 )
             b = (b*b) % d;
     }
-    mpz_clear( &m );
-    return prod;
-}
+    mpz_clear( m );
+    return prod;
+}