=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/resol.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- OpenXM/src/kan96xx/Kan/resol.c 2000/01/16 07:55:41 1.2 +++ OpenXM/src/kan96xx/Kan/resol.c 2000/05/24 15:31:29 1.3 @@ -1,4 +1,4 @@ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/resol.c,v 1.2 2000/01/16 07:55:41 takayama Exp $ */ /* resol.c */ #include #include "datatype.h" @@ -12,6 +12,8 @@ static struct arrayOfMonomialSyz schreyerSkelton0(stru static struct arrayOfMonomialSyz putMonomialSyz(struct arrayOfMonomialSyz a, struct monomialSyz *s); +static int RemoveRedundantInSchreyerSkelton = 1; + struct monomialSyz *newMonomialSyz(void) { struct monomialSyz *s; @@ -50,6 +52,8 @@ static struct arrayOfMonomialSyz schreyerSkelton0(stru struct monomialSyz *s; struct spValue sv; struct arrayOfMonomialSyz ans; + extern int RemoveRedundantInSchreyerSkelton; + /* It was 1. */ m = g.n; if (m > s_ij_size) { @@ -70,15 +74,17 @@ static struct arrayOfMonomialSyz schreyerSkelton0(stru } } shellForMonomialSyz(s_ij,m-i-1); - for (j=0; jdeleted != 1) { for (k=j+1; kdeleted != 1) { - if ((*isReducible)(s_ij[k]->a,s->a)) s_ij[k]->deleted = 1; - } + if (s_ij[k]->deleted != 1) { + if ((*isReducible)(s_ij[k]->a,s->a)) s_ij[k]->deleted = 1; + } } } + } } ans.size = m-i-1; ans.limit = s_ij_size; @@ -113,7 +119,7 @@ struct arrayOfMonomialSyz schreyerSkelton(struct array ipart = schreyerSkelton0(g,i); for (k=0; k< ipart.size; k++) { if ((ipart.p)[k]->deleted != 1) { - ans = putMonomialSyz(ans,(ipart.p)[k]); + ans = putMonomialSyz(ans,(ipart.p)[k]); } } }