Changeset cc4553 in git

Timestamp:

Jan 8, 2008, 3:33:36 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

10b7a40b0985d3ec8886d27dedfee1fcdbaa6361

Parents:

f8e54578322ffb83ea92786420613e64ade26d73

Message:

*hannes: some optimizations


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

File:

• factory/int_rat.cc (modified) (8 diffs)

factory/int_rat.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_rat.cc,v 1.15 2008-01-07 13:33:11 Singular Exp $ */
+/* $Id: int_rat.cc,v 1.16 2008-01-08 14:33:36 Singular Exp $ */
 
 #include <config.h>
@@ -230 +230 @@
     if ( mpz_cmp_si( &d, 1 ) == 0 )
     {
+        mpz_clear( &d );
         if ( mpz_is_imm( &n ) )
         {
             InternalCF * res = int2imm( mpz_get_si( &n ) );
-            mpz_clear( &n ); mpz_clear( &d );
+            mpz_clear( &n );
             return res;
         }
         else
         {
-            mpz_clear( &d );
             return new InternalInteger( n );
         }
@@ -286 +286 @@
     if ( mpz_cmp_si( &d, 1 ) == 0 )
     {
+        mpz_clear( &d );
         if ( mpz_is_imm( &n ) )
         {
             InternalCF * res = int2imm( mpz_get_si( &n ) );
-            mpz_clear( &n ); mpz_clear( &d );
+            mpz_clear( &n );
             return res;
         }
         else
         {
-            mpz_clear( &d );
             return new InternalInteger( n );
         }
@@ -347 +347 @@
     if ( mpz_cmp_si( &d, 1 ) == 0 )
     {
+        mpz_clear( &d );
         if ( mpz_is_imm( &n ) )
         {
             InternalCF * res = int2imm( mpz_get_si( &n ) );
-            mpz_clear( &n ); mpz_clear( &d );
+            mpz_clear( &n );
             return res;
         }
         else
         {
-            mpz_clear( &d );
             return new InternalInteger( n );
         }
@@ -404 +404 @@
         mpz_clear( &g1 ); mpz_clear( &g2 );
         if ( deleteObject() ) delete this;
-        if ( mpz_cmp_si( &d, 0 ) < 0 ) {
+        if ( mpz_cmp_si( &d, 0 ) < 0 )
+        {
             mpz_neg( &d, &d );
             mpz_neg( &n, &n );
@@ -410 +411 @@
         if ( mpz_cmp_si( &d, 1 ) == 0 )
         {
+            mpz_clear( &d );
             if ( mpz_is_imm( &n ) )
             {
                 InternalCF * res = int2imm( mpz_get_si( &n ) );
-                mpz_clear( &n ); mpz_clear( &d );
+                mpz_clear( &n );
                 return res;
             }
             else
             {
-                mpz_clear( &d );
                 return new InternalInteger( n );
             }
@@ -640 +641 @@
     if ( mpz_cmp_si( &d, 1 ) == 0 )
     {
+        mpz_clear( &d );
         if ( mpz_is_imm( &n ) )
         {
             InternalCF * res = int2imm( mpz_get_si( &n ) );
-            mpz_clear( &n ); mpz_clear( &d );
+            mpz_clear( &n );
             return res;
         }
         else
         {
-            mpz_clear( &d );
             return new InternalInteger( n );
         }
@@ -720 +721 @@
     if ( mpz_cmp_si( &d, 1 ) == 0 )
     {
+        mpz_clear( &d );
         if ( mpz_is_imm( &n ) )
         {
             InternalCF * res = int2imm( mpz_get_si( &n ) );
-            mpz_clear( &n ); mpz_clear( &d );
+            mpz_clear( &n );
             return res;
         }
         else
         {
-            mpz_clear( &d );
             return new InternalInteger( n );
         }