Changeset 6c15ec in git

Timestamp:

Nov 21, 2006, 12:00:56 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

e2629ce4f7e55e7bff5bf2315aee0a8801a5f683

Parents:

f2c2b7e9680cff169a760b50002fbd78676e5fae

Message:

*hannes: map rationals to large prime fields


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

Location:

kernel

Files:

• longrat.cc (modified) (2 diffs)
• modulop.cc (modified) (3 diffs)

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.13 2006-05-02 16:25:17 Singular Exp $ */
+/* $Id: longrat.cc,v 1.14 2006-11-21 11:00:56 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -1297 +1297 @@
   {
     int in=mpz_mmod_ui(NULL,&n->n,(unsigned long)p);
+    #ifdef NV_OPS
+    if (npPrimeM>NV_MAX_PRIME)
+    return (int)((long)nvDiv((number)iz,(number)in));
+    #endif
     return (int)((long)npDiv((number)iz,(number)in));
   }

kernel/modulop.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.cc,v 1.6 2006-08-11 09:47:22 Singular Exp $ */
+/* $Id: modulop.cc,v 1.7 2006-11-21 11:00:56 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -163 +163 @@
 number npDiv (number a,number b)
 {
+//#ifdef NV_OPS
+//  if (npPrimeM>NV_MAX_PRIME)
+//    return nvDiv(a,b);
+//#endif
   if ((long)a==0)
     return (number)0;
 #ifndef HAVE_DIV_MOD
-  else if ((long)b==0)
+  if ((long)b==0)
   {
     WerrorS("div by 0");
@@ -267 +271 @@
   if (n == 1)
     *a = (number)z;
-  else 
+  else
 #ifdef NV_OPS
     if (npPrimeM>NV_MAX_PRIME)
       *a = nvDiv((number)z,(number)n);
     else
-#endif    
+#endif
       *a = npDiv((number)z,(number)n);
   return s;