Changeset 1450c9 in git

Timestamp:

Sep 8, 2011, 7:45:45 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

1a20e55502c0dfa3a9f2bef770f1555129241ab4

Parents:

1da2a132d49570abee2ff48d0373549833495572

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-08 19:45:45+02:00

git-committer:

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

Message:

FIX: moved interpreter-related FGLM declarations to Singular/fglm.h
FIX: List template requires an "factory/templates/ftmpl_list.cc" include - UGLY!!!

Files:

• Singular/fglm.cc (modified) (1 diff)
• Singular/fglm.h (added)
• Singular/iparith.cc (modified) (1 diff)
• Singular/makefile (modified) (1 diff)
• factory/ftmpl_inst.cc (modified) (2 diffs)
• kernel/fglm.h (modified) (1 diff)
• kernel/fglmzero.cc (modified) (1 diff)

Singular/fglm.cc

@@ -20 +20 @@
 
 #ifdef HAVE_FACTORY
-#include <Singular/tok.h>
+
+
+#include <omalloc/omalloc.h>
 #include <misc/options.h>
+
+#include <polys/monomials/ring.h>
+#include <polys/monomials/maps.h>
+
+#include <kernel/febase.h>
 #include <kernel/polys.h>
 #include <kernel/ideals.h>
-#include <polys/monomials/ring.h>
+
+#include <kernel/kstd1.h>
+#include <kernel/fglm.h>
+
+#include <Singular/fglm.h>
 #include <Singular/ipid.h>
 #include <Singular/ipshell.h>
-#include <kernel/febase.h>
-#include <polys/monomials/maps.h>
-#include <omalloc/omalloc.h>
-#include <kernel/kstd1.h>
-#include <kernel/fglm.h>
+#include <Singular/tok.h>
+
 
 // internal Version: 1.18.1.6

Singular/iparith.cc

@@ -70 +70 @@
 #ifdef HAVE_FACTORY
 #  include <kernel/fglm.h>
+#  include <Singular/fglm.h>
 #endif /* HAVE_FACTORY */
 #include <Singular/interpolation.h>

Singular/makefile

@@ -164 +164 @@
    eigenval_ip.h \
    feOpt.h \
+   fglm.h \
    gms.h \
    grammar.h \

factory/ftmpl_inst.cc

@@ -16 +16 @@
 #include "factoryconf.h"
 
+#include "factory.h"
+
 #include "templates/ftmpl_array.cc"
 #include "templates/ftmpl_factor.cc"
@@ -21 +23 @@
 #include "templates/ftmpl_functions.h"
 #include "templates/ftmpl_matrix.cc"
-
-#include "factory.h"
 
 

kernel/fglm.h

@@ -85 +85 @@
 BOOLEAN fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal );
 
-// fglmproc(...):
-// The procedure which has to be called from the interpreter for fglm.
-// first is the sourceRing, second is the given ideal in sourceRing.
-// Returns the groebnerbasis of the sourceIdeal in the currentRing.
-// Checks, if the ideal is really a reduced groebner basis of a
-// 0-dimensional Ideal. Returns TRUE if an error occoured.
-BOOLEAN fglmProc( leftv result, leftv first, leftv second );
-
-// fglmquotproc(...):
-// The procedure which has to be called from the interpreter for fglmquot.
-// first is the ideal I, second is the polynomial q. The polynomial must
-// be reduced with respect to I.
-// Returns the groebnerbasis of I:q in the currentRing.
-// Checks, if the ideal is really a reduced groebner basis of a
-// 0-dimensional Ideal and if q is really reduced.
-//  Returns TRUE if an error occoured.
-BOOLEAN fglmQuotProc( leftv result, leftv first, leftv second );
-
-// FindUnivariatePolys (test)
-BOOLEAN FindUnivariateWrapper( ideal source, ideal & dest );
-
-// wrapper for FindUnivariatePolys (test)
-BOOLEAN findUniProc( leftv result, leftv first);
-
-// homogeneous FGLM
-ideal fglmhomProc(leftv first, leftv second);
 #endif
 #endif

kernel/fglmzero.cc

@@ -20 +20 @@
 
 #include <kernel/mod2.h>
+
+
 #ifdef HAVE_FACTORY
 // assumes, that NOSTREAMIO is set in factoryconf.h, which is included
 // by templates/list.h.
+
 #include <factory/factory.h>
+
 #include <factory/templates/ftmpl_list.h>
+#include <factory/templates/ftmpl_list.cc>
+
+#include <omalloc/omalloc.h>
 
 #include <misc/options.h>
+#include <misc/intvec.h>
+
+#include <polys/monomials/maps.h>
+#include <polys/monomials/ring.h>
+
 #include <kernel/polys.h>
 #include <kernel/ideals.h>
-#include <polys/monomials/ring.h>
 #include <kernel/febase.h>
-#include <polys/monomials/maps.h>
-#include <omalloc/omalloc.h>
 #include <kernel/kstd1.h>
-#include <misc/intvec.h>
+
 #include <kernel/fglm.h>
 #include <kernel/fglmvec.h>
 #include <kernel/fglmgauss.h>
+
 #define PROT(msg)
 #define STICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)