Changeset 9eb0f9 in git

Timestamp:

May 23, 2011, 8:10:02 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

b2366e1febbada8a1c36d078ca1dff3e839e9988

Parents:

2f0314b588c9d83a52b5e2ded26f85edb4ea9593

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-23 20:10:02+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:49+01:00

Message:

FIX: test coeffs using factory AND ntl (without public use of factory in coeffs.h)

Location:

libpolys/coeffs

Files:

• Makefile.am (modified) (1 diff)
• coeffs.h (modified) (1 diff)
• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (1 diff)
• numbers.cc (modified) (1 diff)
• test.cc (modified) (3 diffs)

libpolys/coeffs/Makefile.am

@@ -51 +51 @@
 check_PROGRAMS = $(TESTS)
 
-test_SOURCES   = test.cc gftables
-test_g_SOURCES = test.cc gftables
+test_SOURCES   = test.cc 
+test_g_SOURCES = test.cc
 
 test_LDADD   = -lcoeffs ${GMP_LIBS} -lresources -lreporter -lmisc ${FACTORY_LIBS} ${NTL_LIBS} -lomalloc
 test_g_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} ${NTL_LIBS} -lomalloc_g
 
-
+test: gftables
+test_g: gftables
 
 test_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}

libpolys/coeffs/coeffs.h

@@ -16 +16 @@
 
 #ifdef HAVE_FACTORY
- #include <factory/factory.h>
-//class CanonicalForm;
+class CanonicalForm;
 #endif
 

libpolys/coeffs/longrat.cc

@@ -8 +8 @@
 
 #include <coeffs/longrat.h>
+
 
 // 64 bit version:
@@ -43 +44 @@
 #include <string.h>
 #include <float.h>
+
 #include "config.h"
 #include <coeffs/coeffs.h>
 #include <reporter/reporter.h>
 #include <omalloc/omalloc.h>
+
 #include <coeffs/numbers.h>
 #include <coeffs/modulop.h>
 #include <coeffs/shortfl.h>
 #include <coeffs/mpr_complex.h>
-#include <coeffs/longrat.h>
-
+
+#ifdef HAVE_FACTORY
+#include <factory/factory.h>
+#endif
 
 #ifndef BYTES_PER_MP_LIMB

libpolys/coeffs/longrat.h

@@ -8 +8 @@
 * ABSTRACT: computation with long rational numbers
 */
-#include <coeffs/coeffs.h>
-// #include "config.h"
-#include "si_gmp.h"
 #include <misc/auxiliary.h>
 #include <omalloc/omalloc.h>
+#include <coeffs/si_gmp.h>
+#include <coeffs/coeffs.h>
 
 #define SR_HDL(A) ((long)(A))

libpolys/coeffs/numbers.cc

@@ -29 +29 @@
 #include <coeffs/rintegers.h>
 #endif
+
+#ifdef HAVE_FACTORY
+#include <factory/factory.h>
+#endif
+
 #include <string.h>
 #include <stdlib.h>

libpolys/coeffs/test.cc

@@ -4 +4 @@
 
 #include <reporter/reporter.h>
+#include <resources/feResource.h>
 
 #include <coeffs/coeffs.h>
@@ -17 +18 @@
 #include <coeffs/rmodulo2m.h>
 #include <coeffs/rintegers.h>
+
+
 #ifdef HAVE_FACTORY
 int initializeGMP(){ return 1; }
@@ -254 +257 @@
 
 
-
-
-int main()
-{
+int main( int, char *argv[] ) 
+{
+  feInitResources(argv[0]);
+
+  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
+  feStringAppendResources(0);
+  PrintS(StringAppendS("\n"));
+
+
   int c = 0;