Changeset 6f9aca in git

Timestamp:

Apr 3, 2018, 4:19:37 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3f6a92be691e6acb53f744e17d66ee5d635802fd

Parents:

f67afed8d454f54035cff586aa3cf35a06a7280e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-04-03 16:19:37+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-04-03 16:20:24+02:00

Message:

fix: npInpMult (for 0)

Location:

libpolys

Files:

• coeffs/modulop.cc (modified) (3 diffs)
• polys/templates/p_Numbers.h (modified) (2 diffs)

libpolys/coeffs/modulop.cc

@@ -97 +97 @@
 }
 
+void npInpMult (number &a,number b, const coeffs r)
+{
+  n_Test(a, r);
+  n_Test(b, r);
+
+  if (((long)a == 0) || ((long)b == 0))
+    a=(number)0;
+  a = npMultM(a,b, r);
+  n_Test(a, r);
+}
+
 /*2
 * create a number from int
@@ -472 +483 @@
 
   r->cfMult  = npMult;
-  r->cfInpMult  = npInpMultM;
+  r->cfInpMult  = npInpMult;
   r->cfSub   = npSubM;
   r->cfAdd   = npAddM;
@@ -518 +529 @@
 #endif
 
-#ifdef NV_OPS
-  if (c>NV_MAX_PRIME)
-  {
-    r->cfMult  = nvMult;
-    r->cfDiv   = nvDiv;
-    r->cfExactDiv= nvDiv;
-    r->cfInvers= nvInvers;
-    //r->cfPower= nvPower;
-    if (c>FACTORY_MAX_PRIME)
-    {
-      r->convSingNFactoryN=ndConvSingNFactoryN;
-    }
-  }
-#endif
-
   // io via ssi
   r->cfWriteFd=npWriteFd;

libpolys/polys/templates/p_Numbers.h

@@ -55 +55 @@
 #define n_Neg_RingGeneral(n, r)            n_Neg_FieldGeneral(n, r)
 #define n_Sub_RingGeneral(n1, n2, r)       n_Sub_FieldGeneral(n1, n2, r)
-//#define n_InpMult_RingGeneral(n1, n2, r)   n_InpMult_FieldGeneral(n1, n2, r)
 #define n_InpMult_RingGeneral(n1, n2, r)   n_InpMult_FieldGeneral(n1, n2, r)
 
@@ -104 +103 @@
 
 static FORCE_INLINE void n_InpMult_FieldZp(number &n1, number n2, const coeffs r)
-{ STATISTIC(n_InpMult); n1=npMultM(n1, n2, r);  }
+{ STATISTIC(n_InpMult); npInpMultM(n1, n2, r);  }
 
 #ifdef HAVE_NUMSTATS