Changeset 1450c9 in git


Ignore:
Timestamp:
Sep 8, 2011, 7:45:45 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
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:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/fglm.cc

    r1da2a13 r1450c9  
    2020
    2121#ifdef HAVE_FACTORY
    22 #include <Singular/tok.h>
     22
     23
     24#include <omalloc/omalloc.h>
    2325#include <misc/options.h>
     26
     27#include <polys/monomials/ring.h>
     28#include <polys/monomials/maps.h>
     29
     30#include <kernel/febase.h>
    2431#include <kernel/polys.h>
    2532#include <kernel/ideals.h>
    26 #include <polys/monomials/ring.h>
     33
     34#include <kernel/kstd1.h>
     35#include <kernel/fglm.h>
     36
     37#include <Singular/fglm.h>
    2738#include <Singular/ipid.h>
    2839#include <Singular/ipshell.h>
    29 #include <kernel/febase.h>
    30 #include <polys/monomials/maps.h>
    31 #include <omalloc/omalloc.h>
    32 #include <kernel/kstd1.h>
    33 #include <kernel/fglm.h>
     40#include <Singular/tok.h>
     41
    3442
    3543// internal Version: 1.18.1.6
  • Singular/iparith.cc

    r1da2a13 r1450c9  
    7070#ifdef HAVE_FACTORY
    7171#  include <kernel/fglm.h>
     72#  include <Singular/fglm.h>
    7273#endif /* HAVE_FACTORY */
    7374#include <Singular/interpolation.h>
  • Singular/makefile

    r1da2a13 r1450c9  
    164164   eigenval_ip.h \
    165165   feOpt.h \
     166   fglm.h \
    166167   gms.h \
    167168   grammar.h \
  • factory/ftmpl_inst.cc

    r1da2a13 r1450c9  
    1616#include "factoryconf.h"
    1717
     18#include "factory.h"
     19
    1820#include "templates/ftmpl_array.cc"
    1921#include "templates/ftmpl_factor.cc"
     
    2123#include "templates/ftmpl_functions.h"
    2224#include "templates/ftmpl_matrix.cc"
    23 
    24 #include "factory.h"
    2525
    2626
  • kernel/fglm.h

    r1da2a13 r1450c9  
    8585BOOLEAN fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal );
    8686
    87 // fglmproc(...):
    88 // The procedure which has to be called from the interpreter for fglm.
    89 // first is the sourceRing, second is the given ideal in sourceRing.
    90 // Returns the groebnerbasis of the sourceIdeal in the currentRing.
    91 // Checks, if the ideal is really a reduced groebner basis of a
    92 // 0-dimensional Ideal. Returns TRUE if an error occoured.
    93 BOOLEAN fglmProc( leftv result, leftv first, leftv second );
    94 
    95 // fglmquotproc(...):
    96 // The procedure which has to be called from the interpreter for fglmquot.
    97 // first is the ideal I, second is the polynomial q. The polynomial must
    98 // be reduced with respect to I.
    99 // Returns the groebnerbasis of I:q in the currentRing.
    100 // Checks, if the ideal is really a reduced groebner basis of a
    101 // 0-dimensional Ideal and if q is really reduced.
    102 //  Returns TRUE if an error occoured.
    103 BOOLEAN fglmQuotProc( leftv result, leftv first, leftv second );
    104 
    105 // FindUnivariatePolys (test)
    106 BOOLEAN FindUnivariateWrapper( ideal source, ideal & dest );
    107 
    108 // wrapper for FindUnivariatePolys (test)
    109 BOOLEAN findUniProc( leftv result, leftv first);
    110 
    111 // homogeneous FGLM
    112 ideal fglmhomProc(leftv first, leftv second);
    11387#endif
    11488#endif
  • kernel/fglmzero.cc

    r1da2a13 r1450c9  
    2020
    2121#include <kernel/mod2.h>
     22
     23
    2224#ifdef HAVE_FACTORY
    2325// assumes, that NOSTREAMIO is set in factoryconf.h, which is included
    2426// by templates/list.h.
     27
    2528#include <factory/factory.h>
     29
    2630#include <factory/templates/ftmpl_list.h>
     31#include <factory/templates/ftmpl_list.cc>
     32
     33#include <omalloc/omalloc.h>
    2734
    2835#include <misc/options.h>
     36#include <misc/intvec.h>
     37
     38#include <polys/monomials/maps.h>
     39#include <polys/monomials/ring.h>
     40
    2941#include <kernel/polys.h>
    3042#include <kernel/ideals.h>
    31 #include <polys/monomials/ring.h>
    3243#include <kernel/febase.h>
    33 #include <polys/monomials/maps.h>
    34 #include <omalloc/omalloc.h>
    3544#include <kernel/kstd1.h>
    36 #include <misc/intvec.h>
     45
    3746#include <kernel/fglm.h>
    3847#include <kernel/fglmvec.h>
    3948#include <kernel/fglmgauss.h>
     49
    4050#define PROT(msg)
    4151#define STICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)
Note: See TracChangeset for help on using the changeset viewer.