Changeset 0fb34ba in git


Ignore:
Timestamp:
Aug 1, 2011, 6:15:44 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
5835ba44a28ead9218efcd254fc0ecbf3e32c968
Parents:
57592b355247b69310d60aa0448d638c327ad3e8
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-01 18:15:44+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:01:19+01:00
Message:
start with dir Singular: fix includes and makefile
Location:
Singular
Files:
49 edited

Legend:

Unmodified
Added
Removed

  • Singular/Minor.cc

    r57592b3 r0fb34ba  
    11#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    3 #include <kernel/polys.h>
     3#include <polys/polys.h>
    44#include <Minor.h>
    55#include <kernel/febase.h>

  • Singular/MinorInterface.cc

    r57592b3 r0fb34ba  
    11#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    3 #include <kernel/polys.h>
     3#include <polys/polys.h>
    44#include <kernel/ideals.h>
    55#include <kernel/kstd1.h>
    6 #include <kernel/matpol.h>
     6#include <polys/matpol.h>
    77#include <MinorInterface.h>
    88#include <MinorProcessor.h>

  • Singular/MinorProcessor.cc

    r57592b3 r0fb34ba  
    11#include <kernel/mod2.h>
    22#include <kernel/structs.h>
    3 #include <kernel/polys.h>
     3#include <polys/polys.h>
    44#include <MinorProcessor.h>
    55#include <kernel/febase.h>
    66#include <kernel/kstd1.h>
    7 #include <kernel/kbuckets.h>
     7#include <polys/kbuckets.h>
    88
    99#ifdef COUNT_AND_PRINT_OPERATIONS

  • Singular/attrib.cc

    r57592b3 r0fb34ba  
    1616#include <kernel/mod2.h>
    1717#include <omalloc/omalloc.h>
    18 #include <kernel/options.h>
     18#include <misc/options.h>
    1919#include <Singular/tok.h>
    2020#include <Singular/ipid.h>
    21 #include <kernel/intvec.h>
    22 #include <kernel/polys.h>
     21#include <misc/intvec.h>
     22#include <polys/polys.h>
    2323#include <kernel/ideals.h>
    24 #include <kernel/matpol.h>
     24#include <polys/matpol.h>
    2525#include <Singular/ipshell.h>
    2626#include <Singular/attrib.h>

  • Singular/bbcone.cc

    r57592b3 r0fb34ba  
    1212#include <kernel/bbcone.h>
    1313#include <ipshell.h>
    14 #include <kernel/intvec.h>
     14#include <misc/intvec.h>
    1515#include <sstream>
    1616

  • Singular/bbfan.cc

    r57592b3 r0fb34ba  
    1111#include <Singular/bbcone.h>
    1212#include <ipshell.h>
    13 #include <kernel/intvec.h>
     13#include <misc/intvec.h>
    1414#include <sstream>
    1515#include <gfanlib/gfanlib.h>

  • Singular/calcSVD.cc

    r57592b3 r0fb34ba  
    66#include <Singular/svd_si.h>
    77#include <kernel/structs.h>
    8 #include <kernel/polys.h>
    9 #include <kernel/matpol.h>
     8#include <polys/polys.h>
     9#include <polys/matpol.h>
    1010#include <Singular/lists.h>
    1111#include <kernel/febase.h>

  • Singular/cntrlc.cc

    r57592b3 r0fb34ba  
    2424#include <kernel/febase.h>
    2525#include <Singular/cntrlc.h>
    26 #include <kernel/polys.h>
     26#include <polys/polys.h>
    2727#include <Singular/feOpt.h>
    2828#include <Singular/version.h>

  • Singular/eigenval_ip.cc

    r57592b3 r0fb34ba  
    1414#include <Singular/tok.h>
    1515#include <Singular/ipid.h>
    16 #include <kernel/intvec.h>
    17 #include <kernel/numbers.h>
    18 #include <kernel/polys.h>
     16#include <misc/intvec.h>
     17#include <coeffs/numbers.h>
     18#include <polys/polys.h>
    1919#include <kernel/ideals.h>
    2020#include <Singular/lists.h>
    21 #include <kernel/matpol.h>
     21#include <polys/matpol.h>
    2222#include <kernel/clapsing.h>
    2323#include <kernel/eigenval.h>

  • Singular/extra.cc

    r57592b3 r0fb34ba  
    3636
    3737#include <Singular/tok.h>
    38 #include <kernel/options.h>
     38#include <misc/options.h>
    3939#include <Singular/ipid.h>
    40 #include <kernel/polys.h>
     40#include <polys/polys.h>
    4141#include <Singular/lists.h>
    4242#include <kernel/kutil.h>
    … …  
    4646#include <kernel/modulop.h>
    4747#include <kernel/febase.h>
    48 #include <kernel/matpol.h>
     48#include <polys/matpol.h>
    4949#include <kernel/longalg.h>
    5050#include <kernel/ideals.h>
    … …  
    5454#include <Singular/feOpt.h>
    5555#include <Singular/distrib.h>
    56 #include <kernel/prCopy.h>
     56#include <polys/prCopy.h>
    5757#include <kernel/mpr_complex.h>
    5858#include <kernel/ffields.h>
    … …  
    7676#endif
    7777
    78 #include <kernel/weight.h>
     78#include <polys/weight.h>
    7979#include <kernel/fast_mult.h>
    8080#include <kernel/digitech.h>
    … …  
    9696#include <kernel/sca.h>
    9797#ifdef HAVE_PLURAL
    98 #include <kernel/ring.h>
     98#include <polys/monomials/ring.h>
    9999#include <kernel/ncSAMult.h> // for CMultiplier etc classes
    100100#include <Singular/ipconv.h>
    101 #include <kernel/ring.h>
     101#include <polys/monomials/ring.h>
    102102#ifdef HAVE_RATGRING
    103103#include <kernel/ratgring.h>
    … …  
    132132#include <Singular/walk.h>
    133133
    134 #include <kernel/maps.h>
     134#include <polys/monomials/maps.h>
    135135
    136136#include <kernel/shiftgb.h>
    … …  
    22072207#  endif
    22082208#  include <mpsr.h>
    2209 #  include <kernel/mod_raw.h>
    2210 #  include <kernel/ring.h>
     2209#  include <polys/mod_raw.h>
     2210#  include <polys/monomials/ring.h>
    22112211#  include <kernel/shiftgb.h>
    22122212

  • Singular/feOpt.cc

    r57592b3 r0fb34ba  
    1212#include <Singular/feOpt.h>
    1313#if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
    14 #include <kernel/options.h>
     14#include <misc/options.h>
    1515#endif
    1616

  • Singular/fglm.cc

    r57592b3 r0fb34ba  
    2121#ifdef HAVE_FACTORY
    2222#include <Singular/tok.h>
    23 #include <kernel/options.h>
    24 #include <kernel/polys.h>
     23#include <misc/options.h>
     24#include <polys/polys.h>
    2525#include <kernel/ideals.h>
    26 #include <kernel/ring.h>
     26#include <polys/monomials/ring.h>
    2727#include <Singular/ipid.h>
    2828#include <Singular/ipshell.h>
    2929#include <kernel/febase.h>
    30 #include <kernel/maps.h>
     30#include <polys/monomials/maps.h>
    3131#include <omalloc/omalloc.h>
    3232#include <kernel/kstd1.h>

  • Singular/gms.cc

    r57592b3 r0fb34ba  
    1313#include <kernel/febase.h>
    1414#include <kernel/structs.h>
    15 #include <kernel/numbers.h>
    16 #include <kernel/polys.h>
     15#include <coeffs/numbers.h>
     16#include <polys/polys.h>
    1717#include <kernel/ideals.h>
    1818#include <Singular/lists.h>
    19 #include <kernel/matpol.h>
     19#include <polys/matpol.h>
    2020#include <Singular/gms.h>
    2121

  • Singular/grammar.cc

    r57592b3 r0fb34ba  
    322322#include <omalloc/omalloc.h>
    323323#include <Singular/tok.h>
    324 #include <kernel/options.h>
     324#include <misc/options.h>
    325325#include <Singular/stype.h>
    326326#include <Singular/ipid.h>
    327 #include <kernel/intvec.h>
     327#include <misc/intvec.h>
    328328#include <kernel/febase.h>
    329 #include <kernel/matpol.h>
    330 #include <kernel/ring.h>
     329#include <polys/matpol.h>
     330#include <polys/monomials/ring.h>
    331331#include <kernel/kstd1.h>
    332332#include <Singular/subexpr.h>
    … …  
    335335#include <Singular/sdb.h>
    336336#include <kernel/ideals.h>
    337 #include <kernel/numbers.h>
    338 #include <kernel/polys.h>
     337#include <coeffs/numbers.h>
     338#include <polys/polys.h>
    339339#include <kernel/stairc.h>
    340340#include <kernel/timer.h>
    341341#include <Singular/cntrlc.h>
    342 #include <kernel/maps.h>
     342#include <polys/monomials/maps.h>
    343343#include <kernel/syz.h>
    344344#include <Singular/lists.h>

  • Singular/grammar.y

    r57592b3 r0fb34ba  
    1818#include <omalloc/omalloc.h>
    1919#include <Singular/tok.h>
    20 #include <kernel/options.h>
     20#include <misc/options.h>
    2121#include <Singular/stype.h>
    2222#include <Singular/ipid.h>
    23 #include <kernel/intvec.h>
     23#include <misc/intvec.h>
    2424#include <kernel/febase.h>
    25 #include <kernel/matpol.h>
    26 #include <kernel/ring.h>
     25#include <polys/matpol.h>
     26#include <polys/monomials/ring.h>
    2727#include <kernel/kstd1.h>
    2828#include <Singular/subexpr.h>
    … …  
    3131#include <Singular/sdb.h>
    3232#include <kernel/ideals.h>
    33 #include <kernel/numbers.h>
    34 #include <kernel/polys.h>
     33#include <coeffs/numbers.h>
     34#include <polys/polys.h>
    3535#include <kernel/stairc.h>
    3636#include <kernel/timer.h>
    3737#include <Singular/cntrlc.h>
    38 #include <kernel/maps.h>
     38#include <polys/monomials/maps.h>
    3939#include <kernel/syz.h>
    4040#include <Singular/lists.h>

  • Singular/interpolation.cc

    r57592b3 r0fb34ba  
    55
    66#include <kernel/mod2.h>
    7 #include <kernel/options.h>
     7#include <misc/options.h>
    88#include <kernel/febase.h>
    99#include <kernel/ideals.h>
    10 #include <kernel/intvec.h>
    11 #include <kernel/polys.h>
     10#include <misc/intvec.h>
     11#include <polys/polys.h>
    1212#include <Singular/lists.h>
    1313#include <kernel/longrat.h>
    1414#include <Singular/ipid.h>
    15 #include <kernel/ring.h>
     15#include <polys/monomials/ring.h>
    1616#ifdef HAVE_FACTORY
    1717#define SI_DONT_HAVE_GLOBAL_VARS

  • Singular/iparith.cc

    r57592b3 r0fb34ba  
    1717#include <kernel/mod2.h>
    1818#include <Singular/tok.h>
    19 #include <kernel/options.h>
     19#include <misc/options.h>
    2020#include <Singular/ipid.h>
    21 #include <kernel/intvec.h>
     21#include <misc/intvec.h>
    2222#include <omalloc/omalloc.h>
    23 #include <kernel/polys.h>
     23#include <polys/polys.h>
    2424#include <kernel/febase.h>
    2525#include <Singular/sdb.h>
    … …  
    2727#include <kernel/longtrans.h>
    2828#include <kernel/ideals.h>
    29 #include <kernel/prCopy.h>
    30 #include <kernel/matpol.h>
     29#include <polys/prCopy.h>
     30#include <polys/matpol.h>
    3131#include <kernel/kstd1.h>
    3232#include <kernel/timer.h>
    33 #include <kernel/ring.h>
     33#include <polys/monomials/ring.h>
    3434#include <Singular/subexpr.h>
    3535#include <Singular/lists.h>
    … …  
    4040#include <kernel/rintegers.h>
    4141#endif
    42 #include <kernel/numbers.h>
     42#include <coeffs/numbers.h>
    4343#include <kernel/stairc.h>
    44 #include <kernel/maps.h>
     44#include <polys/monomials/maps.h>
    4545#include <Singular/maps_ip.h>
    4646#include <kernel/syz.h>
    47 #include <kernel/weight.h>
     47#include <polys/weight.h>
    4848#include <Singular/ipconv.h>
    4949#include <Singular/ipprint.h>
    … …  
    5656#include <kernel/tgb.h>
    5757#include <kernel/walkProc.h>
    58 #include <kernel/mod_raw.h>
     58#include <polys/mod_raw.h>
    5959#include <Singular/MinorInterface.h>
    6060#include <kernel/linearAlgebra.h>

  • Singular/ipassign.cc

    r57592b3 r0fb34ba  
    1515#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    17 #include <kernel/options.h>
     17#include <misc/options.h>
    1818#include <Singular/ipid.h>
    1919#include <kernel/idrec.h>
    20 #include <kernel/intvec.h>
     20#include <misc/intvec.h>
    2121#include <omalloc/omalloc.h>
    2222#include <kernel/febase.h>
    23 #include <kernel/polys.h>
     23#include <polys/polys.h>
    2424#include <kernel/ideals.h>
    25 #include <kernel/matpol.h>
     25#include <polys/matpol.h>
    2626#include <kernel/kstd1.h>
    2727#include <kernel/timer.h>
    28 #include <kernel/ring.h>
     28#include <polys/monomials/ring.h>
    2929#include <Singular/subexpr.h>
    3030#include <Singular/lists.h>
    31 #include <kernel/numbers.h>
     31#include <coeffs/numbers.h>
    3232#include <kernel/longalg.h>
    3333#include <kernel/stairc.h>
    34 #include <kernel/maps.h>
     34#include <polys/monomials/maps.h>
    3535#include <kernel/syz.h>
    3636//#include "weight.h"

  • Singular/ipconv.cc

    r57592b3 r0fb34ba  
    1010#include <Singular/tok.h>
    1111#include <Singular/ipid.h>
    12 #include <kernel/intvec.h>
    13 #include <kernel/options.h>
     12#include <misc/intvec.h>
     13#include <misc/options.h>
    1414#include <omalloc/omalloc.h>
    1515#include <kernel/febase.h>
    16 #include <kernel/polys.h>
     16#include <polys/polys.h>
    1717#include <kernel/ideals.h>
    1818#include <Singular/subexpr.h>
    19 #include <kernel/numbers.h>
     19#include <coeffs/numbers.h>
    2020#include <kernel/modulop.h>
    2121#include <kernel/longrat.h>
    … …  
    2626#include <kernel/rintegers.h>
    2727#endif
    28 #include <kernel/matpol.h>
     28#include <polys/matpol.h>
    2929#include <Singular/silink.h>
    3030#include <kernel/syz.h>
    3131#include <Singular/attrib.h>
    32 #include <kernel/ring.h>
     32#include <polys/monomials/ring.h>
    3333#include <Singular/ipshell.h>
    3434#include <Singular/ipconv.h>

  • Singular/ipid.cc

    r57592b3 r0fb34ba  
    1414#include <omalloc/omalloc.h>
    1515#include <Singular/tok.h>
    16 #include <kernel/options.h>
     16#include <misc/options.h>
    1717#include <Singular/ipshell.h>
    18 #include <kernel/intvec.h>
     18#include <misc/intvec.h>
    1919#include <kernel/febase.h>
    20 #include <kernel/numbers.h>
     20#include <coeffs/numbers.h>
    2121#include <kernel/longrat.h>
    22 #include <kernel/polys.h>
    23 #include <kernel/ring.h>
     22#include <polys/polys.h>
     23#include <polys/monomials/ring.h>
    2424#include <kernel/ideals.h>
    25 #include <kernel/matpol.h>
     25#include <polys/matpol.h>
    2626#include <Singular/lists.h>
    2727#include <Singular/attrib.h>
    … …  
    3232
    3333#ifdef HAVE_DYNAMIC_LOADING
    34 #include <kernel/mod_raw.h>
     34#include <polys/mod_raw.h>
    3535#endif /* HAVE_DYNAMIC_LOADING */
    3636

  • Singular/iplib.cc

    r57592b3 r0fb34ba  
    1616#include <Singular/static.h>
    1717#include <Singular/tok.h>
    18 #include <kernel/options.h>
     18#include <misc/options.h>
    1919#include <Singular/ipid.h>
    2020#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    22 #include <kernel/ring.h>
     22#include <polys/monomials/ring.h>
    2323#include <Singular/subexpr.h>
    2424#include <Singular/ipshell.h>
    … …  
    5959                         short nToktype, short nPos);
    6060
    61 #include <kernel/mod_raw.h>
     61#include <polys/mod_raw.h>
    6262
    6363#ifdef HAVE_LIBPARSER

  • Singular/ipprint.cc

    r57592b3 r0fb34ba  
    1212#include <omalloc/omalloc.h>
    1313#include <kernel/febase.h>
    14 #include <kernel/polys.h>
    15 #include <kernel/matpol.h>
     14#include <polys/polys.h>
     15#include <polys/matpol.h>
    1616#include <Singular/subexpr.h>
    17 #include <kernel/intvec.h>
     17#include <misc/intvec.h>
    1818#include <Singular/ipshell.h>
    1919#include <Singular/ipprint.h>

  • Singular/ipshell.cc

    r57592b3 r0fb34ba  
    1515#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    17 #include <kernel/options.h>
     17#include <misc/options.h>
    1818#include <Singular/ipid.h>
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    22 #include <kernel/polys.h>
    23 #include <kernel/prCopy.h>
     22#include <polys/polys.h>
     23#include <polys/prCopy.h>
    2424#include <kernel/ideals.h>
    25 #include <kernel/matpol.h>
     25#include <polys/matpol.h>
    2626#include <kernel/kstd1.h>
    27 #include <kernel/ring.h>
     27#include <polys/monomials/ring.h>
    2828#include <Singular/subexpr.h>
    29 #include <kernel/maps.h>
     29#include <polys/monomials/maps.h>
    3030#include <kernel/syz.h>
    31 #include <kernel/numbers.h>
     31#include <coeffs/numbers.h>
    3232#include <kernel/modulop.h>
    3333#include <kernel/longalg.h>
    … …  
    3737#include <Singular/silink.h>
    3838#include <kernel/stairc.h>
    39 #include <kernel/weight.h>
     39#include <polys/weight.h>
    4040#include <kernel/semic.h>
    4141#include <kernel/splist.h>
    … …  
    4646#include <kernel/clapsing.h>
    4747#include <kernel/hutil.h>
    48 #include <kernel/ring.h>
     48#include <polys/monomials/ring.h>
    4949#include <Singular/ipshell.h>
    5050#ifdef HAVE_FACTORY

  • Singular/janet.cc

    r57592b3 r0fb34ba  
    66#include <kernel/mod2.h>
    77#include <omalloc/omalloc.h>
    8 #include <kernel/polys.h>
    9 #include <kernel/numbers.h>
    10 #include <kernel/ring.h>
     8#include <polys/polys.h>
     9#include <coeffs/numbers.h>
     10#include <polys/monomials/ring.h>
    1111#include <kernel/ideals.h>
    1212#include <Singular/subexpr.h>
    13 #include <kernel/kbuckets.h>
     13#include <polys/kbuckets.h>
    1414#include <kernel/longrat.h>
    1515

  • Singular/janet.h

    • Property mode changed from 100755 to 100644

  • Singular/libparse.cc

    r57592b3 r0fb34ba  
    10691069  #include <Singular/ipid.h>
    10701070  #include <Singular/tok.h>
    1071   #include <kernel/options.h>
     1071  #include <misc/options.h>
    10721072  #include <kernel/febase.h>
    10731073  #include <omalloc/omalloc.h>

  • Singular/libparse.l

    r57592b3 r0fb34ba  
    2020  #include <Singular/ipid.h>
    2121  #include <Singular/tok.h>
    22   #include <kernel/options.h>
     22  #include <misc/options.h>
    2323  #include <kernel/febase.h>
    2424  #include <omalloc/omalloc.h>

  • Singular/linearAlgebra_ip.cc

    r57592b3 r0fb34ba  
    11#include <kernel/mod2.h>
    22#include <Singular/lists.h>
    3 #include <kernel/liniearAlgebra.h>
     3#include <kernel/linearAlgebra.h>
    44
    55/**

  • Singular/lists.cc

    r57592b3 r0fb34ba  
    1313#include <kernel/febase.h>
    1414//#include "ipid.h"
    15 #include <kernel/polys.h>
     15#include <polys/polys.h>
    1616#include <kernel/ideals.h>
    1717#include <Singular/attrib.h>
    1818#include <Singular/ipshell.h>
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <Singular/lists.h>
    2121

  • Singular/maps_ip.cc

    r57592b3 r0fb34ba  
    1010#include <Singular/tok.h>
    1111#include <kernel/febase.h>
    12 #include <kernel/polys.h>
    13 #include <kernel/numbers.h>
    14 #include <kernel/ring.h>
     12#include <polys/polys.h>
     13#include <coeffs/numbers.h>
     14#include <polys/monomials/ring.h>
    1515#include <kernel/ideals.h>
    16 #include <kernel/matpol.h>
     16#include <polys/matpol.h>
    1717#include <omalloc/omalloc.h>
    1818#include <kernel/kstd1.h>
    1919#include <kernel/longalg.h>
    2020#include <Singular/lists.h>
    21 #include <kernel/maps.h>
     21#include <polys/monomials/maps.h>
    2222#include <Singular/maps_ip.h>
    23 #include <kernel/prCopy.h>
     23#include <polys/prCopy.h>
    2424
    2525// define this if you want to use the fast_map routine for mapping ideals
    … …  
    2727
    2828#ifdef FAST_MAP
    29 #include <kernel/maps.h>
     29#include <polys/monomials/maps.h>
    3030#endif
    3131

  • Singular/misc_ip.cc

    r57592b3 r0fb34ba  
    341341#include <omalloc/mylimits.h>
    342342#include <omalloc/omalloc.h>
    343 #include <kernel/options.h>
     343#include <misc/options.h>
    344344#include <kernel/febase.h>
    345345#include <Singular/cntrlc.h>
    … …  
    350350#include <Singular/subexpr.h>
    351351#include <kernel/timer.h>
    352 #include <kernel/intvec.h>
    353 #include <kernel/ring.h>
     352#include <misc/intvec.h>
     353#include <polys/monomials/ring.h>
    354354#include <kernel/p_Procs.h>
    355355/* Needed for debug Version of p_SetRingOfLeftv, Oliver */
    356356#ifdef PDEBUG
    357 #include <kernel/polys.h>
     357#include <polys/polys.h>
    358358#endif
    359359#include <Singular/version.h>

  • Singular/mpsr.h

    r57592b3 r0fb34ba  
    2424#include "subexpr.h"
    2525#include <omalloc/omalloc.h>
    26 #include <kernel/polys.h>
    27 #include <kernel/numbers.h>
    28 #include <kernel/ring.h>
     26#include <polys/polys.h>
     27#include <coeffs/numbers.h>
     28#include <polys/monomials/ring.h>
    2929
    3030/***************************************************************

  • Singular/mpsr_Get.cc

    r57592b3 r0fb34ba  
    2424#include <Singular/tok.h>
    2525#include <kernel/longrat.h>
    26 #include <kernel/intvec.h>
     26#include <misc/intvec.h>
    2727#include <kernel/ideals.h>
    28 #include <kernel/matpol.h>
     28#include <polys/matpol.h>
    2929#include <Singular/lists.h>
    3030

  • Singular/mpsr_Get.h

    r57592b3 r0fb34ba  
    1818
    1919#include <Singular/tok.h>
    20 #include <kernel/numbers.h>
    21 #include <kernel/polys.h>
     20#include <coeffs/numbers.h>
     21#include <polys/polys.h>
    2222#include <kernel/febase.h>
    2323#include <Singular/ipid.h>

  • Singular/mpsr_GetMisc.cc

    r57592b3 r0fb34ba  
    2121#include "kernel/longalg.h"
    2222#include <Singular/tok.h>
    23 #include <kernel/maps.h>
     23#include <polys/monomials/maps.h>
    2424#include <Singular/lists.h>
    2525

  • Singular/mpsr_GetPoly.cc

    r57592b3 r0fb34ba  
    2424#include <Singular/tok.h>
    2525#include <Singular/ipid.h>
    26 #include <kernel/ring.h>
     26#include <polys/monomials/ring.h>
    2727#include "kernel/longalg.h"
    28 #include <kernel/maps.h>
     28#include <polys/monomials/maps.h>
    2929#include <kernel/ideals.h>
    3030#include <Singular/grammar.h>

  • Singular/mpsr_Put.cc

    r57592b3 r0fb34ba  
    2222#include <Singular/mpsr_Put.h>
    2323#include <Singular/mpsr_Tok.h>
    24 #include <kernel/intvec.h>
     24#include <misc/intvec.h>
    2525#include <Singular/lists.h>
    26 #include <kernel/numbers.h>
    27 #include <kernel/polys.h>
     26#include <coeffs/numbers.h>
     27#include <polys/polys.h>
    2828
    2929/***************************************************************

  • Singular/mpsr_PutPoly.cc

    r57592b3 r0fb34ba  
    2424#include "kernel/longalg.h"
    2525#include <omalloc/omalloc.h>
    26 #include <kernel/ring.h>
    27 #include <kernel/polys.h>
     26#include <polys/monomials/ring.h>
     27#include <polys/polys.h>
    2828//#include "ipid.h"
    2929

  • Singular/pcv.cc

    r57592b3 r0fb34ba  
    1414#include <Singular/tok.h>
    1515#include <Singular/ipid.h>
    16 #include <kernel/numbers.h>
    17 #include <kernel/polys.h>
     16#include <coeffs/numbers.h>
     17#include <polys/polys.h>
    1818#include <kernel/ideals.h>
    1919#include <Singular/lists.h>
    20 #include <kernel/matpol.h>
     20#include <polys/matpol.h>
    2121#include <kernel/febase.h>
    2222#include <Singular/pcv.h>

  • Singular/sdb.cc

    r57592b3 r0fb34ba  
    1111#include <kernel/mod2.h>
    1212#include <Singular/tok.h>
    13 #include <kernel/options.h>
     13#include <misc/options.h>
    1414#include <omalloc/omalloc.h>
    1515#include <kernel/febase.h>

  • Singular/silink.cc

    r57592b3 r0fb34ba  
    1616#include <kernel/mod2.h>
    1717#include <Singular/tok.h>
    18 #include <kernel/options.h>
     18#include <misc/options.h>
    1919#include <omalloc/omalloc.h>
    2020#include <kernel/febase.h>
    … …  
    2323#include <Singular/silink.h>
    2424#include <Singular/ipshell.h>
    25 #include <kernel/matpol.h>
    26 #include <kernel/ring.h>
     25#include <polys/matpol.h>
     26#include <polys/monomials/ring.h>
    2727#include <Singular/lists.h>
    2828#include <kernel/ideals.h>
    29 #include <kernel/numbers.h>
    30 #include <kernel/intvec.h>
     29#include <coeffs/numbers.h>
     30#include <misc/intvec.h>
    3131#include <Singular/ssiLink.h>
    3232#include <Singular/pipeLink.h>

  • Singular/slInit_Dynamic.cc

    r57592b3 r0fb34ba  
    1818#include <Singular/silink.h>
    1919#include <Singular/slInit.h>
    20 #include <kernel/mod_raw.h>
     20#include <polys/mod_raw.h>
    2121
    2222#ifdef HAVE_DL

  • Singular/ssiLink.cc

    r57592b3 r0fb34ba  
    2929#include <Singular/ipid.h>
    3030#include <omalloc/omalloc.h>
    31 #include <kernel/ring.h>
    32 #include <kernel/matpol.h>
     31#include <polys/monomials/ring.h>
     32#include <polys/matpol.h>
    3333#include <kernel/ideals.h>
    34 #include <kernel/polys.h>
     34#include <polys/polys.h>
    3535#include <kernel/longrat.h>
    3636#include <kernel/ideals.h>
    37 #include <kernel/intvec.h>
    38 #include <kernel/options.h>
     37#include <misc/intvec.h>
     38#include <misc/options.h>
    3939#include <kernel/timer.h>
    4040#include <Singular/subexpr.h>

  • Singular/subexpr.cc

    r57592b3 r0fb34ba  
    1414
    1515#include <kernel/mod2.h>
    16 #include <kernel/intvec.h>
     16#include <misc/intvec.h>
    1717#include <Singular/tok.h>
    18 #include <kernel/options.h>
     18#include <misc/options.h>
    1919#include <Singular/ipid.h>
    20 #include <kernel/intvec.h>
     20#include <misc/intvec.h>
    2121#include <omalloc/omalloc.h>
    2222#include <kernel/febase.h>
    23 #include <kernel/polys.h>
     23#include <polys/polys.h>
    2424#include <kernel/ideals.h>
    25 #include <kernel/maps.h>
    26 #include <kernel/matpol.h>
     25#include <polys/monomials/maps.h>
     26#include <polys/matpol.h>
    2727#include <kernel/kstd1.h>
    2828#include <kernel/timer.h>
    29 #include <kernel/ring.h>
     29#include <polys/monomials/ring.h>
    3030#include <kernel/ffields.h>
    31 #include <kernel/numbers.h>
     31#include <coeffs/numbers.h>
    3232#include <kernel/longrat.h>
    3333#include <Singular/ipshell.h>

  • Singular/subexpr.h

    r57592b3 r0fb34ba  
    1414#include <kernel/structs.h>
    1515#include <kernel/febase.h>
    16 #include <kernel/ring.h>
     16#include <polys/monomials/ring.h>
    1717
    1818struct _ssubexpr

  • Singular/tesths.cc

    r57592b3 r0fb34ba  
    1717#include <kernel/mod2.h>
    1818#include <Singular/tok.h>
    19 #include <kernel/options.h>
     19#include <misc/options.h>
    2020#include <Singular/ipshell.h>
    2121#include <kernel/febase.h>

  • Singular/walk.cc

    r57592b3 r0fb34ba  
    4848
    4949#include <kernel/mod2.h>
    50 #include <kernel/intvec.h>
     50#include <misc/intvec.h>
    5151#include <Singular/cntrlc.h>
    52 #include <kernel/options.h>
     52#include <misc/options.h>
    5353#include <omalloc/omalloc.h>
    5454#include <kernel/febase.h>
    … …  
    6060#include <kernel/p_Procs.h>
    6161
    62 #include <kernel/maps.h>
     62#include <polys/monomials/maps.h>
    6363
    6464/* include Hilbert-function */
    … …  
    7070
    7171#include <Singular/walk.h>
    72 #include <kernel/polys.h>
     72#include <polys/polys.h>
    7373#include <kernel/ideals.h>
    7474#include <Singular/ipid.h>
    7575#include <Singular/tok.h>
    7676#include <kernel/febase.h>
    77 #include <kernel/numbers.h>
     77#include <coeffs/numbers.h>
    7878#include <Singular/ipid.h>
    79 #include <kernel/ring.h>
     79#include <polys/monomials/ring.h>
    8080#include <kernel/kstd1.h>
    81 #include <kernel/matpol.h>
    82 #include <kernel/weight.h>
    83 #include <kernel/intvec.h>
     81#include <polys/matpol.h>
     82#include <polys/weight.h>
     83#include <misc/intvec.h>
    8484#include <kernel/syz.h>
    8585#include <Singular/lists.h>
    86 #include <kernel/prCopy.h>
    87 #include <kernel/ring.h>
     86#include <polys/prCopy.h>
     87#include <polys/monomials/ring.h>
    8888#include <kernel/longalg.h>
    8989#ifdef HAVE_FACTORY

  • Singular/walk_ip.cc

    r57592b3 r0fb34ba  
    1515#include <kernel/mod2.h>
    1616#include <Singular/tok.h>
    17 #include <kernel/options.h>
     17#include <misc/options.h>
    1818#include <Singular/ipid.h>
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <omalloc/omalloc.h>
    2121#include <kernel/febase.h>
    22 #include <kernel/polys.h>
     22#include <polys/polys.h>
    2323#include <kernel/ideals.h>
    24 #include <kernel/matpol.h>
     24#include <polys/matpol.h>
    2525#include <kernel/kstd1.h>
    26 #include <kernel/ring.h>
     26#include <polys/monomials/ring.h>
    2727#include <Singular/subexpr.h>
    28 #include <kernel/maps.h>
     28#include <polys/monomials/maps.h>
    2929#include <kernel/syz.h>
    30 #include <kernel/numbers.h>
     30#include <coeffs/numbers.h>
    3131#include <Singular/lists.h>
    3232#include <Singular/attrib.h>
    … …  
    3434#include <Singular/silink.h>
    3535#include <kernel/stairc.h>
    36 #include <kernel/weight.h>
     36#include <polys/weight.h>
    3737#include <kernel/semic.h>
    3838#include <kernel/splist.h>
    … …  
    4747#include <kernel/walkProc.h>
    4848#include <kernel/walkSupport.h>
    49 #include <kernel/prCopy.h>
     49#include <polys/prCopy.h>
    5050
    5151///////////////////////////////////////////////////////////////////

  • Singular/wrapper.cc

    r57592b3 r0fb34ba  
    22#include <kernel/mod2.h>
    33#include <kernel/febase.h>
    4 #include <kernel/polys.h>
     4#include <polys/polys.h>
    55#include <kernel/kstd1.h>
    66#include <Singular/subexpr.h>
    77#include <kernel/ideals.h>
    8 #include <kernel/ring.h>
     8#include <polys/monomials/ring.h>
    99#include <Singular/janet.h>
    1010
Note: See TracChangeset for help on using the changeset viewer.