Changeset a52291 in git for factory/cf_factory.cc

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

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

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/cf_factory.cc (modified) (3 diffs)

factory/cf_factory.cc

@@ -221 +221 @@
 
 InternalCF *
-CFFactory::basic ( const MP_INT & num )
+CFFactory::basic ( const mpz_ptr num )
 {
     if ( currenttype != IntegerDomain ) {
@@ -239 +239 @@
 
 InternalCF *
-CFFactory::rational ( const MP_INT & num, const MP_INT & den, bool normalize )
+CFFactory::rational ( const mpz_ptr num, const mpz_ptr den, bool normalize )
 {
     if ( normalize ) {
@@ -267 +267 @@
 }
 
-MP_INT getmpi ( InternalCF * value, bool symmetric )
+mpz_ptr getmpi ( InternalCF * value, bool symmetric )
 {
     ASSERT( ! is_imm( value ) && ( value->levelcoeff() == PrimePowerDomain || value->levelcoeff() == IntegerDomain ), "illegal operation" );
-    MP_INT dummy;
+    mpz_ptr dummy= new mpz_t;
     if ( value->levelcoeff() == IntegerDomain )
-        mpz_init_set( &dummy, &InternalInteger::MPI( value ) );
+        mpz_init_set( dummy, InternalInteger::MPI( value ) );
     else  if ( symmetric ) {
-        mpz_init( &dummy );
-        if ( mpz_cmp( &InternalPrimePower::primepowhalf, &InternalPrimePower::MPI( value ) ) < 0 )
-            mpz_sub( &dummy, &InternalPrimePower::MPI( value ), &InternalPrimePower::primepow );
-        else
-            mpz_set( &dummy, &InternalPrimePower::MPI( value ) );
-    }
-    else
-        mpz_init_set( &dummy, &InternalPrimePower::MPI( value ) );
+        mpz_init( dummy );
+        if ( mpz_cmp( InternalPrimePower::primepowhalf, InternalPrimePower::MPI( value ) ) < 0 )
+            mpz_sub( dummy, InternalPrimePower::MPI( value ), InternalPrimePower::primepow );
+        else
+            mpz_set( dummy, InternalPrimePower::MPI( value ) );
+    }
+    else
+        mpz_init_set( dummy, InternalPrimePower::MPI( value ) );
     return dummy;
 }