Changeset 3ccafbf in git for kernel/longrat.cc

Timestamp:

Apr 12, 2007, 6:58:38 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7ba9fe121c436f581536f3d3a05ab906f5cbe6cc

Parents:

11fa81ef71e21f2b1f252178f3df714e3326215f

Message:

*hannes: nlNormalize


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

File:

• kernel/longrat.cc (modified) (2 diffs)

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.15 2007-04-12 16:33:52 Singular Exp $ */
+/* $Id: longrat.cc,v 1.16 2007-04-12 16:58:38 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -1161 +1161 @@
     }
   }
-  if (x->s==0)
-  {
-    //BOOLEAN divided=FALSE;
-    MP_INT gcd;
-    mpz_init(&gcd);
-    mpz_gcd(&gcd,&x->z,&x->n);
-    x->s=1;
-    if (mpz_cmp_si(&gcd,(long)1)!=0)
-    {
-      MP_INT r;
-      mpz_init(&r);
-      MPZ_EXACTDIV(&r,&x->z,&gcd);
-      mpz_set(&x->z,&r);
-      MPZ_EXACTDIV(&r,&x->n,&gcd);
-      mpz_set(&x->n,&r);
-      mpz_clear(&r);
-      //divided=TRUE;
-      if (mpz_cmp_si(&x->n,(long)1)==0)
-      {
-        mpz_clear(&x->n);
-        if (mpz_size1(&x->z)<=MP_SMALL)
-        {
-          int ui=(int)mpz_get_si(&x->z);
-          if ((((ui<<3)>>3)==ui)
-          && (mpz_cmp_si(&x->z,(long)ui)==0))
+  else if (x->s==0)
+  {
+    if (mpz_cmp_si(&x->n,(long)1)==0)
+    {
+      mpz_clear(&x->n);
+      if (mpz_size1(&x->z)<=MP_SMALL)
+      {
+        int ui=(int)mpz_get_si(&x->z);
+        if ((((ui<<3)>>3)==ui)
+        && (mpz_cmp_si(&x->z,(long)ui)==0))
+        {
+          mpz_clear(&x->z);
+#if defined(LDEBUG)
+          x->debug=654324;
+#endif
+          omFreeBin((ADDRESS)x, rnumber_bin);
+          x=INT_TO_SR(ui);
+          return;
+        }
+      }
+      x->s=3;
+    }
+    else
+    {
+      MP_INT gcd;
+      mpz_init(&gcd);
+      mpz_gcd(&gcd,&x->z,&x->n);
+      x->s=1;
+      if (mpz_cmp_si(&gcd,(long)1)!=0)
+      {
+        MP_INT r;
+        mpz_init(&r);
+        MPZ_EXACTDIV(&r,&x->z,&gcd);
+        mpz_set(&x->z,&r);
+        MPZ_EXACTDIV(&r,&x->n,&gcd);
+        mpz_set(&x->n,&r);
+        mpz_clear(&r);
+        if (mpz_cmp_si(&x->n,(long)1)==0)
+        {
+          mpz_clear(&x->n);
+          if (mpz_size1(&x->z)<=MP_SMALL)
           {
-            mpz_clear(&x->z);
-#if defined(LDEBUG)
-            x->debug=654324;
-#endif
-            omFreeBin((ADDRESS)x, rnumber_bin);
-            x=INT_TO_SR(ui);
-            return;
+            int ui=(int)mpz_get_si(&x->z);
+            if ((((ui<<3)>>3)==ui)
+            && (mpz_cmp_si(&x->z,(long)ui)==0))
+            {
+              mpz_clear(&x->z);
+#if defined(LDEBUG)
+              x->debug=654324;
+#endif
+              omFreeBin((ADDRESS)x, rnumber_bin);
+              x=INT_TO_SR(ui);
+              return;
+            }
           }
-        }
-        x->s=3;
-      }
-    }
-    mpz_clear(&gcd);
-#if 0
-    else if (divided)
-    {
-#define mpz_alloc1(A) ((A)->_mp_alloc)
-      int l;
-      if ((mpz_alloc1(&x->n)>>1) >= (l=mpz_size1(&x->n)))
-      {
-        _mpz_realloc(&x->n,l /* mpz_size1(&x->n)*/);
-      }
-    }
-    if (divided)
-    {
-      int l;
-      if ((mpz_alloc1(&x->z)>>1) >= (l=mpz_size1(&x->z)))
-      {
-        _mpz_realloc(&x->z,l /*mpz_size1(&x->z)*/);
-      }
-    }
-#endif
+          x->s=3;
+        }
+      }
+      mpz_clear(&gcd);
+    }
   }
 #ifdef LDEBUG