Changeset 3332cc6 in git

Timestamp:

May 7, 2007, 6:23:04 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

2a4de844a903a486ebd9eb9e66e636b0c391710c

Parents:

1219204c7ddd960535b39b255de0689f3300d0ab

Message:

*hannes: n_Test


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

Location:

kernel

Files:

• numbers.cc (modified) (10 diffs)
• numbers.h (modified) (2 diffs)
• pDebug.cc (modified) (2 diffs)
• structs.h (modified) (2 diffs)

kernel/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.6 2007-05-03 13:50:09 wienand Exp $ */
+/* $Id: numbers.cc,v 1.7 2007-05-07 16:23:04 Singular Exp $ */
 
 /*
@@ -287 +287 @@
     n->n_GetDenom   = naGetDenom;
 #ifdef LDEBUG
-    //n->nDBTest     = naDBTest;
+    n->nDBTest     = naDBTest;
 #endif
   }
@@ -322 +322 @@
      n->nName= ndName;
 #ifdef LDEBUG
-//     n->nDBTest=nr2mDBTest;
+     n->nDBTest=nr2mDBTest;
 #endif
   }
@@ -358 +358 @@
      n->nName= ndName;
 #ifdef LDEBUG
-//     n->nDBTest=nrnDBTest;
+     n->nDBTest=nrnDBTest;
 #endif
   }
@@ -395 +395 @@
     n->n_GetDenom = nlGetDenom;
 #ifdef LDEBUG
-    //n->nDBTest=nlDBTest;
+    n->nDBTest=nlDBTest;
 #endif
   }
@@ -425 +425 @@
     /*nSize  = ndSize;*/
 #ifdef LDEBUG
-    //n->nDBTest=npDBTest;
+    n->nDBTest=npDBTest;
 #endif
 #ifdef NV_OPS
@@ -466 +466 @@
     /*nSize  = ndSize;*/
 #ifdef LDEBUG
-    //n->nDBTest=nfDBTest;
+    n->nDBTest=nfDBTest;
 #endif
   }
@@ -496 +496 @@
     /*nSize  = ndSize;*/
 #ifdef LDEBUG
-    //n->nDBTest=nrDBTest;
+    n->nDBTest=nrDBTest;
 #endif
   }
@@ -527 +527 @@
     n->nSize  = ndSize;
 #ifdef LDEBUG
-    //n->nDBTest=ngfDBTest;
+    n->nDBTest=ngfDBTest;
 #endif
   }
@@ -561 +561 @@
     /*nSize  = ndSize;*/
 #ifdef LDEBUG
-    //n->nDBTest=ngcDBTest;
+    n->nDBTest=ngcDBTest;
 #endif
   }

kernel/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.5 2006-02-20 11:57:03 bricken Exp $ */
+/* $Id: numbers.h,v 1.6 2007-05-07 16:23:04 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -30 +30 @@
 #define n_Div(a, b, r)        (r)->cf->nDiv(a,b)
 #define n_ExactDiv(a, b, r)   (r)->cf->nExactDiv(a,b)
+#define n_Test(a,r)           (r)->cf->nDBTest(a,__FILE__,__LINE__)
 
 #define n_InpMult(a, b, r)    (r)->cf->nInpMult(a,b,r)

kernel/pDebug.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pDebug.cc,v 1.5 2007-05-03 13:50:09 wienand Exp $
+ *  Version: $Id: pDebug.cc,v 1.6 2007-05-07 16:23:04 Singular Exp $
  *******************************************************************/
 
@@ -245 +245 @@
     pPolyAssumeReturnMsg(p->coef != NULL || (n_GetChar(r) >= 2), "NULL coef");
     #ifdef LDEBUG
-    BOOLEAN npDBTest (number a, char *f, int l);
-    if (n_GetChar(r) >= 2) npDBTest(p->coef,__FILE__,__LINE__);
+    r->cf->nDBTest(p->coef,__FILE__,__LINE__);
     #endif
     pPolyAssumeReturnMsg(!n_IsZero(p->coef, r), "Zero coef");

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.35 2007-05-03 13:50:10 wienand Exp $ */
+/* $Id: structs.h,v 1.36 2007-05-07 16:23:04 Singular Exp $ */
 /*
 * ABSTRACT
@@ -294 +294 @@
    char *  (*nName)(number n);
    void    (*nInpMult)(number &a, number b, ring r);
+#ifdef LDEBUG
+   BOOLEAN (*nDBTest)(number a, char *f,int l);
+#endif
 //extern number  (*nMap)(number from);