Changeset 98a94b in git

Timestamp:

Apr 26, 2018, 4:26:40 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e4c8dc9ef21f56d682d47ce39530ce221c22dd44

Parents:

2ba25ee7ea3c483c73847576db73cb6464bc67ba

Message:

fix: special case (GA,!GM): in mult

Location:

libpolys/coeffs

Files:

• modulop.cc (modified) (1 diff)
• modulop.h (modified) (3 diffs)

libpolys/coeffs/modulop.cc

@@ -164 +164 @@
   int s = r->npLogTable[(long)a] - r->npLogTable[(long)b];
   #ifdef HAVE_GENERIC_ADD
-  if (s < 0)
-    s += r->npPminus1M;
+    if (s < 0)
+      s += r->npPminus1M;
   #else
     #if SIZEOF_LONG == 8

libpolys/coeffs/modulop.h

@@ -74 +74 @@
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
   #ifdef HAVE_GENERIC_ADD
-  if (x>r->npPminus1M) x-=r->npPminus1M;
+    if (x>=r->npPminus1M) x-=r->npPminus1M;
   #else
     x-=r->npPminus1M;
     #if SIZEOF_LONG == 8
-     x += (x >> 63) & r->npPminus1M;
+      x += (x >> 63) & r->npPminus1M;
     #else
-     x += (x >> 31) & r->npPminus1M;
+      x += (x >> 31) & r->npPminus1M;
     #endif
   #endif
@@ -89 +89 @@
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
   #ifdef HAVE_GENERIC_ADD
-  if (x>r->npPminus1M) x-=r->npPminus1M;
+    if (x>=r->npPminus1M) x-=r->npPminus1M;
   #else
     x-=r->npPminus1M;
     #if SIZEOF_LONG == 8
-     x += (x >> 63) & r->npPminus1M;
+      x += (x >> 63) & r->npPminus1M;
     #else
-     x += (x >> 31) & r->npPminus1M;
+      x += (x >> 31) & r->npPminus1M;
     #endif
   #endif
@@ -268 +268 @@
 long    npInt         (number &n, const coeffs r);
 
+// The folloing is reused inside tgb*.cc
+number  npMult        (number a, number b, const coeffs r);
 // The following is currently used in OPAE.cc, OPAEQ.cc and OPAEp.cc for setting their SetMap...
 nMapFunc npSetMap(const coeffs src, const coeffs dst); // FIXME! BUG?