Changeset 1e6de6 in git for factory/int_int.cc

Timestamp:

Jan 7, 2008, 2:33:11 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa7480c120ef293aaf5a185ec38a2440c23fc879

Parents:

6840b2040b65b549b02b0e852339ab1a0a791484

Message:

*hannes: some optimizations(gcd)


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

File:

• factory/int_int.cc (modified) (11 diffs)

factory/int_int.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_int.cc,v 1.19 2007-12-04 15:24:53 Singular Exp $ */
+/* $Id: int_int.cc,v 1.20 2008-01-07 13:33:10 Singular Exp $ */
 
 #include <config.h>
@@ -86 +86 @@
 InternalInteger::neg ()
 {
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
         MP_INT dummy;
@@ -92 +93 @@
         mpz_neg( &dummy, &dummy );
         return new InternalInteger( dummy );
-    } else {
+    }
+    else
+    {
         mpz_neg( &thempi, &thempi );
         return this;
@@ -102 +105 @@
 InternalCF* InternalInteger::addsame( InternalCF * c )
 {
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
         MP_INT dummy;
         mpz_init( &dummy );
         mpz_add( &dummy, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &dummy ) ) {
+        if ( mpz_is_imm( &dummy ) )
+        {
             InternalCF * res = int2imm( mpz_get_si( &dummy ) );
             mpz_clear( &dummy );
@@ -115 +120 @@
             return new InternalInteger( dummy );
     }
-    else {
+    else
+    {
         mpz_add( &thempi, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &thempi ) ) {
+        if ( mpz_is_imm( &thempi ) )
+        {
             InternalCF * res = int2imm( mpz_get_si( &thempi ) );
             delete this;
@@ -129 +136 @@
 InternalCF* InternalInteger::subsame( InternalCF * c )
 {
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
         MP_INT dummy;
         mpz_init( &dummy );
         mpz_sub( &dummy, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &dummy ) ) {
+        if ( mpz_is_imm( &dummy ) )
+        {
             InternalCF * res = int2imm( mpz_get_si( &dummy ) );
             mpz_clear( &dummy );
@@ -142 +151 @@
             return new InternalInteger( dummy );
     }
-    else {
+    else
+    {
         mpz_sub( &thempi, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &thempi ) ) {
+        if ( mpz_is_imm( &thempi ) )
+        {
             InternalCF * res = int2imm( mpz_get_si( &thempi ) );
             delete this;
@@ -156 +167 @@
 InternalCF* InternalInteger::mulsame( InternalCF * c )
 {
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
         MP_INT dummy;
         mpz_init( &dummy );
         mpz_mul( &dummy, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &dummy ) ) {
+        if ( mpz_is_imm( &dummy ) )
+        {
+        // can this happen ???
             InternalCF * res = int2imm( mpz_get_si( &dummy ) );
             mpz_clear( &dummy );
@@ -169 +183 @@
             return new InternalInteger( dummy );
     }
-    else {
+    else
+    {
         mpz_mul( &thempi, &thempi, &MPI( c ) );
-        if ( mpz_is_imm( &thempi ) ) {
+        if ( mpz_is_imm( &thempi ) )
+        {
+        // can this happen ???
             InternalCF * res = int2imm( mpz_get_si( &thempi ) );
             delete this;
@@ -202 +219 @@
     ASSERT( ::is_imm( c ) == INTMARK, "incompatible base coefficients" );
     int cc = imm2int( c );
-    if ( getRefCount() > 1 ) {
+    if ( getRefCount() > 1 )
+    {
         decRefCount();
         MP_INT dummy;
@@ -210 +228 @@
         else
             mpz_add_ui( &dummy, &thempi, cc );
-        if ( mpz_is_imm( &dummy ) ) {
+        if ( mpz_is_imm( &dummy ) )
+        {
             InternalCF * res = int2imm( mpz_get_si( &dummy ) );
             mpz_clear( &dummy );