Changeset 48a994 in git

Timestamp:

May 24, 2011, 5:26:59 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

141342d81455232f75bdb4b9179a8cd396939ba4

Parents:

fd01a83f2928a88d4e9d30135f2d31d120fe30b3

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-24 17:26:59+02:00

git-committer:

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

Message:

factory-related includes

Files:

• .gitignore (modified) (2 diffs)
• libpolys/coeffs/coeffs.h (modified) (1 diff)
• libpolys/tests/polys_test.h (modified) (3 diffs)

.gitignore

@@ -11 +11 @@
 .libs
 doc/
+MOD
 factory/readcf.cc
 factory/ylwrap
@@ -41 +42 @@
 libpolys/polys/templates/p_Procs.inc
 libpolys/polys/m4/
-libpolys/coeffs/test
-libpolys/coeffs/test-g
+libpolys/coeffs/tt-r
+libpolys/coeffs/tt-g
 libpolys/polys/templates/.dirstamp
 libpolys/libpolys-config

libpolys/coeffs/coeffs.h

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

libpolys/tests/polys_test.h

@@ -20 +20 @@
 
 #include <polys/simpleideals.h>
+
+#ifdef HAVE_FACTORY
 #include <polys/clapsing.h>
+#include <factory/factory.h>
+#endif
 
 class MyGlobalPrintingFixture : public GlobalPrintingFixture
@@ -846 +850 @@
     Test(s);
     
+#ifdef HAVE_FACTORY
     poly f = p_ISet(3, s);
     p_SetExp(f, 1, 3, s);
@@ -860 +865 @@
     plusTerm(g, 8, 1, 4, s); // 7*u^5*v^6*w^2 + 8*u^4
     p_Write(g, s);
-    poly h = singclap_gcd(f, g, s);   // u^3*v*w^2, destroys f and g
+    poly h = singclap_gcd(f, g, s);   // at least u^3, destroys f and g
     p_Write(h, s);
     p_Test(h, s);
     p_Delete(&h, s);
-    
+#endif
     rDelete(s); // kills 'cf' and 'r' as well
   }