===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/resol.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM/src/kan96xx/Kan/resol.c	1999/10/08 02:12:02	1.1
+++ OpenXM/src/kan96xx/Kan/resol.c	2000/07/26 02:21:30	1.5
@@ -1,3 +1,4 @@
+/* $OpenXM: OpenXM/src/kan96xx/Kan/resol.c,v 1.4 2000/06/26 11:15:04 takayama Exp $ */
 /* resol.c */
 #include <stdio.h>
 #include "datatype.h"
@@ -11,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;
@@ -43,12 +46,14 @@ struct arrayOfMonomialSyz enlargeArrayOfMonomialSyz(st
 static struct arrayOfMonomialSyz schreyerSkelton0(struct arrayOfPOLY g,int i)
 /* return value will be changed by the next call of this function. */
 {
-  int m,j,k;
+  int m,j,k,flag;
   static int s_ij_size = 0;
   static struct monomialSyz **s_ij = NULL;
   struct monomialSyz *s;
   struct spValue sv;
   struct arrayOfMonomialSyz ans;
+  extern int RemoveRedundantInSchreyerSkelton;
+  /* It was 1. */
 
   m = g.n;
   if (m > s_ij_size) {
@@ -69,15 +74,22 @@ static struct arrayOfMonomialSyz schreyerSkelton0(stru
     }
   }
   shellForMonomialSyz(s_ij,m-i-1);
-  for (j=0; j<m-i-1;j++) {
-    s = s_ij[j];
-    if (s->deleted != 1) {
-      for (k=j+1; k<m-i-1; k++) {
-	if (s_ij[k]->deleted != 1) {
-	  if ((*isReducible)(s_ij[k]->a,s->a)) s_ij[k]->deleted = 1;
-	}
-      }
-    }
+  if (RemoveRedundantInSchreyerSkelton) {
+	do {
+	  flag = 0;
+      for (j=0; j<m-i-1;j++) {
+		if (s_ij[j]->deleted != 1) {
+		  for (k=0; k<m-i-1;k++) {
+			if ((j != k) && (s_ij[k]->deleted != 1)) {
+			  if ((*isReducible)(s_ij[k]->a,s_ij[j]->a)) {
+				s_ij[k]->deleted = 1;
+				flag = 1;
+			  }
+			}
+		  }
+		}
+	  }
+	}while (flag);
   }
   ans.size = m-i-1;
   ans.limit = s_ij_size;
@@ -112,7 +124,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]);
       }
     }
   }