Changeset 762afe1 in git
- Timestamp:
- Jun 8, 2022, 3:01:52 PM (22 months ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- c1b1bf0a5a008bf94ec2cec7e94317d388fd1f10
- Parents:
- ed6b03b61600c2241ea31223bf9c968b0285590d
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/ipshell.cc
red6b03 r762afe1 1102 1102 1103 1103 lists scIndIndset(ideal S, BOOLEAN all, ideal Q) 1104 // S mjust eb an ideal, not a module 1104 1105 { 1105 1106 int i; … … 1115 1116 res->m[0].rtyp=INTVEC_CMD; 1116 1117 res->m[0].data=(intvec*)iv; 1117 return res;1118 }1119 else if (hisModule!=0)1120 {1121 res->Init(0);1122 1118 return res; 1123 1119 } -
kernel/GBEngine/khstd.cc
red6b03 r762afe1 78 78 l = hilb->length()-1; 79 79 mw = (*hilb)[l]; 80 newhilb =hFirstSeries(strat->Shdl,w,Q,strat->kHomW ,currRing);80 newhilb =hFirstSeries(strat->Shdl,w,Q,strat->kHomW); 81 81 ln = newhilb->length()-1; 82 82 deg = degp(strat->P.p,currRing)-mw; … … 148 148 Lm = id_Head(strat->Shdl,currRing); 149 149 150 newhilb =hFirstSeries(Lm,w,Q,strat->kHomW ,currRing);150 newhilb =hFirstSeries(Lm,w,Q,strat->kHomW); 151 151 152 152 if(newhilb->compare(hilb) == 0) -
kernel/combinatorics/hilb.cc
red6b03 r762afe1 765 765 *caller 766 766 */ 767 void hLookSeries(ideal S, intvec *modulweight, ideal Q, intvec *wdegree , ring src)767 void hLookSeries(ideal S, intvec *modulweight, ideal Q, intvec *wdegree) 768 768 { 769 769 id_LmTest(S, currRing); 770 770 771 intvec *hseries1 = hFirstSeries(S, modulweight, Q, wdegree , src);771 intvec *hseries1 = hFirstSeries(S, modulweight, Q, wdegree); 772 772 if (errorreported) return; 773 773 … … 1875 1875 1876 1876 1877 intvec* hFirstSeries(ideal A,intvec *module_w,ideal Q, intvec *wdegree , ring src)1877 intvec* hFirstSeries(ideal A,intvec *module_w,ideal Q, intvec *wdegree) 1878 1878 { 1879 1879 static ring hilb_Qt=NULL; 1880 1880 if (hilb_Qt==NULL) hilb_Qt=makeQt(); 1881 if (!isModule(A, src))1882 return hFirstSeries0(A,Q,wdegree, src,hilb_Qt);1881 if (!isModule(A,currRing)) 1882 return hFirstSeries0(A,Q,wdegree,currRing,hilb_Qt); 1883 1883 intvec *res=NULL; 1884 1884 int w_max=0,w_min=0; … … 1890 1890 for(int c=1;c<=A->rank;c++) 1891 1891 { 1892 ideal Ac=getModuleComp(A,c, src);1893 intvec *res_c=hFirstSeries0(Ac,Q,wdegree, src,hilb_Qt);1892 ideal Ac=getModuleComp(A,c,currRing); 1893 intvec *res_c=hFirstSeries0(Ac,Q,wdegree,currRing,hilb_Qt); 1894 1894 intvec *tmp=NULL; 1895 1895 if (res==NULL) -
kernel/combinatorics/hilb.h
red6b03 r762afe1 12 12 #include "misc/intvec.h" 13 13 14 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL , ring src = currRing);14 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL); 15 15 intvec * hFirstSeries0(ideal S, ideal Q, intvec *wdegree, const ring src, const ring Qt); 16 16 poly hilbert_series(ideal A, const ring src, const intvec *wdegree, const ring Qt); … … 18 18 intvec * hSecondSeries(intvec *hseries1); 19 19 20 void hLookSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL , ring src = currRing);20 void hLookSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL); 21 21 #endif
Note: See TracChangeset
for help on using the changeset viewer.