Changeset 57fa2c4 in git


Ignore:
Timestamp:
Mar 26, 2014, 11:49:45 AM (10 years ago)
Author:
Adi Popescu <adi_popescum@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
f98a260c0667da3d5720cc7494e9cac2c21f4055
Parents:
4e892683095384ad467b026d483bd9cde31ec4f0
git-author:
Adi Popescu <adi_popescum@yahoo.de>2014-03-26 11:49:45+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-03-28 16:37:27+01:00
Message:
Separating Headers kernel/GBEngine
Files:
68 edited
21 moved

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    r4e8926 r57fa2c4  
    7272#endif
    7373
    74 #include <kernel/tgb_internal.h>
     74#include <kernel/GBEngine/tgb_internal.h>
    7575#ifdef HAVE_BOOST
    7676#include <boost/dynamic_bitset.hpp>

  • Singular/denom_list.cc

    r4e8926 r57fa2c4  
    33#endif /* HAVE_CONFIG_H */
    44#include <kernel/mod2.h>
    5 #include <kernel/kutil.h>
     5#include <kernel/GBEngine/kutil.h>
    66#include <Singular/lists.h>
    77

  • Singular/extra.cc

    r4e8926 r57fa2c4  
    6767#include <kernel/fast_mult.h>
    6868#include <kernel/digitech.h>
    69 #include <kernel/stairc.h>
     69#include <kernel/GBEngine/stairc.h>
    7070#include <kernel/febase.h>
    7171#include <kernel/ideals.h>
    72 #include <kernel/kstd1.h>
    73 #include <kernel/syz.h>
    74 #include <kernel/kutil.h>
    75 
    76 #include <kernel/shiftgb.h>
     72#include <kernel/GBEngine/kstd1.h>
     73#include <kernel/GBEngine/syz.h>
     74#include <kernel/GBEngine/kutil.h>
     75
     76#include <kernel/GBEngine/shiftgb.h>
    7777#include <kernel/linear_algebra/linearAlgebra.h>
    7878
    … …  
    8080
    8181// for tests of t-rep-GB
    82 #include <kernel/tgb.h>
     82#include <kernel/GBEngine/tgb.h>
    8383
    8484#include <kernel/minpoly.h>
    … …  
    108108
    109109#ifdef HAVE_RINGS
    110 #include <kernel/ringgb.h>
     110#include <kernel/GBEngine/ringgb.h>
    111111#endif
    112112
    113113#ifdef HAVE_F5
    114 #include <kernel/f5gb.h>
     114#include <kernel/GBEngine/f5gb.h>
    115115#endif
    116116
    … …  
    128128#include <polys/nc/ncSAMult.h> // for CMultiplier etc classes
    129129#include <polys/nc/sca.h>
    130 #include <kernel/nc.h>
     130#include <kernel/GBEngine/nc.h>
    131131#include "ipconv.h"
    132132#ifdef HAVE_RATGRING
    133 #include <kernel/ratgring.h>
     133#include <kernel/GBEngine/ratgring.h>
    134134#endif
    135135#endif
    … …  
    150150
    151151#include <polys/clapconv.h>
    152 #include <kernel/kstdfac.h>
     152#include <kernel/GBEngine/kstdfac.h>
    153153
    154154#include <polys/clapsing.h>
    … …  
    23252325#  include <polys/mod_raw.h>
    23262326#  include <polys/monomials/ring.h>
    2327 #  include <kernel/shiftgb.h>
     2327#  include <kernel/GBEngine/shiftgb.h>
    23282328
    23292329static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h)

  • Singular/fglm.cc

    r4e8926 r57fa2c4  
    3131#include <kernel/ideals.h>
    3232
    33 #include <kernel/kstd1.h>
     33#include <kernel/GBEngine/kstd1.h>
    3434#include <kernel/fglm/fglm.h>
    3535

  • Singular/grammar.cc

    r4e8926 r57fa2c4  
    9494#include <polys/matpol.h>
    9595#include <polys/monomials/ring.h>
    96 #include <kernel/kstd1.h>
     96#include <kernel/GBEngine/kstd1.h>
    9797#include <Singular/subexpr.h>
    9898#include <Singular/ipshell.h>
    … …  
    102102#include <coeffs/numbers.h>
    103103#include <kernel/polys.h>
    104 #include <kernel/stairc.h>
     104#include <kernel/GBEngine/stairc.h>
    105105#include <kernel/timer.h>
    106106#include <Singular/cntrlc.h>
    107107#include <polys/monomials/maps.h>
    108 #include <kernel/syz.h>
     108#include <kernel/GBEngine/syz.h>
    109109#include <Singular/lists.h>
    110110#include <libpolys/coeffs/longrat.h>

  • Singular/grammar.y

    r4e8926 r57fa2c4  
    3030#include <polys/matpol.h>
    3131#include <polys/monomials/ring.h>
    32 #include <kernel/kstd1.h>
     32#include <kernel/GBEngine/kstd1.h>
    3333#include <Singular/subexpr.h>
    3434#include <Singular/ipshell.h>
    … …  
    3838#include <coeffs/numbers.h>
    3939#include <kernel/polys.h>
    40 #include <kernel/stairc.h>
     40#include <kernel/GBEngine/stairc.h>
    4141#include <kernel/timer.h>
    4242#include <Singular/cntrlc.h>
    4343#include <polys/monomials/maps.h>
    44 #include <kernel/syz.h>
     44#include <kernel/GBEngine/syz.h>
    4545#include <Singular/lists.h>
    4646#include <libpolys/coeffs/longrat.h>

  • Singular/iparith.cc

    r4e8926 r57fa2c4  
    3838#  include <polys/clapsing.h>
    3939
    40 #include <kernel/stairc.h>
     40#include <kernel/GBEngine/stairc.h>
    4141#include <kernel/mod2.h>
    4242#include <kernel/polys.h>
    4343#include <kernel/febase.h>
    4444#include <kernel/ideals.h>
    45 #include <kernel/kstd1.h>
     45#include <kernel/GBEngine/kstd1.h>
    4646#include <kernel/timer.h>
    4747#include <kernel/preimage.h>
    48 #include <kernel/units.h>
     48#include <kernel/GBEngine/units.h>
    4949#include <kernel/spectrum/GMPrat.h>
    50 #include <kernel/tgb.h>
     50#include <kernel/GBEngine/tgb.h>
    5151#include <kernel/groebner_walk/walkProc.h>
    5252#include <kernel/linear_algebra/linearAlgebra.h>
    53 #include <kernel/syz.h>
     53#include <kernel/GBEngine/syz.h>
    5454#include <kernel/timer.h>
    5555
    5656#include <kernel/interpolation.h>
    57 #  include <kernel/kstdfac.h>
     57#  include <kernel/GBEngine/kstdfac.h>
    5858#  include <kernel/fglm/fglm.h>
    5959
    … …  
    9898
    9999#ifdef HAVE_PLURAL
    100   #include <kernel/ratgring.h>
    101   #include <kernel/nc.h>
     100  #include <kernel/GBEngine/ratgring.h>
     101  #include <kernel/GBEngine/nc.h>
    102102  #include <polys/nc/nc.h>
    103103  #include <polys/nc/sca.h>

  • Singular/ipassign.cc

    r4e8926 r57fa2c4  
    4242#include <kernel/polys.h>
    4343#include <kernel/ideals.h>
    44 #include <kernel/kstd1.h>
     44#include <kernel/GBEngine/kstd1.h>
    4545#include <kernel/timer.h>
    46 #include <kernel/stairc.h>
    47 #include <kernel/syz.h>
     46#include <kernel/GBEngine/stairc.h>
     47#include <kernel/GBEngine/syz.h>
    4848
    4949//#include "weight.h"

  • Singular/ipconv.cc

    r4e8926 r57fa2c4  
    3030#include <polys/matpol.h>
    3131#include <Singular/links/silink.h>
    32 #include <kernel/syz.h>
     32#include <kernel/GBEngine/syz.h>
    3333#include <Singular/attrib.h>
    3434#include <polys/monomials/ring.h>

  • Singular/ipid.cc

    r4e8926 r57fa2c4  
    2828#include <kernel/polys.h>
    2929#include <kernel/ideals.h>
    30 #include <kernel/syz.h>
     30#include <kernel/GBEngine/syz.h>
    3131
    3232#include <Singular/tok.h>

  • Singular/ipshell.cc

    r4e8926 r57fa2c4  
    2929#include <kernel/ideals.h>
    3030#include <polys/matpol.h>
    31 #include <kernel/kstd1.h>
     31#include <kernel/GBEngine/kstd1.h>
    3232#include <polys/monomials/ring.h>
    3333#include <Singular/subexpr.h>
    3434#include <polys/monomials/maps.h>
    35 #include <kernel/syz.h>
     35#include <kernel/GBEngine/syz.h>
    3636#include <coeffs/numbers.h>
    3737//#include <polys/ext_fields/longalg.h>
    … …  
    4040#include <Singular/ipconv.h>
    4141#include <Singular/links/silink.h>
    42 #include <kernel/stairc.h>
     42#include <kernel/GBEngine/stairc.h>
    4343#include <polys/weight.h>
    4444#include <kernel/spectrum/semic.h>

  • Singular/libsingular.h

    r4e8926 r57fa2c4  
    1414#include <polys/clapsing.h>
    1515#include <polys/monomials/maps.h>
    16 #include <kernel/kutil.h>
    17 #include <kernel/kstd1.h>
    18 #include <kernel/tgb.h>
     16#include <kernel/GBEngine/kutil.h>
     17#include <kernel/GBEngine/kstd1.h>
     18#include <kernel/GBEngine/tgb.h>
    1919#include <polys/sparsmat.h>
    2020

  • Singular/maps_ip.cc

    r4e8926 r57fa2c4  
    2626
    2727#include <kernel/febase.h>
    28 #include <kernel/kstd1.h>
     28#include <kernel/GBEngine/kstd1.h>
    2929
    3030#include "maps_ip.h"

  • Singular/misc_ip.cc

    r4e8926 r57fa2c4  
    387387
    388388#include <kernel/febase.h>
    389 #include <kernel/kstd1.h>
     389#include <kernel/GBEngine/kstd1.h>
    390390#include <kernel/timer.h>
    391391

  • Singular/subexpr.cc

    r4e8926 r57fa2c4  
    3737#include <kernel/febase.h>
    3838#include <kernel/ideals.h>
    39 #include <kernel/kstd1.h>
     39#include <kernel/GBEngine/kstd1.h>
    4040#include <kernel/timer.h>
    41 #include <kernel/syz.h>
     41#include <kernel/GBEngine/syz.h>
    4242
    4343#include <Singular/tok.h>

  • Singular/test.cc

    r4e8926 r57fa2c4  
    6363// HEADERS:
    6464#include <kernel/combinatorics/hutil.h>
    65 #include <kernel/stairc.h>
     65#include <kernel/GBEngine/stairc.h>
    6666#include <kernel/ideals.h>
    67 #include <kernel/syz.h>
     67#include <kernel/GBEngine/syz.h>
    6868#include <kernel/maps/fast_maps.h>
    6969#include <kernel/febase.h>
    … …  
    7171#include <kernel/groebner_walk/walkMain.h>
    7272#include <kernel/groebner_walk/walkSupport.h>
    73 #include <kernel/khstd.h>
     73#include <kernel/GBEngine/khstd.h>
    7474/// #include <kernel/sparsmat.h> // TODO: install polys/this!
    7575//+
    7676
    7777#include <kernel/fglm/fglm.h>
    78 #include <kernel/kstd1.h>
     78#include <kernel/GBEngine/kstd1.h>
    7979#include <kernel/fglm/fglmgauss.h>
    8080#include <kernel/fglm/fglmvec.h>
    81 #include <kernel/kstdfac.h>
     81#include <kernel/GBEngine/kstdfac.h>
    8282#include <kernel/spectrum/kmatrix.h>
    8383#include <kernel/spectrum/GMPrat.h>
    … …  
    8989#include <kernel/spectrum/multicnt.h>
    9090#include <kernel/linear_algebra/eigenval.h>
    91 #include <kernel/units.h>
    92 #include <kernel/ratgring.h>
    93 #include <kernel/shiftgb.h>
    94 
    95 #include <kernel/kutil.h>
     91#include <kernel/GBEngine/units.h>
     92#include <kernel/GBEngine/ratgring.h>
     93#include <kernel/GBEngine/shiftgb.h>
     94
     95#include <kernel/GBEngine/kutil.h>
    9696
    9797// #include <kernel/dbm_sl.h> // TODO: needs si_link// already moved to Singular/!
    … …  
    109109
    110110////////#include "F5cData.h"
    111 #include <kernel/f5c.h>
    112 #include <kernel/f5data.h>
    113 #include <kernel/f5gb.h>
    114 #include <kernel/f5lists.h>
     111#include <kernel/GBEngine/f5c.h>
     112#include <kernel/GBEngine/f5data.h>
     113#include <kernel/GBEngine/f5gb.h>
     114#include <kernel/GBEngine/f5lists.h>
    115115////////#include <kernel/F5cLists.h>
    116116
    … …  
    126126
    127127#include <kernel/spectrum/kmatrix.h>
    128 #include <kernel/kstd1.h>
    129 #include <kernel/kstdfac.h>
    130 #include <kernel/khstd.h>
     128#include <kernel/GBEngine/kstd1.h>
     129#include <kernel/GBEngine/kstdfac.h>
     130#include <kernel/GBEngine/khstd.h>
    131131
    132132#include <kernel/linear_algebra/linearAlgebra.h>
    … …  
    143143#include <kernel/preimage.h>
    144144
    145 #include <kernel/nc.h>
    146 
    147 #include <kernel/ratgring.h>
    148 #include <kernel/ringgb.h>
     145#include <kernel/GBEngine/nc.h>
     146
     147#include <kernel/GBEngine/ratgring.h>
     148#include <kernel/GBEngine/ringgb.h>
    149149#include <kernel/spectrum/semic.h>
    150 #include <kernel/shiftgb.h>
     150#include <kernel/GBEngine/shiftgb.h>
    151151
    152152#include <kernel/spectrum/spectrum.h>
    153153#include <kernel/spectrum/splist.h>
    154 #include <kernel/stairc.h>
     154#include <kernel/GBEngine/stairc.h>
    155155#include <kernel/structs.h>
    156 #include <kernel/syz.h>
     156#include <kernel/GBEngine/syz.h>
    157157// #include <kernel/testpoly.h> // Too old?
    158158
    159 #include <kernel/tgbgauss.h>
    160 #include <kernel/tgb.h>
     159#include <kernel/GBEngine/tgbgauss.h>
     160#include <kernel/GBEngine/tgb.h>
    161161
    162162#include <kernel/timer.h>
    163163
    164 #include <kernel/units.h>
     164#include <kernel/GBEngine/units.h>
    165165#include <kernel/groebner_walk/walkMain.h>
    166166#include <kernel/groebner_walk/walkProc.h>

  • Singular/walk.cc

    r4e8926 r57fa2c4  
    6666
    6767/* include Hilbert-function */
    68 #include <kernel/stairc.h>
     68#include <kernel/GBEngine/stairc.h>
    6969
    7070/** kstd2.cc */
    71 #include <kernel/kutil.h>
    72 #include <kernel/khstd.h>
     71#include <kernel/GBEngine/kutil.h>
     72#include <kernel/GBEngine/khstd.h>
    7373
    7474#include <Singular/walk.h>
    … …  
    8181#include <Singular/ipid.h>
    8282#include <polys/monomials/ring.h>
    83 #include <kernel/kstd1.h>
     83#include <kernel/GBEngine/kstd1.h>
    8484#include <polys/matpol.h>
    8585#include <polys/weight.h>
    8686#include <misc/intvec.h>
    87 #include <kernel/syz.h>
     87#include <kernel/GBEngine/syz.h>
    8888#include <Singular/lists.h>
    8989#include <polys/prCopy.h>

  • Singular/walk_ip.cc

    r4e8926 r57fa2c4  
    2525#include <kernel/ideals.h>
    2626#include <polys/matpol.h>
    27 #include <kernel/kstd1.h>
     27#include <kernel/GBEngine/kstd1.h>
    2828#include <polys/monomials/ring.h>
    2929#include <Singular/subexpr.h>
    3030#include <polys/monomials/maps.h>
    31 #include <kernel/syz.h>
     31#include <kernel/GBEngine/syz.h>
    3232#include <coeffs/numbers.h>
    3333#include <Singular/lists.h>
    … …  
    3535#include <Singular/ipconv.h>
    3636#include <Singular/links/silink.h>
    37 #include <kernel/stairc.h>
     37#include <kernel/GBEngine/stairc.h>
    3838#include <polys/weight.h>
    3939#include <kernel/spectrum/semic.h>

  • Singular/wrapper.cc

    r4e8926 r57fa2c4  
    88#include <kernel/febase.h>
    99#include <kernel/polys.h>
    10 #include <kernel/kstd1.h>
     10#include <kernel/GBEngine/kstd1.h>
    1111#include <kernel/ideals.h>
    1212
    13 #include <kernel/janet.h>
     13#include <kernel/GBEngine/janet.h>
    1414
    1515#include <Singular/subexpr.h>

  • dyn_modules/callgfanlib/gfan.cc

    r4e8926 r57fa2c4  
    88
    99#include <libpolys/misc/options.h>
    10 #include <kernel/kstd1.h>
    11 #include <kernel/kutil.h>
     10#include <kernel/GBEngine/kstd1.h>
     11#include <kernel/GBEngine/kutil.h>
    1212#include <kernel/polys.h>
    1313#include <kernel/ideals.h>
    … …  
    1919#include <Singular/lists.h>
    2020#include <libpolys/polys/prCopy.h>
    21 #include <kernel/stairc.h>
     21#include <kernel/GBEngine/stairc.h>
    2222#include <fstream>        //read-write cones to files
    2323#include <string>

  • dyn_modules/loctriv.mod

    r4e8926 r57fa2c4  
    99#include <kernel/ideals.h>
    1010#include <kernel/ring.h>
    11 #include <kernel/kstd1.h>
     11#include <kernel/GBEngine/kstd1.h>
    1212#include <kernel/prCopy.h>
    1313%}

  • dyn_modules/syzextra/mod_main.cc

    r4e8926 r57fa2c4  
    1616#include <polys/monomials/ring.h>
    1717// #include <kernel/longrat.h>
    18 #include <kernel/kstd1.h>
     18#include <kernel/GBEngine/kstd1.h>
    1919
    2020#include <kernel/polys.h>
    2121
    22 #include <kernel/syz.h>
     22#include <kernel/GBEngine/syz.h>
    2323
    2424#include <Singular/tok.h>

  • dyn_modules/syzextra/myNF.cc

    r4e8926 r57fa2c4  
    4040#include <kernel/ideals.h>
    4141
    42 #include <kernel/syz.h>
     42#include <kernel/GBEngine/syz.h>
    4343// #include <kernel/longrat.h>
    44 #include <kernel/kutil.h>
    45 #include <kernel/kstd1.h>
     44#include <kernel/GBEngine/kutil.h>
     45#include <kernel/GBEngine/kstd1.h>
    4646
    4747
    … …  
    5959#include <polys/nc/sca.h>
    6060#include <polys/nc/nc.h>
    61 #include <kernel/nc.h>
     61#include <kernel/GBEngine/nc.h>
    6262
    6363

  • kernel/GBEngine/F4.cc

    r4e8926 r57fa2c4  
    33#endif /* HAVE_CONFIG_H */
    44#include <kernel/mod2.h>
    5 #include <kernel/F4.h>
    6 #include <kernel/tgb_internal.h>
    7 #include <kernel/tgbgauss.h>
     5#include <kernel/GBEngine/F4.h>
     6#include <kernel/GBEngine/tgb_internal.h>
     7#include <kernel/GBEngine/tgbgauss.h>
    88/****************************************
    99*  Computer Algebra System SINGULAR     *

  • kernel/GBEngine/F4.h

    r4e8926 r57fa2c4  
    1818* ABSTRACT: interface for F4 only routines
    1919*/
    20 #include <kernel/tgb_internal.h>
     20#include <kernel/GBEngine/tgb_internal.h>
    2121void go_on_F4 (slimgb_alg* c);
    2222#endif

  • kernel/GBEngine/Makefile.am

    r4e8926 r57fa2c4  
    77libGBEngine_la_SOURCES=khstd.cc kstdfac.cc kstd1.cc kstd2.cc kutil.cc nc.cc sca.cc gr_kstd2.cc kspoly.cc kpolys.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc units.cc tgb.cc tgbgauss.cc f5data.cc f5lists.cc f5gb.cc f5c.cc ratgring.cc shiftgb.cc ringgb.cc janet.cc
    88
    9 # libGBEngine_la_includedir=$(includedir)/kernel/GBEngine
    10 # libGBEngine_la_include_HEADERS=sample.h
     9libGBEngine_la_includedir=$(includedir)/kernel/GBEngine
     10libGBEngine_la_include_HEADERS=stairc.h syz.h kstdfac.h kutil.h khstd.h kstd1.h units.h ratgring.h shiftgb.h nc.h kInline.h tgb.h ringgb.h tgbgauss.h tgb_internal.h f5c.h f5data.h f5gb.h f5lists.h janet.h
    1111
    1212

  • kernel/GBEngine/f5c.cc

    r4e8926 r57fa2c4  
    66#include <unistd.h>
    77#include <kernel/structs.h>
    8 #include <kernel/kutil.h>
     8#include <kernel/GBEngine/kutil.h>
    99#include <omalloc/omalloc.h>
    1010#include <kernel/polys.h>
    … …  
    1313#include <kernel/ideals.h>
    1414#include <kernel/febase.h>
    15 #include <kernel/kstd1.h>
    16 #include <kernel/khstd.h>
     15#include <kernel/GBEngine/kstd1.h>
     16#include <kernel/GBEngine/khstd.h>
    1717#include <polys/kbuckets.h>
    1818#include <polys/weight.h>
    1919#include <misc/intvec.h>
    2020#include <kernel/polys.h>
    21 #include <kernel/f5c.h>
     21#include <kernel/GBEngine/f5c.h>
    2222#include <kernel/timer.h>
    2323/*

  • kernel/GBEngine/f5data.cc

    r4e8926 r57fa2c4  
    1212
    1313#ifdef HAVE_F5
    14 #include <kernel/kutil.h>
     14#include <kernel/GBEngine/kutil.h>
    1515#include <kernel/structs.h>
    1616#include <omalloc/omalloc.h>
    … …  
    1919#include <kernel/ideals.h>
    2020#include <kernel/febase.h>
    21 #include <kernel/kstd1.h>
    22 #include <kernel/khstd.h>
     21#include <kernel/GBEngine/kstd1.h>
     22#include <kernel/GBEngine/khstd.h>
    2323#include <polys/kbuckets.h>
    2424#include <polys/weight.h>
    2525#include <misc/intvec.h>
    2626#include <kernel/polys.h>
    27 #include <kernel/f5gb.h>
    28 #include <kernel/f5data.h>
    29 #include <kernel/f5lists.h>
     27#include <kernel/GBEngine/f5gb.h>
     28#include <kernel/GBEngine/f5data.h>
     29#include <kernel/GBEngine/f5lists.h>
    3030/*
    3131=====================

  • kernel/GBEngine/f5gb.cc

    r4e8926 r57fa2c4  
    1414#include <omp.h>
    1515#include <kernel/structs.h>
    16 #include <kernel/kutil.h>
     16#include <kernel/GBEngine/kutil.h>
    1717#include <omalloc/omalloc.h>
    1818#include <kernel/polys.h>
    … …  
    2121#include <kernel/ideals.h>
    2222#include <kernel/febase.h>
    23 #include <kernel/kstd1.h>
    24 #include <kernel/khstd.h>
     23#include <kernel/GBEngine/kstd1.h>
     24#include <kernel/GBEngine/khstd.h>
    2525#include <polys/kbuckets.h>
    2626#include <polys/weight.h>
    2727#include <misc/intvec.h>
    2828#include <kernel/polys.h>
    29 #include <kernel/f5gb.h>
    30 #include <kernel/f5data.h>
    31 #include <kernel/f5lists.h>
     29#include <kernel/GBEngine/f5gb.h>
     30#include <kernel/GBEngine/f5data.h>
     31#include <kernel/GBEngine/f5lists.h>
    3232#include <kernel/timer.h>
    3333int notInG              =   0;

  • kernel/GBEngine/f5gb.h

    r4e8926 r57fa2c4  
    99
    1010#ifdef HAVE_F5
    11 #include <kernel/f5data.h>
    12 #include <kernel/f5lists.h>
     11#include <kernel/GBEngine/f5data.h>
     12#include <kernel/GBEngine/f5lists.h>
    1313
    1414

  • kernel/GBEngine/f5lists.cc

    r4e8926 r57fa2c4  
    55
    66#ifdef HAVE_F5
    7 #include <kernel/kutil.h>
     7#include <kernel/GBEngine/kutil.h>
    88#include <kernel/structs.h>
    99#include <omalloc/omalloc.h>
    … …  
    1212#include <kernel/ideals.h>
    1313#include <kernel/febase.h>
    14 #include <kernel/kstd1.h>
    15 #include <kernel/khstd.h>
     14#include <kernel/GBEngine/kstd1.h>
     15#include <kernel/GBEngine/khstd.h>
    1616#include <polys/kbuckets.h>
    1717#include <polys/weight.h>
    1818#include <misc/intvec.h>
    1919#include <kernel/polys.h>
    20 #include <kernel/f5gb.h>
    21 #include <kernel/f5data.h>
    22 #include <kernel/f5lists.h>
     20#include <kernel/GBEngine/f5gb.h>
     21#include <kernel/GBEngine/f5data.h>
     22#include <kernel/GBEngine/f5lists.h>
    2323
    2424/**

  • kernel/GBEngine/f5lists.h

    r4e8926 r57fa2c4  
    55* ABSTRACT: list interface
    66*/
    7 #include <kernel/f5data.h>
     7#include <kernel/GBEngine/f5data.h>
    88#ifndef F5LISTS_HEADER
    99#define F5LISTS_HEADER

  • kernel/GBEngine/gr_kstd2.cc

    r4e8926 r57fa2c4  
    3030#include <kernel/febase.h>
    3131#include <kernel/ideals.h>
    32 #include <kernel/kstd1.h>
    33 #include <kernel/khstd.h>
     32#include <kernel/GBEngine/kstd1.h>
     33#include <kernel/GBEngine/khstd.h>
    3434//#include "spolys.h"
    3535//#include "cntrlc.h"
    36 #include <kernel/ratgring.h>
    37 #include <kernel/kutil.h>
    38 
    39 #include <kernel/nc.h>
     36#include <kernel/GBEngine/ratgring.h>
     37#include <kernel/GBEngine/kutil.h>
     38
     39#include <kernel/GBEngine/nc.h>
    4040
    4141#if 0

  • kernel/GBEngine/janet.cc

    r4e8926 r57fa2c4  
    1616#include <kernel/polys.h>
    1717#include <kernel/febase.h>
    18 #include <kernel/kutil.h>
     18#include <kernel/GBEngine/kutil.h>
    1919
    2020// #include "subexpr.h"
    2121
    22 #include <kernel/janet.h>
     22#include <kernel/GBEngine/janet.h>
    2323
    2424

  • kernel/GBEngine/khstd.cc

    r4e8926 r57fa2c4  
    1616#include <kernel/febase.h>
    1717#include <kernel/polys.h>
    18 #include <kernel/kutil.h>
    19 #include <kernel/stairc.h>
    20 #include <kernel/kstd1.h>
    21 #include <kernel/khstd.h>
     18#include <kernel/GBEngine/kutil.h>
     19#include <kernel/GBEngine/stairc.h>
     20#include <kernel/GBEngine/kstd1.h>
     21#include <kernel/GBEngine/khstd.h>
    2222
    2323#define ADIDEBUG 0

  • kernel/GBEngine/kspoly.cc

    r4e8926 r57fa2c4  
    1212#include <kernel/mod2.h>
    1313#include <misc/options.h>
    14 #include <kernel/kutil.h>
     14#include <kernel/GBEngine/kutil.h>
    1515#include <coeffs/numbers.h>
    1616#include <polys/monomials/p_polys.h>

  • kernel/GBEngine/kstd1.cc

    r4e8926 r57fa2c4  
    4040#include <kernel/polys.h>
    4141
    42 #include <kernel/kutil.h>
     42#include <kernel/GBEngine/kutil.h>
    4343#include <kernel/febase.h>
    44 #include <kernel/kstd1.h>
    45 #include <kernel/khstd.h>
    46 #include <kernel/stairc.h>
     44#include <kernel/GBEngine/kstd1.h>
     45#include <kernel/GBEngine/khstd.h>
     46#include <kernel/GBEngine/stairc.h>
    4747//#include "cntrlc.h"
    4848#include <kernel/ideals.h>
    … …  
    5555#include <polys/nc/nc.h>
    5656#include <polys/nc/sca.h>
    57 #include <kernel/nc.h>
    58 #endif
    59 
    60 #include <kernel/kInline.h>
     57#include <kernel/GBEngine/nc.h>
     58#endif
     59
     60#include <kernel/GBEngine/kInline.h>
    6161
    6262

  • kernel/GBEngine/kstd2.cc

    r4e8926 r57fa2c4  
    7373***********************************************/
    7474
    75 #include <kernel/kutil.h>
     75#include <kernel/GBEngine/kutil.h>
    7676#include <misc/options.h>
    7777#include <omalloc/omalloc.h>
    … …  
    7979#include <kernel/ideals.h>
    8080#include <kernel/febase.h>
    81 #include <kernel/kstd1.h>
    82 #include <kernel/khstd.h>
     81#include <kernel/GBEngine/kstd1.h>
     82#include <kernel/GBEngine/khstd.h>
    8383#include <polys/kbuckets.h>
    8484#include <polys/prCopy.h>
    … …  
    9292
    9393/* shiftgb stuff */
    94 #include <kernel/shiftgb.h>
     94#include <kernel/GBEngine/shiftgb.h>
    9595
    9696  int (*test_PosInT)(const TSet T,const int tl,LObject &h);

  • kernel/GBEngine/kstdfac.cc

    r4e8926 r57fa2c4  
    1515#include <kernel/ideals.h>
    1616#include <kernel/febase.h>
    17 #include <kernel/kutil.h>
    18 #include <kernel/kstd1.h>
    19 #include <kernel/khstd.h>
     17#include <kernel/GBEngine/kutil.h>
     18#include <kernel/GBEngine/kstd1.h>
     19#include <kernel/GBEngine/khstd.h>
    2020//#include "cntrlc.h"
    2121#include <polys/weight.h>
    … …  
    2525#include <kernel/ideals.h>
    2626#include <kernel/timer.h>
    27 #include <kernel/kstdfac.h>
     27#include <kernel/GBEngine/kstdfac.h>
    2828
    2929#ifndef SING_NDEBUG

  • kernel/GBEngine/kutil.cc

    r4e8926 r57fa2c4  
    5252// #define ENTER_USE_MYMEMMOVE
    5353
    54 #include <kernel/kutil.h>
     54#include <kernel/GBEngine/kutil.h>
    5555#include <polys/kbuckets.h>
    5656#include <kernel/febase.h>
    … …  
    6262#include <kernel/timer.h>
    6363//#include "cntrlc.h"
    64 #include <kernel/stairc.h>
    65 #include <kernel/kstd1.h>
     64#include <kernel/GBEngine/stairc.h>
     65#include <kernel/GBEngine/kstd1.h>
    6666#include <polys/operations/pShallowCopyDelete.h>
    6767
    6868/* shiftgb stuff */
    69 #include <kernel/shiftgb.h>
     69#include <kernel/GBEngine/shiftgb.h>
    7070#include <polys/prCopy.h>
    7171
    7272#ifdef HAVE_RATGRING
    73 #include <kernel/ratgring.h>
     73#include <kernel/GBEngine/ratgring.h>
    7474#endif
    7575

  • kernel/GBEngine/kutil.h

    r4e8926 r57fa2c4  
    757757  kStrategy strat);
    758758
    759 #include <kernel/kInline.h>
     759#include <kernel/GBEngine/kInline.h>
    760760
    761761/* shiftgb stuff */
    762 #include <kernel/shiftgb.h>
     762#include <kernel/GBEngine/shiftgb.h>
    763763
    764764poly pMove2CurrTail(poly p, kStrategy strat);

  • kernel/GBEngine/nc.cc

    r4e8926 r57fa2c4  
    1616
    1717#include <kernel/ideals.h>
    18 #include <kernel/kstd1.h>
    19 
    20 #include <kernel/nc.h>
     18#include <kernel/GBEngine/kstd1.h>
     19
     20#include <kernel/GBEngine/nc.h>
    2121
    2222ideal twostd(ideal I) // works in currRing only!

  • kernel/GBEngine/ratgring.cc

    r4e8926 r57fa2c4  
    1212#endif /* HAVE_CONFIG_H */
    1313#include <kernel/mod2.h>
    14 #include <kernel/ratgring.h>
     14#include <kernel/GBEngine/ratgring.h>
    1515#ifdef HAVE_RATGRING
    1616#include <polys/nc/nc.h>
    … …  
    2222#include <polys/matpol.h>
    2323#include <polys/kbuckets.h>
    24 #include <kernel/kstd1.h>
     24#include <kernel/GBEngine/kstd1.h>
    2525#include <polys/sbuckets.h>
    2626#include <polys/prCopy.h>

  • kernel/GBEngine/ringgb.cc

    r4e8926 r57fa2c4  
    1212#endif /* HAVE_CONFIG_H */
    1313#include <kernel/mod2.h>
    14 #include <kernel/kutil.h>
     14#include <kernel/GBEngine/kutil.h>
    1515#include <kernel/structs.h>
    1616#include <omalloc/omalloc.h>
    … …  
    1919#include <kernel/ideals.h>
    2020#include <kernel/febase.h>
    21 #include <kernel/kstd1.h>
    22 #include <kernel/khstd.h>
     21#include <kernel/GBEngine/kstd1.h>
     22#include <kernel/GBEngine/khstd.h>
    2323#include <polys/kbuckets.h>
    2424#include <polys/weight.h>
    … …  
    2929#endif
    3030
    31 #include <kernel/ringgb.h>
     31#include <kernel/GBEngine/ringgb.h>
    3232
    3333#ifdef HAVE_RINGS

  • kernel/GBEngine/sca.cc

    r4e8926 r57fa2c4  
    1717#include <kernel/polys.h>
    1818#include <kernel/ideals.h>
    19 #include <kernel/kstd1.h>
    20 #include <kernel/kutil.h>
    21 
    22 #include <kernel/nc.h>
     19#include <kernel/GBEngine/kstd1.h>
     20#include <kernel/GBEngine/kutil.h>
     21
     22#include <kernel/GBEngine/nc.h>
    2323
    2424/// nc_gr_initBba is needed for sca_gr_bba and gr_bba.

  • kernel/GBEngine/shiftgb.cc

    r4e8926 r57fa2c4  
    1919#include <polys/matpol.h>
    2020#include <polys/kbuckets.h>
    21 #include <kernel/kstd1.h>
     21#include <kernel/GBEngine/kstd1.h>
    2222#include <polys/sbuckets.h>
    2323#include <polys/operations/p_Mult_q.h>
    24 #include <kernel/kutil.h>
     24#include <kernel/GBEngine/kutil.h>
    2525#include <kernel/structs.h>
    2626#include <omalloc/omalloc.h>
    27 #include <kernel/khstd.h>
     27#include <kernel/GBEngine/khstd.h>
    2828#include <polys/kbuckets.h>
    2929#include <polys/weight.h>
    3030#include <misc/intvec.h>
    3131#include <kernel/structs.h>
    32 #include <kernel/kInline.h>
    33 #include <kernel/stairc.h>
     32#include <kernel/GBEngine/kInline.h>
     33#include <kernel/GBEngine/stairc.h>
    3434#include <polys/weight.h>
    3535#include <misc/intvec.h>
    3636#include <kernel/timer.h>
    37 #include <kernel/shiftgb.h>
     37#include <kernel/GBEngine/shiftgb.h>
    3838#include <polys/nc/sca.h>
    3939

  • kernel/GBEngine/syz.cc

    r4e8926 r57fa2c4  
    1616#include <kernel/polys.h>
    1717#include <kernel/febase.h>
    18 #include <kernel/kstd1.h>
    19 #include <kernel/kutil.h>
    20 #include <kernel/stairc.h>
     18#include <kernel/GBEngine/kstd1.h>
     19#include <kernel/GBEngine/kutil.h>
     20#include <kernel/GBEngine/stairc.h>
    2121#include <misc/intvec.h>
    2222#include <coeffs/numbers.h>
    … …  
    2424#include <misc/intvec.h>
    2525#include <polys/monomials/ring.h>
    26 #include <kernel/syz.h>
     26#include <kernel/GBEngine/syz.h>
    2727#include <polys/prCopy.h>
    2828

  • kernel/GBEngine/syz0.cc

    r4e8926 r57fa2c4  
    1515#include <kernel/polys.h>
    1616#include <kernel/febase.h>
    17 #include <kernel/kstd1.h>
    18 #include <kernel/kutil.h>
    19 #include <kernel/stairc.h>
     17#include <kernel/GBEngine/kstd1.h>
     18#include <kernel/GBEngine/kutil.h>
     19#include <kernel/GBEngine/stairc.h>
    2020//#include "cntrlc.h"
    2121#include <misc/intvec.h>
    … …  
    2424#include <misc/intvec.h>
    2525#include <polys/monomials/ring.h>
    26 #include <kernel/syz.h>
     26#include <kernel/GBEngine/syz.h>
    2727#include <polys/kbuckets.h>
    2828#include <polys/prCopy.h>

  • kernel/GBEngine/syz1.cc

    r4e8926 r57fa2c4  
    2525
    2626#include <kernel/febase.h>
    27 #include <kernel/kstd1.h>
    28 #include <kernel/kutil.h>
    29 #include <kernel/stairc.h>
     27#include <kernel/GBEngine/kstd1.h>
     28#include <kernel/GBEngine/kutil.h>
     29#include <kernel/GBEngine/stairc.h>
    3030//#include "cntrlc.h"
    3131#include <kernel/ideals.h>
    32 #include <kernel/syz.h>
     32#include <kernel/GBEngine/syz.h>
    3333// #include <kernel/idrec.h>
    3434

  • kernel/GBEngine/syz2.cc

    r4e8926 r57fa2c4  
    2929
    3030#include <kernel/febase.h>
    31 #include <kernel/kstd1.h>
    32 #include <kernel/kutil.h>
    33 #include <kernel/stairc.h>
    34 
    35 #include <kernel/syz.h>
     31#include <kernel/GBEngine/kstd1.h>
     32#include <kernel/GBEngine/kutil.h>
     33#include <kernel/GBEngine/stairc.h>
     34
     35#include <kernel/GBEngine/syz.h>
    3636#include <kernel/ideals.h>
    3737

  • kernel/GBEngine/syz3.cc

    r4e8926 r57fa2c4  
    1515#include <kernel/polys.h>
    1616#include <kernel/febase.h>
    17 #include <kernel/kstd1.h>
    18 #include <kernel/kutil.h>
    19 #include <kernel/stairc.h>
     17#include <kernel/GBEngine/kstd1.h>
     18#include <kernel/GBEngine/kutil.h>
     19#include <kernel/GBEngine/stairc.h>
    2020//#include "cntrlc.h"
    2121#include <misc/intvec.h>
    … …  
    2424#include <misc/intvec.h>
    2525#include <polys/monomials/ring.h>
    26 #include <kernel/syz.h>
     26#include <kernel/GBEngine/syz.h>
    2727#include <polys/kbuckets.h>
    2828#include <polys/prCopy.h>

  • kernel/GBEngine/tgb.cc

    r4e8926 r57fa2c4  
    2121#endif /* HAVE_CONFIG_H */
    2222#include <kernel/mod2.h>
    23 #include <kernel/tgb.h>
    24 #include <kernel/tgb_internal.h>
    25 #include <kernel/tgbgauss.h>
     23#include <kernel/GBEngine/tgb.h>
     24#include <kernel/GBEngine/tgb_internal.h>
     25#include <kernel/GBEngine/tgbgauss.h>
    2626
    2727#include <misc/options.h>

  • kernel/GBEngine/tgb_internal.h

    r4e8926 r57fa2c4  
    6060#include <misc/options.h>
    6161#include <kernel/polys.h>
    62 #include <kernel/kutil.h>
    63 #include <kernel/kInline.h>
    64 #include <kernel/kstd1.h>
     62#include <kernel/GBEngine/kutil.h>
     63#include <kernel/GBEngine/kInline.h>
     64#include <kernel/GBEngine/kstd1.h>
    6565#include <polys/kbuckets.h>
    6666#include <libpolys/coeffs/modulop.h>

  • kernel/GBEngine/tgbgauss.cc

    r4e8926 r57fa2c4  
    1010#include <kernel/mod2.h>
    1111#include <misc/options.h>
    12 #include <kernel/tgbgauss.h>
     12#include <kernel/GBEngine/tgbgauss.h>
    1313#include <omalloc/omalloc.h>
    1414#include <stdlib.h>
    15 #include <kernel/kutil.h>
     15#include <kernel/GBEngine/kutil.h>
    1616#include <kernel/febase.h>
    1717#include <kernel/polys.h>
    … …  
    727727  assume(j<columns);
    728728  mac_poly* set_this=&mp[i];
    729   //  while(((*set_this)!=NULL)&&((*set_this)­>exp<j))
     729  //  while(((*set_this)!=NULL)&&((*set_this)\AD>exp<j))
    730730  while(((*set_this)!=NULL) && ((*set_this)->exp<j))
    731731    set_this=&((*set_this)->next);

  • kernel/GBEngine/units.cc

    r4e8926 r57fa2c4  
    1717#include <misc/intvec.h>
    1818#include <polys/matpol.h>
    19 #include <kernel/kstd1.h>
    20 #include <kernel/units.h>
     19#include <kernel/GBEngine/kstd1.h>
     20#include <kernel/GBEngine/units.h>
    2121
    2222ideal redNF(ideal N,ideal M,matrix U,int d,intvec *w)

  • kernel/Makefile.am

    r4e8926 r57fa2c4  
    2323libkernel_la_SOURCES   = $(SOURCES)
    2424
    25 KERNELHEADERS = mod2.h polys.h stairc.h ideals.h \
     25KERNELHEADERS = mod2.h polys.h ideals.h \
    2626        structs.h \
    27         syz.h \
    2827        febase.h \
    29         kstdfac.h \
    30         kutil.h \
    31         khstd.h kstd1.h \
    32         units.h \
    33         ratgring.h shiftgb.h nc.h \
    34         preimage.h timer.h kInline.h fast_mult.h \
    35         digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
    36         f5c.h f5data.h f5gb.h f5lists.h \
    37         janet.h interpolation.h minpoly.h \
     28        preimage.h timer.h fast_mult.h \
     29        digitech.h \
     30        interpolation.h minpoly.h \
    3831        Cache.h CacheImplementation.h
    3932

  • kernel/combinatorics/hdegree.cc

    r4e8926 r57fa2c4  
    2020#include <coeffs/numbers.h>
    2121#include <kernel/combinatorics/hutil.h>
    22 #include <kernel/stairc.h>
     22#include <kernel/GBEngine/stairc.h>
    2323
    2424int  hCo, hMu, hMu2;

  • kernel/combinatorics/hilb.cc

    r4e8926 r57fa2c4  
    1616#include <misc/intvec.h>
    1717#include <kernel/combinatorics/hutil.h>
    18 #include <kernel/stairc.h>
     18#include <kernel/GBEngine/stairc.h>
    1919//ADICHANGES:
    2020#include <kernel/ideals.h>
    21 #include <kernel/kstd1.h>
     21#include <kernel/GBEngine/kstd1.h>
    2222#include<gmp.h>
    2323#include<vector>

  • kernel/fglm/fglmcomb.cc

    r4e8926 r57fa2c4  
    2323#include "fglmvec.h"
    2424#include "fglmgauss.h"
    25 #include <kernel/kstd1.h>
     25#include <kernel/GBEngine/kstd1.h>
    2626
    2727#include "fglm.h"

  • kernel/fglm/fglmhom.cc

    r4e8926 r57fa2c4  
    3434#include "fglmgauss.h"
    3535#include <misc/intvec.h>
    36 #include <kernel/kstd1.h>
    37 #include <kernel/stairc.h>
     36#include <kernel/GBEngine/kstd1.h>
     37#include <kernel/GBEngine/stairc.h>
    3838#include <factory/templates/ftmpl_list.h>
    3939

  • kernel/fglm/fglmzero.cc

    r4e8926 r57fa2c4  
    4343#include <kernel/ideals.h>
    4444#include <kernel/febase.h>
    45 #include <kernel/kstd1.h>
     45#include <kernel/GBEngine/kstd1.h>
    4646
    4747#include "fglm.h"

  • kernel/groebner_walk/walkMain.cc

    r4e8926 r57fa2c4  
    2020#include <kernel/groebner_walk/walkSupport.h>
    2121#include <polys/prCopy.h>
    22 #include <kernel/kstd1.h>
     22#include <kernel/GBEngine/kstd1.h>
    2323#include <polys/matpol.h>
    2424#include <polys/monomials/ring.h>

  • kernel/groebner_walk/walkProc.cc

    r4e8926 r57fa2c4  
    1515#include <polys/monomials/maps.h>
    1616#include <omalloc/omalloc.h>
    17 #include <kernel/kstd1.h>
     17#include <kernel/GBEngine/kstd1.h>
    1818#include <kernel/fglm/fglm.h>
    1919#include <kernel/groebner_walk/walkMain.h>

  • kernel/groebner_walk/walkSupport.cc

    r4e8926 r57fa2c4  
    1111#include <kernel/groebner_walk/walkSupport.h>
    1212#include <polys/prCopy.h>
    13 #include <kernel/kstd1.h>
     13#include <kernel/GBEngine/kstd1.h>
    1414#include <polys/matpol.h>
    1515#include <math.h>

  • kernel/ideals.cc

    r4e8926 r57fa2c4  
    4040
    4141#include <kernel/febase.h>
    42 #include <kernel/kstd1.h>
    43 #include <kernel/syz.h>
     42#include <kernel/GBEngine/kstd1.h>
     43#include <kernel/GBEngine/syz.h>
    4444
    4545#include <libpolys/coeffs/longrat.h>

  • kernel/linear_algebra/MinorInterface.cc

    r4e8926 r57fa2c4  
    1414#include <kernel/polys.h>
    1515#include <kernel/structs.h>
    16 #include <kernel/kstd1.h>
     16#include <kernel/GBEngine/kstd1.h>
    1717#include <kernel/ideals.h>
    1818

  • kernel/linear_algebra/MinorProcessor.cc

    r4e8926 r57fa2c4  
    1111#include <kernel/polys.h>
    1212#include <kernel/febase.h>
    13 #include <kernel/kstd1.h>
     13#include <kernel/GBEngine/kstd1.h>
    1414
    1515#include <kernel/ideals.h>

  • kernel/old.lplist.cc

    r4e8926 r57fa2c4  
    1212#ifdef HAVE_F5
    1313
    14 #include <kernel/kutil.h>
     14#include <kernel/GBEngine/kutil.h>
    1515#include <kernel/structs.h>
    1616#include <omalloc/omalloc.h>
    … …  
    1919#include <kernel/ideals.h>
    2020#include <kernel/febase.h>
    21 #include <kernel/kstd1.h>
    22 #include <kernel/khstd.h>
     21#include <kernel/GBEngine/kstd1.h>
     22#include <kernel/GBEngine/khstd.h>
    2323#include <polys/kbuckets.h>
    2424#include <polys/weight.h>

  • kernel/preimage.cc

    r4e8926 r57fa2c4  
    1515#include <kernel/febase.h>
    1616#include <kernel/ideals.h>
    17 #include <kernel/kstd1.h>
    18 #include <kernel/khstd.h>
     17#include <kernel/GBEngine/kstd1.h>
     18#include <kernel/GBEngine/khstd.h>
    1919
    20 #include <kernel/kutil.h>
     20#include <kernel/GBEngine/kutil.h>
    2121
    2222

  • kernel/spectrum/spectrum.cc

    r4e8926 r57fa2c4  
    3131//extern ring currRing;
    3232
    33 #include <kernel/kstd1.h>
    34 #include <kernel/stairc.h>
     33#include <kernel/GBEngine/kstd1.h>
     34#include <kernel/GBEngine/stairc.h>
    3535#include <kernel/spectrum/multicnt.h>
    3636#include <kernel/spectrum/GMPrat.h>

  • kernel/test.cc

    r4e8926 r57fa2c4  
    6868// HEADERS:
    6969#include <kernel/combinatorics/hutil.h>
    70 #include <kernel/stairc.h>
     70#include <kernel/GBEngine/stairc.h>
    7171#include <kernel/ideals.h>
    72 #include <kernel/syz.h>
     72#include <kernel/GBEngine/syz.h>
    7373#include <kernel/maps/fast_maps.h>
    7474#include <kernel/febase.h>
    … …  
    7676#include <kernel/groebner_walk/walkMain.h>
    7777#include <kernel/groebner_walk/walkSupport.h>
    78 #include <kernel/khstd.h>
     78#include <kernel/GBEngine/khstd.h>
    7979/// #include <kernel/sparsmat.h> // TODO: install polys/this!
    8080//+
    8181
    8282#include <kernel/fglm/fglm.h>
    83 #include <kernel/kstd1.h>
     83#include <kernel/GBEngine/kstd1.h>
    8484#include <kernel/fglm/fglmgauss.h>
    8585#include <kernel/fglm/fglmvec.h>
    86 #include <kernel/kstdfac.h>
     86#include <kernel/GBEngine/kstdfac.h>
    8787#include <kernel/spectrum/kmatrix.h>
    8888#include <kernel/spectrum/GMPrat.h>
    … …  
    9494#include <kernel/spectrum/multicnt.h>
    9595#include <kernel/linear_algebra/eigenval.h>
    96 #include <kernel/units.h>
    97 #include <kernel/ratgring.h>
    98 #include <kernel/shiftgb.h>
    99 
    100 
    101 #include <kernel/kutil.h>
     96#include <kernel/GBEngine/units.h>
     97#include <kernel/GBEngine/ratgring.h>
     98#include <kernel/GBEngine/shiftgb.h>
     99
     100
     101#include <kernel/GBEngine/kutil.h>
    102102
    103103// #include "CCRing.h" // Too old!
    … …  
    113113
    114114////////#include <kernel/F5cData.h>
    115 #include <kernel/f5c.h>
    116 #include <kernel/f5data.h>
    117 #include <kernel/f5gb.h>
    118 #include <kernel/f5lists.h>
     115#include <kernel/GBEngine/f5c.h>
     116#include <kernel/GBEngine/f5data.h>
     117#include <kernel/GBEngine/f5gb.h>
     118#include <kernel/GBEngine/f5lists.h>
    119119////////#include <kernel/F5cLists.h>
    120120
    … …  
    126126
    127127#include <kernel/spectrum/kmatrix.h>
    128 #include <kernel/kstd1.h>
    129 #include <kernel/kstdfac.h>
    130 #include <kernel/khstd.h>
     128#include <kernel/GBEngine/kstd1.h>
     129#include <kernel/GBEngine/kstdfac.h>
     130#include <kernel/GBEngine/khstd.h>
    131131
    132132#include <kernel/linear_algebra/linearAlgebra.h>
    … …  
    143143#include <kernel/preimage.h>
    144144
    145 #include <kernel/nc.h>
    146 
    147 #include <kernel/ratgring.h>
    148 #include <kernel/ringgb.h>
     145#include <kernel/GBEngine/nc.h>
     146
     147#include <kernel/GBEngine/ratgring.h>
     148#include <kernel/GBEngine/ringgb.h>
    149149#include <kernel/spectrum/semic.h>
    150 #include <kernel/shiftgb.h>
     150#include <kernel/GBEngine/shiftgb.h>
    151151#include <kernel/spectrum/spectrum.h>
    152152#include <kernel/spectrum/splist.h>
    153 #include <kernel/stairc.h>
     153#include <kernel/GBEngine/stairc.h>
    154154#include <kernel/structs.h>
    155 #include <kernel/syz.h>
     155#include <kernel/GBEngine/syz.h>
    156156// #include <kernel/testpoly.h> // Too old?
    157157
    158 #include <kernel/tgbgauss.h>
    159 #include <kernel/tgb.h>
     158#include <kernel/GBEngine/tgbgauss.h>
     159#include <kernel/GBEngine/tgb.h>
    160160
    161161#include <kernel/timer.h>
    162162
    163 #include <kernel/units.h>
     163#include <kernel/GBEngine/units.h>
    164164#include <kernel/groebner_walk/walkMain.h>
    165165#include <kernel/groebner_walk/walkProc.h>
    166166#include <kernel/groebner_walk/walkSupport.h>
    167167
    168 #include <kernel/janet.h>
     168#include <kernel/GBEngine/janet.h>
    169169#include <kernel/interpolation.h>
    170170#include <kernel/minpoly.h>

  • libpolys/polys/kbuckets.cc

    r4e8926 r57fa2c4  
    1616#include <polys/monomials/ring.h>
    1717//#include <kernel/p_Procs.h>
    18 //#include <kernel/kutil.h>
     18//#include <kernel/GBEngine/kutil.h>
    1919#include <polys/kbuckets.h>
    2020

  • libpolys/polys/matpol.cc

    r4e8926 r57fa2c4  
    2020
    2121// #include <kernel/structs.h>
    22 // #include <kernel/kstd1.h>
     22// #include <kernel/GBEngine/kstd1.h>
    2323// #include <kernel/polys.h>
    2424
Note: See TracChangeset for help on using the changeset viewer.