Changeset cc3240c in git

Timestamp:

Feb 8, 2012, 3:49:13 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

65c5f5710da694616a5f4f24bb00f15eb0ddfae6

Parents:

c8e03004b0f2c558839cdce7d26c2b7978191d54

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-08 15:49:13+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-08 15:49:55+01:00

Message:

fix: nlInplAdd failed to simplify in some cases

File:

• libpolys/coeffs/longrat.cc (modified) (7 diffs)

libpolys/coeffs/longrat.cc

@@ -31 +31 @@
 {
   assume(x->s==3);
-  if ((mpz_cmp_ui(x->z,(long)0)==0)
-  || (mpz_size1(x->z)<=MP_SMALL))
+  if (mpz_cmp_ui(x->z,(long)0)==0)
+  {
+    mpz_clear(x->z);
+    FREE_RNUMBER(x);
+    return INT_TO_SR(0);
+  }
+  if (mpz_size1(x->z)<=MP_SMALL)
   {
     LONG ui=mpz_get_si(x->z);
@@ -2138 +2143 @@
 LINLINE BOOLEAN nlIsZero (number a, const coeffs)
 {
+  #if 0
+  if (a==INT_TO_SR(0)) return TRUE;
+  if ((SR_HDL(a) & SR_INT)||(a==NULL)) return FALSE;
+  if (mpz_cmp_si(a->z,(long)0)==0)
+  {
+    printf("gmp-0 in nlIsZero\n");
+    dErrorBreak();
+    return TRUE;
+  }
+  return FALSE;
+  #else
   return (a==INT_TO_SR(0));
-  //return (mpz_cmp_si(a->z,(long)0)==0);
+  #endif
 }
 
@@ -2211 +2227 @@
 number nlShort3_noinline(number x);
 
-static inline number nlInpAdd_(number a, number b, const coeffs r)
+LINLINE void nlInpAdd(number &a, number b, const coeffs r)
 {
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
@@ -2217 +2233 @@
     LONG r=SR_HDL(a)+SR_HDL(b)-1L;
     if ( ((r << 1) >> 1) == r )
-      return (number)(long)r;
+      a=(number)(long)r;
     else
-      return nlRInit(SR_TO_INT(r));
+      a=nlRInit(SR_TO_INT(r));
   }
   // a=a+b
-  if (SR_HDL(b) & SR_INT)
+  else if (SR_HDL(b) & SR_INT)
   {
     switch (a->s)
@@ -2249 +2265 @@
       }
     }
-    return a;
-  }
-  if (SR_HDL(a) & SR_INT)
+    return;
+  }
+  else if (SR_HDL(a) & SR_INT)
   {
     number u=ALLOC_RNUMBER();
@@ -2288 +2304 @@
     }
     nlTest(u, r);
-    return u;
+    a=u;
   }
   else
@@ -2357 +2373 @@
       }
     }
-    nlTest(a, r);
-    return a;
-  }
-}
-
-LINLINE void nlInpAdd(number &a, number b, const coeffs r)
-{
-  a = nlInpAdd_(a, b, r);
-}
-
+  }
+  nlTest(a, r);
+}
 
 LINLINE number nlMult (number a, number b, const coeffs R)