Changeset 7326063 in git

Timestamp:

Aug 10, 2012, 4:45:13 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

39d73166130d050a8887d89072423aa5ffdcd53a

Parents:

e8eba79d5b1d97d0164270764c45f286deab00ca

Message:

chg: IntDiv/IntMod postponed

File:

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

libpolys/coeffs/longrat.cc

@@ -744 +744 @@
     long aa=SR_TO_INT(a);
     long bb=SR_TO_INT(b);
-    return INT_TO_SR((aa-(aa%bb))/bb);
+    //return INT_TO_SR((aa-(aa%bb))/bb);
+    return INT_TO_SR(aa/bb);
   }
   if (SR_HDL(a) & SR_INT)
@@ -803 +804 @@
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
   {
-    return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
+    //return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
+    if ((long)a>0L)
+    {
+      if ((long)b>0L)
+        return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
+      else
+        return INT_TO_SR(SR_TO_INT(a)%(-SR_TO_INT(b)));
+    }
+    else
+    {
+      if ((long)b>0L)
+      {
+        long i=(-SR_TO_INT(a))%SR_TO_INT(b);
+        if ( i != 0L ) i = (SR_TO_INT(b))-i;
+        return INT_TO_SR(i);
+      }
+      else
+      {
+        long i=(-SR_TO_INT(a))%(-SR_TO_INT(b));
+        if ( i != 0L ) i = (-SR_TO_INT(b))-i;
+        return INT_TO_SR(i);
+      }
+    }
   }
   if (SR_HDL(a) & SR_INT)
   {
+    /* a is a small and b is a large int: -> a or (a+b) or (a-b) */
+    if ((long)a<0L)
+    {
+      if (mpz_isNeg(b->z))
+        return nlSub(a,b,r);
+      /*else*/
+        return nlAdd(a,b,r);
+    }
+    /*else*/
+      return a;
+
     /* a is a small and b is a large int: -> a */
-    return a;
+    //return a;
   }
   number bb=NULL;