Changeset 368dcf in git for libpolys/coeffs/modulop.cc

Timestamp:

Apr 5, 2018, 2:00:05 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

945ccc9d24666485bf37d032e929710f62e1063af2a4ddf13a67aded2d7eb6d181c2cfda9ceb300a

Parents:

3778c1cd47e473a481bc16cc58ccb6b1767bb99e9c2cf91f31b9174ec4735d6e2fab3ee8ed28b302

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-04-05 14:00:05+02:00

git-committer:

GitHub <noreply@github.com>2018-04-05 14:00:05+02:00

Message:

Merge pull request #864 from steenpass/preimage

include kernel/preimage.h in libsingular.h

File:

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

libpolys/coeffs/modulop.cc

@@ -41 +41 @@
 void    npCoeffWrite  (const coeffs r, BOOLEAN details);
 const char *  npRead  (const char *s, number *a,const coeffs r);
+void nvInpMult(number &a, number b, const coeffs r);
 
 #ifdef LDEBUG
@@ -94 +95 @@
   n_Test(c, r);
   return c;
+}
+
+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;
+  else
+    a = npMultM(a,b, r);
+  n_Test(a, r);
 }
 
@@ -471 +484 @@
 
   r->cfMult  = npMult;
-  r->cfInpMult  = npInpMultM;
+  r->cfInpMult  = npInpMult;
   r->cfSub   = npSubM;
   r->cfAdd   = npAddM;
@@ -509 +522 @@
   //r->cfName = ndName;
   //r->cfInpMult=ndInpMult;
-#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
+  r->convSingNFactoryN=npConvSingNFactoryN;
+  r->convFactoryNSingN=npConvFactoryNSingN;
+  r->cfRandom=npRandom;
 #ifdef LDEBUG
   // debug stuff
   r->cfDBTest=npDBTest;
 #endif
-
-  r->convSingNFactoryN=npConvSingNFactoryN;
-  r->convFactoryNSingN=npConvFactoryNSingN;
-
-  r->cfRandom=npRandom;
 
   // io via ssi
@@ -547 +544 @@
 #endif
   {
-#if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-    r->npExpTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
-    r->npLogTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
+#ifdef HAVE_DIV_MOD
+    r->npInvTable=(unsigned short*)omAlloc0( r->ch*sizeof(unsigned short) );
+#elif (!defined(HAVE_MULT_MOD)||(!HAVE_DIV_MOD))
+    r->npExpTable=(unsigned short *)omAlloc0( r->ch*sizeof(unsigned short) );
+    r->npLogTable=(unsigned short *)omAlloc0( r->ch*sizeof(unsigned short) );
     r->npExpTable[0] = 1;
     r->npLogTable[0] = 0;
@@ -578 +577 @@
     }
 #endif
-#ifdef HAVE_DIV_MOD
-    r->npInvTable=(unsigned short*)omAlloc0( r->ch*sizeof(unsigned short) );
-#endif
-  }
+  }
+#ifdef NV_OPS
+  else /*if (c>NV_MAX_PRIME)*/
+  {
+    r->cfMult  = nvMult;
+    r->cfDiv   = nvDiv;
+    r->cfExactDiv = nvDiv;
+    r->cfInvers  = nvInvers;
+    r->cfInpMult = nvInpMult;
+    //r->cfPower= nvPower;
+    //if (c>FACTORY_MAX_PRIME) // factory will catch this error
+    //{
+    //  r->convSingNFactoryN=ndConvSingNFactoryN;
+    //}
+  }
+#endif
   return FALSE;
 }
@@ -780 +791 @@
 }
 
-void   nvInpMult(number &a, number b, const coeffs r)
+void nvInpMult(number &a, number b, const coeffs r)
 {
   number n=nvMultM(a,b,r);
   a=n;
 }
-
 
 static inline long nvInvMod(long a, const coeffs R)