Changeset 67c1dc in git

Timestamp:

Dec 14, 2011, 5:07:25 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

81845eb574ce4e246556ba7885ecb3a9be8222a9

Parents:

d92d714be40efcb5b8f903ae5b3bff5d3ed69a4e

git-author:

Martin Lee <martinlee84@web.de>2011-12-14 17:07:25+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00

Message:

adaptation of spielwiese for libfac

chg: switched on interface for libfac stuff

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (5 diffs)
• clapsing.h (modified) (1 diff)

libpolys/polys/clapsing.cc

@@ -15 +15 @@
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
+#ifdef HAVE_LIBFAC
+#include <libfac/factor.h>
+#endif
 #endif
 
@@ -35 +38 @@
 #include "clapconv.h"
 // #include <kernel/clapconv.h>
-// #include <libfac/factor.h>
+
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
@@ -1195 +1198 @@
 }
 
-
-TODO(somebody, add libfac)
-/*matrix singclap_irrCharSeries ( ideal I, const ring r)
+#ifdef HAVE_LIBFAC
+matrix singclap_irrCharSeries ( ideal I, const ring r)
 {
   if (idIs0(I)) return mpNew(1,1);
@@ -1287 +1289 @@
   Off(SW_RATIONAL);
   return res;
-}*/
-
-/*
+}
+
 char* singclap_neworder ( ideal I, const ring r)
 {
@@ -1371 +1372 @@
   if (s[strlen(s)-1]==',') s[strlen(s)-1]='\0';
   return s;
-}*/
+}
+#endif /*HAVE_LIBFAC*/
 
 BOOLEAN singclap_isSqrFree(poly f, const ring r)

libpolys/polys/clapsing.h

@@ -52 +52 @@
 BOOLEAN singclap_isSqrFree(poly f, const ring r);
 
-/* 
- // need libfac??? commented out!
+#ifdef HAVE_LIBFAC
  matrix singclap_irrCharSeries ( ideal I, const ring r);
- char* singclap_neworder ( ideal I, const ring r); 
-*/ 
+ char* singclap_neworder ( ideal I, const ring r);
+#endif 
 
 poly singclap_det( const matrix m, const ring r );