Changeset a4771e1 in git for kernel/combinatorics
- Timestamp:
- Sep 15, 2014, 9:11:04 PM (10 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
- 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
- Location:
- kernel/combinatorics
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/combinatorics/Makefile.am
rc4e319 ra4771e1 8 8 9 9 libcombinatorics_la_includedir=$(includedir)/singular/kernel/combinatorics 10 libcombinatorics_la_include_HEADERS=hutil.h stairc.h 10 libcombinatorics_la_include_HEADERS=hutil.h stairc.h hilb.h 11 11 12 12 -
kernel/combinatorics/hdegree.cc
rc4e319 ra4771e1 6 6 */ 7 7 8 9 10 11 8 #include <kernel/mod2.h> 12 9 10 #include <omalloc/omalloc.h> 11 #include <misc/intvec.h> 12 #include <coeffs/numbers.h> 13 13 14 14 #include <kernel/structs.h> 15 #include <omalloc/omalloc.h>16 15 #include <kernel/ideals.h> 17 16 #include <kernel/polys.h> 18 #include <misc/intvec.h> 19 #include <coeffs/numbers.h> 17 20 18 #include <kernel/combinatorics/hutil.h> 19 #include <kernel/combinatorics/hilb.h> 21 20 #include <kernel/combinatorics/stairc.h> 22 21 -
kernel/combinatorics/hilb.cc
rc4e319 ra4771e1 6 6 */ 7 7 8 9 10 11 8 #include <kernel/mod2.h> 12 #include <kernel/structs.h> 9 13 10 #include <omalloc/omalloc.h> 14 #include <kernel/polys.h> 11 #include <misc/auxiliary.h> 12 #include <misc/mylimits.h> 15 13 #include <misc/intvec.h> 14 15 #include <kernel/combinatorics/hilb.h> 16 #include <kernel/combinatorics/stairc.h> 16 17 #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> 18 26 //ADICHANGES: 19 27 #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> 23 31 24 32 -
kernel/combinatorics/hutil.cc
rc4e319 ra4771e1 6 6 */ 7 7 8 9 10 11 8 #include <kernel/mod2.h> 12 #include <kernel/structs.h>9 // #include <kernel/structs.h> 13 10 #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> 16 17 #include <kernel/combinatorics/hutil.h> 17 18 … … 33 34 scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing) 34 35 { 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 35 44 int sl, ql, i, k = 0; 36 45 polyset si, qi, ss; 37 46 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 44 48 if (S!=NULL) 45 49 { … … 91 95 { 92 96 *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int)); 93 p GetExpV(*si, *ek);97 p_GetExpV(*si, *ek, currRing); 94 98 ek++; 95 99 } … … 101 105 { 102 106 *ek = (scmon) omAlloc(((currRing->N)+1)*sizeof(int)); 103 p GetExpV(*qi, *ek);107 p_GetExpV(*qi, *ek, currRing); 104 108 ek++; 105 109 } -
kernel/combinatorics/hutil.h
rc4e319 ra4771e1 7 7 * ABSTRACT 8 8 */ 9 10 class intvec; 11 12 struct omBin_s ; typedef struct omBin_s omBin_t ; typedef omBin_t * omBin; 13 14 struct ip_sring ; typedef struct ip_sring * ring; 15 struct sip_sideal; typedef struct sip_sideal * ideal; 16 struct spolyrec ; typedef struct spolyrec polyrec; typedef polyrec * poly; 17 typedef poly * polyset; 18 19 extern ring currRing; 20 9 21 typedef int * scmon; 10 22 typedef scmon * scfmon; … … 43 55 44 56 45 scfmon hInit(ideal S, ideal Q, int * Nexist, ring tailRing);46 57 void hDelete(scfmon ev, int ev_length); 47 58 void hComp(scfmon exist, int Nexist, int ak, scfmon stc, int * Nstc); … … 74 85 void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu); 75 86 87 88 scfmon hInit(ideal S, ideal Q, int * Nexist, ring tailRing); 76 89 void slicehilb(ideal I); 77 90 #endif -
kernel/combinatorics/stairc.h
rc4e319 ra4771e1 8 8 */ 9 9 10 #include <kernel/structs.h> 10 struct spolyrec ; typedef struct spolyrec polyrec; typedef polyrec * poly; 11 struct ip_sring ; typedef struct ip_sring * ring; 12 struct sip_sideal; typedef struct sip_sideal * ideal; 13 14 class intvec; 15 16 extern ring currRing; 11 17 12 18 void scComputeHC(ideal s,ideal Q, int k,poly &hEdge, ring tailRing = currRing); … … 27 33 ideal scKBase(int deg, ideal s, ideal Q=NULL, intvec * mv=NULL); 28 34 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 36 35 #endif 37 36 -
kernel/combinatorics/test.cc
rc4e319 ra4771e1 70 70 // HEADERS: 71 71 #include <kernel/combinatorics/hutil.h> 72 #include <kernel/combinatorics/hilb.h> 73 #include <kernel/combinatorics/stairc.h> 74 72 75 #include <kernel/ideals.h> 73 76 #include <kernel/digitech.h> … … 76 79 // #include <kernel/spectrum/kmatrix.h> 77 80 #include <kernel/preimage.h> 78 79 81 #include <kernel/structs.h> 80 81 82 #include <kernel/polys.h> 82 83
Note: See TracChangeset
for help on using the changeset viewer.