===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ecart.c,v
retrieving revision 1.19
retrieving revision 1.22
diff -u -p -r1.19 -r1.22
--- OpenXM/src/kan96xx/Kan/ecart.c	2003/09/20 09:57:29	1.19
+++ OpenXM/src/kan96xx/Kan/ecart.c	2005/07/03 11:08:53	1.22
@@ -1,5 +1,6 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.18 2003/09/12 02:52:50 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.21 2004/09/13 11:24:11 takayama Exp $ */
 #include <stdio.h>
+#include <stdlib.h>
 #include "datatype.h"
 #include "extern2.h"
 #include "gradedset.h"
@@ -26,6 +27,7 @@ static int ecartCheckPoly(POLY f);  /* check if it doe
 static int ecartCheckEnv();         /* check if the environment is OK for ecart div*/
 static struct ecartPolyArray *ecartPutPolyInG(POLY g,struct ecartPolyArray *eparray,POLY cf, POLY syz);
 static int ecartGetEll(POLY r,POLY g);
+static int ecartGetEllPartial(POLY r,POLY g);
 static POLY ecartDivideSv(POLY r,int *d);
 /* No automatic homogenization and s is used as a standart var. */
 static POLY reduction_ecart0(POLY r,struct gradedPolySet *gset,
@@ -117,7 +119,42 @@ static int ecartGetEll(POLY f,POLY g) {
   else return(-p);
 }
 
+static int ecartGetEllPartial(POLY f,POLY g) {
+  int n,i,p;
+  MONOMIAL tf;
+  MONOMIAL tg;
+  int nglob; int *glob; int k;
+  
+  if (f ISZERO) return(-1);
+  if (g ISZERO) return(-1);
 
+  checkRingIsR(f,g);
+
+  if (!isSameComponent_x(f,g)) return(-1);
+  tf = f->m; tg = g->m; n = tf->ringp->n;
+  for (i=1; i<n; i++) {
+    if (tf->e[i].x < tg->e[i].x) return(-1);
+    if (tf->e[i].D < tg->e[i].D) return(-1);
+  }
+  if (tf->e[0].D < tg->e[0].D) return(-1);  /*  h  */
+
+  /* Find u and ell s.t. s^\ell f = u g.
+     When u contains variables in glob (index x var), then returns -1.
+     x' = glob, x'' = complement of glob.  Division in Q(x'')[x'].
+  */
+  nglob = tf->ringp->partialEcart;
+  glob = tf->ringp->partialEcartGlobalVarX;
+  for (i=0; i<nglob; i++) {
+    k = glob[i];
+    if (tf->e[k].x > tg->e[k].x) return(-1);
+  }
+
+  p = tf->e[0].x - tg->e[0].x;  /* H,  s */
+  if (p >=0 ) return 0;
+  else return(-p);
+}
+
+
 #define EP_SIZE 10
 static struct ecartPolyArray *ecartPutPolyInG(POLY g,struct ecartPolyArray *eparray,POLY cf,POLY syz)
 {
@@ -165,6 +202,7 @@ static struct ecartPolyArray *ecartPutPolyInG(POLY g,s
   return eparray;
 }
 
+#ifndef EXPERIMENT
 static struct ecartReducer ecartFindReducer(POLY r,struct gradedPolySet *gset,
                                             struct ecartPolyArray *epa)
 {
@@ -202,7 +240,7 @@ static struct ecartReducer ecartFindReducer(POLY r,str
   if (epa != NULL) {
     /* Try to find in the second group. */
     for (i=0; i< epa->size; i++) {
-      ell = ecartGetEll(r,(epa->pa)[i]);
+      ell = ecartGetEllPartial(r,(epa->pa)[i]);
       if ((ell>=0) && (ell < ell2)) {
         ell2 = ell;
         minGgi = i;
@@ -213,35 +251,6 @@ static struct ecartReducer ecartFindReducer(POLY r,str
   if ((DebugReductionRed&1) || (DebugReductionEcart&1)) {
     printf("ecartFindReducer(): ell1=%d, ell2=%d, minGrade=%d, minGseti=%d, minGgi=%d\n",ell1,ell2,minGrade,minGseti,minGgi);
   }
-  if (Sugar) {  /* experimental */
-	if (ell1 <= ell2) {
-	  if (ell1 == LARGE) {
-		er.ell = -1;
-		return er;
-	  }else{
-		int new_s;
-		er.ell = ell1;
-		er.first = 1;
-		er.grade = minGrade;
-		er.gseti = minGseti;
-		/* reduce if and only if Ecart_sugarGrade does not increase. */
-		new_s = grade_gen(r)-grade_gen(gset->polys[minGrade]->gh[minGseti]);
-		if (new_s + minGrade <= Ecart_sugarGrade) {
-		  return er;
-		}else{
-		  printf("new_s=%d, minGrade=%d, sugarGrade=%d\n",new_s,minGrade,
-				 Ecart_sugarGrade);
-		  er.ell = -1;
-		  return er;
-		}
-	  }
-	}else{
-      er.ell = ell2;
-      er.first = 0;
-      er.ggi = minGgi;
-	  return er;
-	}
-  }
 
   if (ell1 <= ell2) {
     if (ell1 == LARGE) {
@@ -261,6 +270,7 @@ static struct ecartReducer ecartFindReducer(POLY r,str
       return er;
   }
 }
+#endif
 
 static POLY  ecartCheckSyz0(POLY cf,POLY r_0,POLY syz,
                            struct gradedPolySet *gg,POLY r)
@@ -396,7 +406,7 @@ static POLY reduction_ecart0(r,gset,needSyz,syzp)
 
   if (DoCancel && (r != POLYNULL)) shouldReduceContent(r,1);
 
-  if (DebugReductionEcart&1) printf("--------------------------------------\n");
+  if (DebugReductionEcart&1) printf("reduction_ecart0--------------------------------------\n");
   do {
     if (DebugReductionRed&1) printf("r=%s\n",POLYToString(r,'*',1));
     if (DebugReductionEcart & 1) printf("r=%s+...\n",POLYToString(head(r),'*',1));
@@ -541,7 +551,7 @@ static POLY reduction_ecart1(r,gset,needSyz,syzp)
   /* 1 means homogenize only s */
   if (DoCancel && (r != POLYNULL)) shouldReduceContent(r,1);
 
-  if (DebugReductionEcart&1) printf("=======================================\n");
+  if (DebugReductionEcart&1) printf("reduction_ecart1=======================================\n");
   do {
     if (DebugReductionRed & 1) printf("(ecart1(d)) r=%s\n",POLYToString(r,'*',1));
     if (DebugReductionEcart & 1) printf("r=%s+,,,\n",POLYToString(head(r),'*',1));
@@ -728,7 +738,7 @@ static struct ecartReducer ecartFindReducer_mod(POLY r
   if (epa != NULL) {
     /* Try to find in the second group. */
     for (i=0; i< epa->size; i++) {
-      ell = ecartGetEll(r,(epa->pa)[i]);
+      ell = ecartGetEllPartial(r,(epa->pa)[i]);
       if ((ell>=0) && (ell < ell2)) {
         ell2 = ell;
         minGgi = i;
@@ -843,4 +853,189 @@ static POLY reduction_ecart1_mod(r,gset)
 
   return(r);
 }
+
+#ifdef EXPERIMENT
+static struct ecartReducer ecartFindReducer(POLY r,struct gradedPolySet *gset,
+                                            struct ecartPolyArray *epa)
+{
+  int grd;
+  struct polySet *set;
+  int minGrade = 0;
+  int minGseti = 0;
+  int minGgi   = 0;
+  int ell1 = LARGE;
+  int ell2 = LARGE;
+  int ell;
+  int i;
+  struct ecartReducer er;
+  int ellmin ;
+  ell1 = ell2 = ellmin = LARGE;
+  /* Try to find a reducer in gset; */
+  grd = 0;
+  while (grd < gset->maxGrade) {
+    set = gset->polys[grd];
+    for (i=0; i<set->size; i++) {
+      if (set->gh[i] == POLYNULL) {
+        /* goHomogenize set->gh[i] */
+          if (EcartAutomaticHomogenization) {
+              set->gh[i] = goHomogenize11(set->g[i],DegreeShifto_vec,DegreeShifto_size,-1,1);
+          }else{
+              set->gh[i] = set->g[i];
+          }
+      }
+      ell = ecartGetEll(r,set->gh[i]);
+      if ((ell>=0) && (ell < ell1)) {
+        ell1 = ell;
+        minGrade = grd; minGseti=i;
+      }
+    }
+    grd++;
+  }
+  if (epa != NULL) {
+    /* Try to find in the second group. */
+    for (i=0; i< epa->size; i++) {
+      ell = ecartGetEll(r,(epa->pa)[i]);
+      if ((ell>=0) && (ell < ell2)) {
+        ell2 = ell;
+        minGgi = i;
+      }
+    }
+  }
+
+  if ((DebugReductionRed&1) || (DebugReductionEcart&1)) {
+    printf("ecartFindReducer(): ell1=%d, ell2=%d, minGrade=%d, minGseti=%d, minGgi=%d\n",ell1,ell2,minGrade,minGseti,minGgi);
+  }
+
+#ifdef EXPERIMENTAL1
+  if (Sugar) {  /* experimental */
+	if (ell1 <= ell2) {
+	  if (ell1 == LARGE) {
+		er.ell = -1;
+		return er;
+	  }else{
+		int new_s;
+		er.ell = ell1;
+		er.first = 1;
+		er.grade = minGrade;
+		er.gseti = minGseti;
+		/* reduce if and only if Ecart_sugarGrade does not increase. */
+		new_s = grade_gen(r)-grade_gen(gset->polys[minGrade]->gh[minGseti]);
+		if (new_s + minGrade <= Ecart_sugarGrade+1) {
+		  return er;
+		}else{
+		  printf("new_s=%d, minGrade=%d, sugarGrade=%d\n",new_s,minGrade,
+				 Ecart_sugarGrade);
+		  er.ell = -1;
+		  return er;
+		}
+	  }
+	}else{
+      er.ell = ell2;
+      er.first = 0;
+      er.ggi = minGgi;
+	  return er;
+	}
+  }
+#endif
+
+  if ((ell1 == LARGE) &&  (ell2 == LARGE)) {
+	er.ell = -1;
+	return er;
+  }
+
+  if (ell1 < ell2) {
+	ellmin = ell1;
+  }else{
+	ellmin = ell2;
+  }
+  {
+#define M 100
+	int aminGrade[M];
+	int aminGseti[M];
+	int aminGgi[M];
+	int sp1,sp2;
+	int i;
+	int gmin;
+	int gtmp;
+	sp1 = sp2 = 0;
+
+	if (ell1 == ellmin) {
+	  grd = 0;
+	  while (grd < gset->maxGrade) {
+		set = gset->polys[grd];
+		for (i=0; i<set->size; i++) {
+		  ell = ecartGetEll(r,set->gh[i]);
+		  if (ell == ellmin) {
+			aminGrade[sp1] = grd; aminGseti[sp1]=i;
+			sp1++;
+			if (sp1 >= M) {
+			  fprintf(stderr,"aminGrade, buffer overflow. sp1 is set to 1.\n");
+			  sp1 = 1;
+			}
+		  }
+		}
+		grd++;
+	  }
+	}
+	if (ell2 == ellmin) {
+	  if (epa != NULL) {
+		for (i=0; i< epa->size; i++) {
+		  ell = ecartGetEll(r,(epa->pa)[i]);
+		  if (ell == ellmin) { 
+			aminGgi[sp2] = i;
+			sp2++; 
+			if (sp2 >= M) {
+			  fprintf(stderr,"aminGgi, buffer overflow. sp2 is set to 1.\n");
+			  sp2 = 1;
+			}
+		  }
+		}
+	  }
+	}
+	/* print summary */
+	printf("summary -----------------------\n");
+	for (i=0; i<sp1; i++) {
+	  printf("i=%d: minGrade=%d, minGseti=%d,",i,aminGrade[i],aminGseti[i]);
+	  printf("grade=%d\n",grade_gen(gset->polys[aminGrade[i]]->gh[aminGseti[i]]));
+	}
+	gmin = LARGE;
+	for (i=0; i<sp2; i++) {
+	  printf("i=%d: minGgi=%d,",i,aminGgi[i]);
+	  gtmp = grade_gen((epa->pa)[aminGgi[i]]);
+	  printf("grade=%d\n",gtmp);
+	  if (gtmp < gmin) {
+		gmin = gtmp;
+		minGgi = aminGgi[i];
+	  }
+	}
+
+	if (ell1 <= ell2) {
+      er.ell = ell1;
+      er.first = 1;
+      er.grade = minGrade;
+      er.gseti = minGseti;
+      return er;
+	}else{
+      er.ell = ell2;
+      er.first = 0;
+      er.ggi = minGgi;
+      return er;
+	}
+
+  }
+
+  if (ell1 <= ell2) {
+      er.ell = ell1;
+      er.first = 1;
+      er.grade = minGrade;
+      er.gseti = minGseti;
+      return er;
+  }else{
+      er.ell = ell2;
+      er.first = 0;
+      er.ggi = minGgi;
+      return er;
+  }
+}
+#endif