Changeset 2bd9ca in git

Timestamp:

Jun 16, 2010, 1:20:19 PM (13 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

fb104b7d78bc189a491c27b263c1337ce820192f

Parents:

e26570af1d6e72bc74fe694d1a8c3e3e8ea624e3

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-06-16 13:20:19+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:10+01:00

Message:

inline vs. macros (first steps)

Location:

coeffs

Files:

• Makefile.in (modified) (2 diffs)
• coeffs.h (modified) (4 diffs)
• test.cc (modified) (1 diff)

coeffs/Makefile.in

@@ -35 +35 @@
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
 CPPFLAGS        = -I${srcdir} -I${includedir} -I${srcdir}/../misc/ -I${srcdir}/../resource/ -I${srcdir}/../reporter/ -L${srcdir}/../reporter/ -L${libdir} -lgmp
-DEFS            = -Dix86_Linux -DHAVE_CONFIG_H -DLDEBUG -DDEBUG -DOM_DEBUG -DHAVE_ASSUME -DHAVE_RINGS 
+DEFS            = -Dix86_Linux -DHAVE_CONFIG_H -DLDEBUG -DDEBUG -DOM_DEBUG -DHAVE_ASSUME
+
+#-DHAVE_RINGS 
 # -DHAVE_RINGS # Doesn't work :(
 # -DNDEBUG -DOM_NDEBUG 
@@ -78 +80 @@
 mostlyclean: 
         -rm -f *.o *.og core *.op
-        
-
 
 cleantest: 
         -rm -Rf test test.dSYM/
-        
 
 clean: mostlyclean cleantest
         -rm -f *.bak *.d *.dd depend *.a *.so*
-        
-
 
 tags:   

coeffs/coeffs.h

@@ -9 +9 @@
 */
 
-#include <aux.h>
+#include <auxiliary.h>
+#include <si_gmp.h>
 
 enum n_coeffType
@@ -31 +32 @@
 struct snumber;
 typedef struct snumber *   number;
+
+/* standard types */
+#ifdef HAVE_RINGS
+typedef unsigned long NATNUMBER;
+typedef mpz_ptr int_number;
+#endif
 
 //
@@ -55 +62 @@
 #define n_Invers(a, r)        (r)->cfInvers(a,r)
 #define n_ExactDiv(a, b, r)   (r)->cfExactDiv(a,b,r)
-#define n_Test(a,r)           (r)->cfDBTest(a,r,__FILE__,__LINE__)
-
+// #define n_Test(a,r)           (r)->cfDBTest(a,r,__FILE__,__LINE__)
 #define n_InpMult(a, b, r)    (r)->cfInpMult(a,b,r)
 #define n_Power(a, b, res, r) (r)->cfPower(a,b,res,r)
@@ -246 +252 @@
 #define n_New(n, r)           nNew(n)
 
-#endif
-
+static inline BOOLEAN n_DBTest(number a, const char *filename, const int linenumber, const coeffs r)
+{
+#ifdef LDEBUG
+  //return (r)->cfDBTest(a, filename, linenumber, r);
+  return (r)->cfDBTest(a,r,filename,linenumber);
+#else
+  return TRUE;
+#endif
+}
+/// BOOLEAN n_Test(number a, const coeffs r)
+#define n_Test(a,r)  n_DBTest(a, __FILE__, __LINE__, r)
+
+#endif
+

coeffs/test.cc

@@ -21 +21 @@
   number a = r->cfInit(666, r); 
   number b = r->cfAdd( a, a, r);
-
+  
+  n_Test(a,r);
+  n_Test(b,r);
+  
   StringSetS("a: ");r->cfWrite( a, r );PrintS(StringAppend("\n"));
   StringSetS("b: "); r->cfWrite( b, r );PrintS(StringAppend("\n"));