Changeset a4771e1 in git


Ignore:
Timestamp:
Sep 15, 2014, 9:11:04 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
f7d39bddf5a7034fe148956d21d0cbe5d13c0021
Parents:
c4e3190c68044083d3437866d1695d9e714d52b5
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-15 21:11:04+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:08:14+02:00
Message:
Separation of hilbert function into kernel/combinatorics/hilb.h + include cleanup
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    rc4e319 ra4771e1  
    3333#include <polys/coeffrings.h>
    3434#include <polys/sparsmat.h>
    35 #include <Singular/mod_lib.h>
    3635#include <polys/weight.h>
    3736#include <polys/ext_fields/transext.h>
    38 #  include <polys/clapsing.h>
     37#include <polys/clapsing.h>
    3938
    4039#include <kernel/combinatorics/stairc.h>
     40#include <kernel/combinatorics/hilb.h>
     41
     42#include <kernel/linear_algebra/interpolation.h>
     43#include <kernel/linear_algebra/linearAlgebra.h>
     44#include <kernel/linear_algebra/MinorInterface.h>
     45
     46#include <kernel/spectrum/GMPrat.h>
     47#include <kernel/groebner_walk/walkProc.h>
     48#include <kernel/oswrapper/timer.h>
     49#include <kernel/fglm/fglm.h>
     50
     51#include <kernel/GBEngine/kstdfac.h>
     52#include <kernel/GBEngine/syz.h>
     53#include <kernel/GBEngine/kstd1.h>
     54#include <kernel/GBEngine/units.h>
     55#include <kernel/GBEngine/tgb.h>
     56
     57#include <kernel/preimage.h>
    4158#include <kernel/polys.h>
     59#include <kernel/ideals.h>
     60
     61#include <Singular/mod_lib.h>
    4262#include <Singular/fevoices.h>
    43 #include <kernel/ideals.h>
    44 #include <kernel/GBEngine/kstd1.h>
    45 #include <kernel/oswrapper/timer.h>
    46 #include <kernel/preimage.h>
    47 #include <kernel/GBEngine/units.h>
    48 #include <kernel/spectrum/GMPrat.h>
    49 #include <kernel/GBEngine/tgb.h>
    50 #include <kernel/groebner_walk/walkProc.h>
    51 #include <kernel/linear_algebra/linearAlgebra.h>
    52 #include <kernel/GBEngine/syz.h>
    53 
    54 #include <kernel/linear_algebra/interpolation.h>
    55 #  include <kernel/GBEngine/kstdfac.h>
    56 #  include <kernel/fglm/fglm.h>
    57 
    5863#include <Singular/tok.h>
    5964#include <Singular/ipid.h>
    … …  
    6772#include <Singular/attrib.h>
    6873#include <Singular/links/silink.h>
    69 #include <kernel/linear_algebra/MinorInterface.h>
    7074#include <Singular/misc_ip.h>
    7175#include <Singular/linearAlgebra_ip.h>

  • kernel/GBEngine/khstd.cc

    rc4e319 ra4771e1  
    1111
    1212#include <kernel/mod2.h>
     13
    1314#include <misc/options.h>
    1415#include <misc/intvec.h>
     16
    1517#include <polys/simpleideals.h>
    16 #include <kernel/polys.h>
     18
     19#include <kernel/combinatorics/stairc.h>
     20#include <kernel/combinatorics/hilb.h>
     21
    1722#include <kernel/GBEngine/kutil.h>
    18 #include <kernel/combinatorics/stairc.h>
    1923#include <kernel/GBEngine/kstd1.h>
    2024#include <kernel/GBEngine/khstd.h>
     25
     26#include <kernel/polys.h>
    2127
    2228#define ADIDEBUG 0

  • kernel/GBEngine/kstdfac.h

    rc4e319 ra4771e1  
    88*/
    99#include <kernel/structs.h>
     10#include <polys/simpleideals.h>
    1011
    1112ideal_list kStdfac(ideal F, ideal Q, tHomog h,intvec ** w, ideal D=NULL);

  • kernel/GBEngine/syz2.cc

    rc4e319 ra4771e1  
    2626#include <polys/prCopy.h>
    2727
    28 #include <kernel/polys.h>
     28#include <kernel/combinatorics/stairc.h>
     29#include <kernel/combinatorics/hilb.h>
    2930
    3031#include <kernel/GBEngine/kstd1.h>
    3132#include <kernel/GBEngine/kutil.h>
    32 #include <kernel/combinatorics/stairc.h>
    33 
    3433#include <kernel/GBEngine/syz.h>
     34
    3535#include <kernel/ideals.h>
     36#include <kernel/polys.h>
    3637
    3738

  • kernel/GBEngine/syz3.cc

    rc4e319 ra4771e1  
    66*/
    77
    8 
    9 
    10 
    118#include <kernel/mod2.h>
     9#include <omalloc/omalloc.h>
     10
    1211#include <misc/mylimits.h>
    1312#include <misc/options.h>
    14 #include <omalloc/omalloc.h>
    15 #include <kernel/polys.h>
    16 #include <kernel/GBEngine/kstd1.h>
    17 #include <kernel/GBEngine/kutil.h>
    18 #include <kernel/combinatorics/stairc.h>
    19 //#include "cntrlc.h"
    2013#include <misc/intvec.h>
     14
    2115#include <coeffs/numbers.h>
    22 #include <kernel/ideals.h>
    23 #include <misc/intvec.h>
     16
    2417#include <polys/monomials/ring.h>
    25 #include <kernel/GBEngine/syz.h>
    2618#include <polys/kbuckets.h>
    2719#include <polys/prCopy.h>
    2820#include <polys/matpol.h>
     21
     22#include <kernel/combinatorics/stairc.h>
     23#include <kernel/combinatorics/hilb.h>
     24
     25#include <kernel/GBEngine/kstd1.h>
     26#include <kernel/GBEngine/kutil.h>
     27#include <kernel/GBEngine/syz.h>
     28
     29#include <kernel/ideals.h>
     30#include <kernel/polys.h>
    2931
    3032//#define SHOW_PROT

  • kernel/combinatorics/Makefile.am

    rc4e319 ra4771e1  
    88
    99libcombinatorics_la_includedir=$(includedir)/singular/kernel/combinatorics
    10 libcombinatorics_la_include_HEADERS=hutil.h stairc.h
     10libcombinatorics_la_include_HEADERS=hutil.h stairc.h hilb.h
    1111
    1212

  • kernel/combinatorics/hdegree.cc

    rc4e319 ra4771e1  
    66*/
    77
    8 
    9 
    10 
    118#include <kernel/mod2.h>
    129
     10#include <omalloc/omalloc.h>
     11#include <misc/intvec.h>
     12#include <coeffs/numbers.h>
    1313
    1414#include <kernel/structs.h>
    15 #include <omalloc/omalloc.h>
    1615#include <kernel/ideals.h>
    1716#include <kernel/polys.h>
    18 #include <misc/intvec.h>
    19 #include <coeffs/numbers.h>
     17
    2018#include <kernel/combinatorics/hutil.h>
     19#include <kernel/combinatorics/hilb.h>
    2120#include <kernel/combinatorics/stairc.h>
    2221

  • kernel/combinatorics/hilb.cc

    rc4e319 ra4771e1  
    66*/
    77
    8 
    9 
    10 
    118#include <kernel/mod2.h>
    12 #include <kernel/structs.h>
     9
    1310#include <omalloc/omalloc.h>
    14 #include <kernel/polys.h>
     11#include <misc/auxiliary.h>
     12#include <misc/mylimits.h>
    1513#include <misc/intvec.h>
     14
     15#include <kernel/combinatorics/hilb.h>
     16#include <kernel/combinatorics/stairc.h>
    1617#include <kernel/combinatorics/hutil.h>
    17 #include <kernel/combinatorics/stairc.h>
     18
     19#include <polys/monomials/ring.h>
     20#include <polys/monomials/p_polys.h>
     21#include <polys/simpleideals.h>
     22
     23
     24// #include <kernel/structs.h>
     25// #include <kernel/polys.h>
    1826//ADICHANGES:
    1927#include <kernel/ideals.h>
    20 #include <kernel/GBEngine/kstd1.h>
    21 #include<gmp.h>
    22 #include<vector>
     28// #include <kernel/GBEngine/kstd1.h>
     29// #include<gmp.h>
     30// #include<vector>
    2331
    2432

  • kernel/combinatorics/hutil.cc

    rc4e319 ra4771e1  
    66*/
    77
    8 
    9 
    10 
    118#include <kernel/mod2.h>
    12 #include <kernel/structs.h>
     9// #include <kernel/structs.h>
    1310#include <omalloc/omalloc.h>
    14 #include <kernel/ideals.h>
    15 #include <kernel/polys.h>
     11
     12#include <polys/simpleideals.h>
     13#include <polys/monomials/p_polys.h>
     14
     15// #include <kernel/ideals.h>
     16// #include <kernel/polys.h>
    1617#include <kernel/combinatorics/hutil.h>
    1718
    … …  
    3334scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing)
    3435{
     36  if (tailRing != currRing)
     37    hisModule = id_RankFreeModule(S, currRing, tailRing);
     38  else
     39    hisModule = id_RankFreeModule(S, currRing);
     40
     41  if (hisModule < 0)
     42    hisModule = 0;
     43   
    3544  int  sl, ql, i, k = 0;
    3645  polyset si, qi, ss;
    3746  scfmon ex, ek;
    38   if (tailRing != currRing)
    39     hisModule = id_RankFreeModule(S, currRing, tailRing);
    40   else
    41     hisModule = id_RankFreeModule(S,currRing);
    42   if (hisModule < 0)
    43     hisModule = 0;
     47   
    4448  if (S!=NULL)
    4549  {
    … …  
    9195    {
    9296      *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
    93       pGetExpV(*si, *ek);
     97      p_GetExpV(*si, *ek, currRing);
    9498      ek++;
    9599    }
    … …  
    101105    {
    102106      *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int));
    103       pGetExpV(*qi, *ek);
     107      p_GetExpV(*qi, *ek, currRing);
    104108      ek++;
    105109    }

  • kernel/combinatorics/hutil.h

    rc4e319 ra4771e1  
    77* ABSTRACT
    88*/
     9
     10class intvec;
     11
     12struct omBin_s   ; typedef struct omBin_s omBin_t ; typedef omBin_t * omBin;
     13
     14struct ip_sring  ; typedef struct ip_sring                          * ring;
     15struct sip_sideal; typedef struct sip_sideal                        * ideal;
     16struct spolyrec  ; typedef struct spolyrec polyrec; typedef polyrec * poly;
     17typedef                                                     poly    * polyset;
     18
     19extern ring currRing;
     20
    921typedef int * scmon;
    1022typedef scmon * scfmon;
    … …  
    4355
    4456
    45 scfmon hInit(ideal S, ideal Q, int * Nexist, ring tailRing);
    4657void hDelete(scfmon ev, int ev_length);
    4758void hComp(scfmon exist, int Nexist, int ak, scfmon stc, int * Nstc);
    … …  
    7485void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu);
    7586
     87
     88scfmon hInit(ideal S, ideal Q, int * Nexist, ring tailRing);
    7689void slicehilb(ideal I);
    7790#endif

  • kernel/combinatorics/stairc.h

    rc4e319 ra4771e1  
    88*/
    99
    10 #include <kernel/structs.h>
     10struct spolyrec  ; typedef struct spolyrec polyrec; typedef polyrec * poly;
     11struct ip_sring  ; typedef struct ip_sring                          * ring;
     12struct sip_sideal; typedef struct sip_sideal                        * ideal;
     13
     14class intvec;
     15
     16extern ring currRing;
    1117
    1218void scComputeHC(ideal s,ideal Q, int  k,poly &hEdge, ring tailRing = currRing);
    … …  
    2733ideal scKBase(int deg, ideal  s, ideal Q=NULL, intvec * mv=NULL);
    2834
    29 intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree,
    30                      ideal Q=NULL, ring tailRing = currRing);
    31 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL, ring tailRing = currRing);
    32 intvec * hSecondSeries(intvec *hseries1);
    33 
    34 void hLookSeries(ideal S, intvec *modulweight, ideal Q=NULL);
    35 
    3635#endif
    3736

  • kernel/combinatorics/test.cc

    rc4e319 ra4771e1  
    7070// HEADERS:
    7171#include <kernel/combinatorics/hutil.h>
     72#include <kernel/combinatorics/hilb.h>
     73#include <kernel/combinatorics/stairc.h>
     74
    7275#include <kernel/ideals.h>
    7376#include <kernel/digitech.h>
    … …  
    7679// #include <kernel/spectrum/kmatrix.h>
    7780#include <kernel/preimage.h>
    78 
    7981#include <kernel/structs.h>
    80 
    8182#include <kernel/polys.h>
    8283
Note: See TracChangeset for help on using the changeset viewer.