Changeset 106406 in git

Timestamp:

Jul 16, 2009, 6:01:26 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

9446f84181f539db0f2689bb27e177084073a62f

Parents:

40f856763215f79e7dbf5992da04ba55904357b1

Message:

*hannes: nlShort3 simplified


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

File:

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

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.41 2009-06-04 08:32:59 Singular Exp $ */
+/* $Id: longrat.cc,v 1.42 2009-07-16 16:01:26 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -76 +76 @@
 #define MPZ_EXACTDIV(A,B,C) mpz_divexact((A),(B),(C))
 
+void    _nlDelete_NoImm(number *a);
 
 /***************************************************************
@@ -1160 +1161 @@
   if (mpz_cmp_ui(&x->z,(long)0)==0)
   {
-    nlDelete(&x,currRing);
+    _nlDelete_NoImm(&x);
     return INT_TO_SR(0);
   }
@@ -1167 +1168 @@
     if (mpz_cmp(&x->z,&x->n)==0)
     {
-      nlDelete(&x,currRing);
+      _nlDelete_NoImm(&x);
       return INT_TO_SR(1);
     }
@@ -1176 +1177 @@
 {
   assume(x->s==3);
-  if (mpz_cmp_ui(&x->z,(long)0)==0)
-  {
-    nlDelete(&x,currRing);
-    return INT_TO_SR(0);
-  }
-  if (mpz_size1(&x->z)<=MP_SMALL)
-  {
-    if (x->s==3)
-    {
-      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);
-        omFreeBin((ADDRESS)x, rnumber_bin);
-        return INT_TO_SR(ui);
-      }
+  if ((mpz_cmp_ui(&x->z,(long)0)==0)
+  || (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);
+      omFreeBin((ADDRESS)x, rnumber_bin);
+      return INT_TO_SR(ui);
     }
   }
@@ -2206 +2200 @@
 BOOLEAN _nlEqual_aNoImm_OR_bNoImm(number a, number b);
 number  _nlCopy_NoImm(number a);
-void    _nlDelete_NoImm(number *a);
 number  _nlNeg_NoImm(number a);
 number  _nlAdd_aNoImm_OR_bNoImm(number a, number b);