=================================================================== RCS file: /home/cvs/OpenXM/src/k097/lib/minimal/minimal.k,v retrieving revision 1.5 retrieving revision 1.10 diff -u -p -r1.5 -r1.10 --- OpenXM/src/k097/lib/minimal/minimal.k 2000/05/05 08:13:49 1.5 +++ OpenXM/src/k097/lib/minimal/minimal.k 2000/05/07 02:10:44 1.10 @@ -1,10 +1,13 @@ -/* $OpenXM: OpenXM/src/k097/lib/minimal/minimal.k,v 1.4 2000/05/04 11:05:20 takayama Exp $ */ +/* $OpenXM: OpenXM/src/k097/lib/minimal/minimal.k,v 1.9 2000/05/06 13:41:12 takayama Exp $ */ #define DEBUG 1 /* #define ORDINARY 1 */ /* If you run this program on openxm version 1.1.2 (FreeBSD), make a symbolic link by the command ln -s /usr/bin/cpp /lib/cpp */ +#define OFFSET 0 +#define TOTAL_STRATEGY +/* #define OFFSET 20*/ /* Test sequences. Use load["minimal.k"];; @@ -34,6 +37,7 @@ def load_tower() { sm1(" [(parse) (k0-tower.sm1) pushfile ] extension "); sm1(" /k0-tower.sm1.loaded 1 def "); } + sm1(" oxNoX "); } load_tower(); SonAutoReduce = true; @@ -336,11 +340,21 @@ def test_SinitOfArray() { /* f is assumed to be a monomial with toes. */ def Sdegree(f,tower,level) { - local i; + local i,ww, wd; + /* extern WeightOfSweyl; */ + ww = WeightOfSweyl; f = Init(f); if (level <= 1) return(StotalDegree(f)); i = Degree(f,es); - return(StotalDegree(f)+Sdegree(tower[level-2,i],tower,level-1)); +#ifdef TOTAL_STRATEGY + return(StotalDegree(f)+Sdegree(tower[level-2,i],tower,level-1)); +#endif + /* Strategy must be compatible with ordering. */ + /* Weight vector must be non-negative, too. */ + /* See Sdegree, SgenerateTable, reductionTable. */ + wd = Sord_w(f,ww); + return(wd+Sdegree(tower[level-2,i],tower,level-1)); + } def SgenerateTable(tower) { @@ -351,7 +365,8 @@ def SgenerateTable(tower) { n = Length(tower[i]); ans_at_each_floor=NewArray(n); for (j=0; j The betti numbers are 3, 2. @@ -1050,13 +1103,13 @@ def Sannfs3(f) { -/* The below is under construction. */ +/* The below does not use LaScala-Stillman's algorithm. */ def Sschreyer(g) { local rf, tower, reductionTable, skel, redundantTable, bases, strategy, maxOfStrategy, height, level, n, i, freeRes,place, f, reducer,pos, redundant_seq,bettiTable,freeResV,ww, redundantTable_ordinary, redundant_seq_ordinary, - reductionTable_tmp,c2,ii,nn; + reductionTable_tmp,c2,ii,nn, m,ii, jj, reducerBase; /* extern WeightOfSweyl; */ ww = WeightOfSweyl; Print("WeghtOfSweyl="); Println(WeightOfSweyl); @@ -1121,19 +1174,49 @@ def Sschreyer(g) { /* i must be equal to f[2], I think. Double check. */ /* Correction Of Constant */ - c2 = f[6]; + /* Correction of syzygy */ + c2 = f[6]; /* or -f[6]? Double check. */ + Print("c2="); Println(c2); nn = Length(bases); for (ii=0; ii=0; ii--) { + if (!IsNull(reducerBase[ii])) { + for (jj=ii-1; jj>=0; jj--) { + if (!IsNull(reducerBase[jj])) { + if (!IsZero(reducerBase[jj,ii])) { + /* reducerBase[ii,ii] should be always constant. */ + reducerBase[jj] = reducerBase[ii,ii]*reducerBase[jj]-reducerBase[jj,ii]*reducerBase[ii]; + } + } + } + } + } + Println("New reducer"); + sm1_pmat(reducerBase); + reducer[level-1] = reducerBase; + } + } /* level loop */ n = Length(freeRes); freeResV = SnewArrayOfFormat(freeRes); @@ -1151,6 +1261,18 @@ def Sschreyer(g) { bases = Sbases_to_vec(bases,bettiTable[i]); freeResV[i] = bases; } + + /* Mark the non-redundant elements. */ + for (i=0; i= 1 in SpairAndReduction."); p = skel[level,ii]; @@ -1193,6 +1315,11 @@ def SpairAndReduction2(skel,level,ii,freeRes,tower,ww, tmp = Sreduction(si*gi+sj*gj, bases); Print("result is "); Println(tmp); + if (!IsZero(tmp[0])) { + Print("Error: base = "); + Println(Map(bases,"Stoes_vec")); + Error("SpairAndReduction2: the remainder should be zero. See tmp. tower2. show_ring."); + } t_syz = tmp[2]; si = si*tmp[1]+t_syz[i]; sj = sj*tmp[1]+t_syz[j]; @@ -1203,15 +1330,18 @@ def SpairAndReduction2(skel,level,ii,freeRes,tower,ww, /* tmp[0] must be zero */ n = Length(t_syz); for (i=0; i=0; q--) { + if (redundantTable[level,q] > 0) { + Print("[seq,level,q]="); Println([seq,level,q]); + if (level < maxLevel-1) { + bases = freeRes[level+1]; + dr = reducer[level,q]; + /* dr[q] = -1; We do not need this in our reducer format. */ + /* dr[q] should be a non-zero constant. */ + newbases = SnewArrayOfFormat(bases); + betti_levelplus = Length(bases); + /* + bases[i,j] ---> bases[i,j]+bases[i,q]*dr[j] + */ + for (i=0; i