Changeset fea2af in git

Timestamp:

Dec 19, 2011, 3:54:56 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

bd795d65c1de21a3593013aca57c80f6128ba318

Parents:

76f3a18e5ce9a6a62d719dfb53dd5439883be370

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-19 15:54:56+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:28:00+01:00

Message:

SW cannot be built without factory

FIX: fixed libpolys and Singular/eigenval_ip.cc (quick and dirty)

TODO: make check in libpolys/tests -> all dynamic tests are missing SearchPATH :(
TODO: undefined reference to strat_fac_debug & strat_nr?

TODO: kernel? Singular?

Files:

• Singular/eigenval_ip.cc (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (1 diff)
• libpolys/polys/clapconv.cc (modified) (2 diffs)
• libpolys/polys/clapconv.h (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (2 diffs)
• libpolys/polys/clapsing.h (modified) (2 diffs)

Singular/eigenval_ip.cc

@@ -180 +180 @@
 
       intvec *m0;
+#ifdef HAVE_FACTORY      
       ideal e0=singclap_factorize(mp_DetBareiss(M,currRing),&m0,2, currRing);
+#else
+      WarnS("cannot factorize due to missing module 'factory'");
+      ideal e0=NULL;
+#endif
+      
       if (e0==NULL)
       {

libpolys/coeffs/longrat.cc

@@ -2617 +2617 @@
 #else
   WerrorS("not implemented");
-  return nlInit(0);
+  return nlInit(0, C);
 #endif
 }

libpolys/polys/clapconv.cc

@@ -11 +11 @@
 #include "config.h"
 #include <misc/auxiliary.h>
+
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
@@ -432 +433 @@
 
 #endif
-#endif
+#endif /* HAVE_FACTORY */

libpolys/polys/clapconv.h

@@ -35 +35 @@
 poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r );
 
-// HAVE_FACTORY
-#endif 
+#endif /* HAVE_FACTORY */
 
 #endif /* INCL_SINGCONV_H */

libpolys/polys/clapsing.cc

@@ -14 +14 @@
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
+
 #include <factory/factory.h>
+
 #ifdef HAVE_LIBFAC
 #include <factory/libfac/factor.h>
 #endif
-#endif
+
 
 #include <omalloc/omalloc.h>
@@ -1558 +1560 @@
 #endif
 
+
+#endif /* HAVE_FACTORY */

libpolys/polys/clapsing.h

@@ -11 +11 @@
 #ifndef INCL_FACTORYSING_H
 #define INCL_FACTORYSING_H
+
+
+#ifdef HAVE_FACTORY
 
 #include <polys/monomials/p_polys.h>
@@ -62 +65 @@
 number   nChineseRemainder(number *x, number *q,int rl, const coeffs r);
 
+
+#endif /* HAVE_FACTORY */
+
+
 #endif /* INCL_FACTORYSING_H */