Changeset 6a874e in git

Timestamp:

Jan 31, 2003, 10:10:05 AM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8fedab021b379edf79b18b9d1d0a051e25604639

Parents:

0b937c66fb6d3cee867a7255179563d6e5108b3b

Message:

*hannes: NV_OPS, NV_MAX_PRIME, ndInpMultwq


git-svn-id: file:///usr/local/Singular/svn/trunk@6455 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• numbers.cc (modified) (6 diffs)
• numbers.h (modified) (2 diffs)

Singular/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.48 2002-11-26 13:54:43 Singular Exp $ */
+/* $Id: numbers.cc,v 1.49 2003-01-31 09:10:04 Singular Exp $ */
 
 /*
@@ -62 +62 @@
 void   nDummy1(number* d) { *d=NULL; }
 void   ndDelete(number* d, const ring r) { *d=NULL; }
-void   ndInpMult(number &a, number b, ring r) 
+void   ndInpMult(number &a, number b, const ring r)
 {
   number n=n_Mult(a,b,r);
@@ -176 +176 @@
 void nInitChar(ring r)
 {
-  short c=rInternalChar(r);
+  int c=rInternalChar(r);
   n_coeffType t=rFieldType(r);
 
@@ -280 +280 @@
     n->nSub   = nlSub;
     n->nMult  = nlMult;
+    n->nInpMult=nlInpMult;
     n->nDiv   = nlDiv;
     n->nExactDiv= nlExactDiv;
@@ -333 +334 @@
 #ifdef LDEBUG
     //n->nDBTest=npDBTest;
+#endif
+#ifdef NV_OPS
+    if (c>NV_MAX_PRIME)
+    {
+      n->nMult  = nvMult;
+      n->nDiv   = nvDiv;
+      n->nExactDiv= nvDiv;
+      n->nInvers= nvInvers;
+    }
 #endif
   }
@@ -500 +510 @@
             case n_Zp:
                  #ifdef HAVE_DIV_MOD
+                 if (r->cf->npInvTable!=NULL)
                  omFreeSize( (ADDRESS)r->cf->npInvTable,
                              r->cf->npPrimeM*sizeof(CARDINAL) );
                  #else
-                 omFreeSize( (ADDRESS)r->cf->npExpTable,
-                             r->cf->npPrimeM*sizeof(CARDINAL) );
-                 omFreeSize( (ADDRESS)r->cf->npLogTable,
-                             r->cf->npPrimeM*sizeof(CARDINAL) );
+                 if (r->cf->npExpTable!=NULL)
+                 {
+                   omFreeSize( (ADDRESS)r->cf->npExpTable,
+                               r->cf->npPrimeM*sizeof(CARDINAL) );
+                   omFreeSize( (ADDRESS)r->cf->npLogTable,
+                               r->cf->npPrimeM*sizeof(CARDINAL) );
+                 }
                  #endif
                  break;

Singular/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.30 2002-11-26 13:54:44 Singular Exp $ */
+/* $Id: numbers.h,v 1.31 2003-01-31 09:10:05 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -74 +74 @@
 number ndGcd(number a, number b, const ring);
 number ndCopy(number a);
+void   ndInpMult(number &a, number b, const ring r);
 
 #ifdef LDEBUG