===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport1.c,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -p -r1.1.1.1 -r1.4
--- OpenXM/src/kan96xx/Kan/kanExport1.c	1999/10/08 02:12:02	1.1.1.1
+++ OpenXM/src/kan96xx/Kan/kanExport1.c	2003/07/13 07:53:17	1.4
@@ -1,3 +1,4 @@
+/* $OpenXM$ */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -13,8 +14,8 @@ extern int KanGBmessage;
   
 /** :kan, :ring */
 struct object Kreduction(f,set)
-struct object f;
-struct object set;
+     struct object f;
+     struct object set;
 {
   POLY r;
   struct gradedPolySet *grG;
@@ -54,7 +55,7 @@ struct object set;
 }
 
 struct object Kgroebner(ob)
-struct object ob;
+     struct object ob;
 {
   int needSyz = 0;
   int needBack = 0;
@@ -112,45 +113,45 @@ struct object ob;
     for (i=0; i<getoaSize(ob2); i++) {
       ob2c = getoa(ob2,i);
       if (ob2c.tag == Sdollar) {
-	if (strcmp(ob2c.lc.str,"needBack")==0) {
-	  needBack = 1;
-	}else if (strcmp(ob2c.lc.str,"needSyz")==0) {
-	  if (!needBack) {
-	    /* warningKan("Kgroebner(): needBack is automatically set."); */
-	  }
-	  needSyz = needBack = 1;
-	}else if (strcmp(ob2c.lc.str,"forceReduction")==0) {
-	  forceReduction = 1;
-	}else if (strcmp(ob2c.lc.str,"countDown")==0) {
-	  countDown = 1; cdflag = 1;
-	  if (needSyz) {
-	    warningKan("Kgroebner(): needSyz is automatically turned off.");
-	    needSyz = 0;
-	  }
-	}else if (strcmp(ob2c.lc.str,"StopDegree")==0) {
-	  StopDegree = 0; sdflag = 1;
-	  if (needSyz) {
-	    warningKan("Kgroebner(): needSyz is automatically turned off.");
-	    needSyz = 0;
-	  }
-	}else {
-	  warningKan("Unknown keyword for options.");
-	}
+        if (strcmp(ob2c.lc.str,"needBack")==0) {
+          needBack = 1;
+        }else if (strcmp(ob2c.lc.str,"needSyz")==0) {
+          if (!needBack) {
+            /* warningKan("Kgroebner(): needBack is automatically set."); */
+          }
+          needSyz = needBack = 1;
+        }else if (strcmp(ob2c.lc.str,"forceReduction")==0) {
+          forceReduction = 1;
+        }else if (strcmp(ob2c.lc.str,"countDown")==0) {
+          countDown = 1; cdflag = 1;
+          if (needSyz) {
+            warningKan("Kgroebner(): needSyz is automatically turned off.");
+            needSyz = 0;
+          }
+        }else if (strcmp(ob2c.lc.str,"StopDegree")==0) {
+          StopDegree = 0; sdflag = 1;
+          if (needSyz) {
+            warningKan("Kgroebner(): needSyz is automatically turned off.");
+            needSyz = 0;
+          }
+        }else {
+          warningKan("Unknown keyword for options.");
+        }
       }else if (ob2c.tag == Sinteger) {
-	if (cdflag) {
-	  cdflag = 0;
-	  countDown = KopInteger(ob2c);
-	}else if (sdflag) {
-	  sdflag = 0;
-	  StopDegree = KopInteger(ob2c);
-	}
+        if (cdflag) {
+          cdflag = 0;
+          countDown = KopInteger(ob2c);
+        }else if (sdflag) {
+          sdflag = 0;
+          StopDegree = KopInteger(ob2c);
+        }
       }
     }
     break;
   default:
     errorKan1("%s\n","Kgroebner(): [ [polynomials] ] or [[polynomials] [options]].");
   }
-	 
+     
   if (ob1.tag != Sarray) errorKan1("%s\n","Kgroebner(): The argument must be an array. Example: [ [$x-1$ . $x y -2$ .] [$needBack$ $needSyz$ $needInput$]] ");
   ob1New = newObjectArray(getoaSize(ob1));
   for (i=0; i< getoaSize(ob1); i++) {
@@ -165,9 +166,9 @@ struct object ob;
     /* getoa(ob1,i) is poly, now check the homogenization. */
     if (CheckHomogenization) {
       if ((strcmp(F_groebner,"standard")==0) &&
-	  !isHomogenized(KopPOLY(getoa(ob1New,i)))) {
-	fprintf(stderr,"\n%s",KPOLYToString(KopPOLY(getoa(ob1New,i))));
-	errorKan1("%s\n","Kgroebner(): The above polynomial is not homogenized. cf. homogenize.");
+          !isHomogenized(KopPOLY(getoa(ob1New,i)))) {
+        fprintf(stderr,"\n%s",KPOLYToString(KopPOLY(getoa(ob1New,i))));
+        errorKan1("%s\n","Kgroebner(): The above polynomial is not homogenized. cf. homogenize.");
       }
     }
   }
@@ -208,7 +209,7 @@ struct object ob;
       putoa(rob,1,rob3);
       rob4 = newObjectArray(ob1Size);
       for (i=0; i<ob1Size; i++) {
-	putoa(rob4,i,unitVector(i,ob1Size,myring));
+        putoa(rob4,i,unitVector(i,ob1Size,myring));
       }
       putoa(rob,2,rob4);
     }else if (needBack) {
@@ -368,7 +369,7 @@ static struct object unitVector(int pos, int size,stru
 #define INITSIZE 0
 
 struct gradedPolySet *arrayToGradedPolySet(ob)
-struct object ob;
+     struct object ob;
 {
   int n,i,grd,ind;
   POLY f;
@@ -398,8 +399,8 @@ struct object ob;
 
 
 struct object polySetToArray(ps,keepRedundant)
-struct polySet *ps;
-int keepRedundant;
+     struct polySet *ps;
+     int keepRedundant;
 {
   int n,i,j;
   struct object ob;
@@ -425,8 +426,8 @@ int keepRedundant;
 
 
 struct object gradedPolySetToGradedArray(gps,keepRedundant)
-struct gradedPolySet *gps;
-int keepRedundant;
+     struct gradedPolySet *gps;
+     int keepRedundant;
 {
   struct object ob,vec;
   int i;
@@ -443,8 +444,8 @@ int keepRedundant;
 
   
 struct object gradedPolySetToArray(gps,keepRedundant)
-struct gradedPolySet *gps;
-int keepRedundant;
+     struct gradedPolySet *gps;
+     int keepRedundant;
 {
   struct object ob,vec;
   struct polySet *ps;
@@ -459,7 +460,7 @@ int keepRedundant;
       size += ps->size;
     }else{
       for (j=0; j<ps->size; j++) {
-	if (ps->del[j] == 0) ++size;
+        if (ps->del[j] == 0) ++size;
       }
     }
   }
@@ -470,8 +471,8 @@ int keepRedundant;
     ps = gps->polys[i];
     for (j=0; j<ps->size; j++) {
       if (keepRedundant || (ps->del[j] == 0)) {
-	putoa(ob,k,KpoPOLY(ps->g[j]));
-	k++;
+        putoa(ob,k,KpoPOLY(ps->g[j]));
+        k++;
       }
     }
   }
@@ -481,9 +482,9 @@ int keepRedundant;
 
 /* serial == -1  :  It's not in the marix input. */
 struct object syzPolyToArray(size,f,grG)
-int size;
-POLY f;
-struct gradedPolySet *grG;
+     int size;
+     POLY f;
+     struct gradedPolySet *grG;
 {
   struct object ob;
   int i,g0,i0,serial;
@@ -510,7 +511,7 @@ struct gradedPolySet *grG;
 }
 
 struct object getBackwardArray(grG)
-struct gradedPolySet *grG;
+     struct gradedPolySet *grG;
 {
   /* use serial, del.  cf. getBackwardTransformation(). */
   int inputSize,outputSize;
@@ -533,8 +534,8 @@ struct gradedPolySet *grG;
     ps = grG->polys[i];
     for (j=0; j<ps->size; j++) {
       if (ps->del[j] == 0) {
-	putoa(ob,k,syzPolyToArray(inputSize,ps->syz[j]->syz,grG));
-	k++;
+        putoa(ob,k,syzPolyToArray(inputSize,ps->syz[j]->syz,grG));
+        k++;
       }
     }
   }
@@ -543,7 +544,7 @@ struct gradedPolySet *grG;
 
 
 POLY arrayToPOLY(ob)
-struct object ob;
+     struct object ob;
 {
   int size,i;
   struct object f;
@@ -563,15 +564,15 @@ struct object ob;
     if (ff != ZERO) {
       tf = ff->m;
       if (tf->ringp != cr) {
-	n = tf->ringp->n;
-	m = tf->ringp->m;
-	l = tf->ringp->l;
-	c = tf->ringp->c;
-	nn = tf->ringp->nn;
-	mm = tf->ringp->mm;
-	ll = tf->ringp->ll;
-	cc = tf->ringp->cc;
-	cr = tf->ringp;
+        n = tf->ringp->n;
+        m = tf->ringp->m;
+        l = tf->ringp->l;
+        c = tf->ringp->c;
+        nn = tf->ringp->nn;
+        mm = tf->ringp->mm;
+        ll = tf->ringp->ll;
+        cc = tf->ringp->cc;
+        cr = tf->ringp;
       }
       if (n-nn >0) ee = cxx(1,n-1,i,tf->ringp);
       else if (m-mm >0) ee = cxx(1,m-1,i,tf->ringp);
@@ -585,7 +586,7 @@ struct object ob;
 }
 
 struct object POLYToArray(ff)
-POLY ff;
+     POLY ff;
 {
   
   static int nn,mm,ll,cc,n,m,l,c;
@@ -639,7 +640,7 @@ POLY ff;
 }
 
 static int isThereh(f)
-POLY f;
+     POLY f;
 {
   POLY t;
   if (f == 0) return(0);
@@ -652,8 +653,8 @@ POLY f;
 }
 
 struct object homogenizeObject(ob,gradep)
-struct object ob;
-int *gradep;
+     struct object ob;
+     int *gradep;
 {
   struct object rob,ob1;
   int maxg;
@@ -683,6 +684,7 @@ int *gradep;
     rob = newObjectArray(size);
     flag = 0;
     ob1 = getoa(ob,0);
+	if (ob1.tag == Sdollar) return(homogenizeObject_go(ob,gradep));
     ob1 = homogenizeObject(ob1,&gr);
     maxg = gr;
     getoa(rob,0) = ob1;
@@ -690,7 +692,7 @@ int *gradep;
       ob1 = getoa(ob,i);
       ob1 = homogenizeObject(ob1,&gr);
       if (gr > maxg) {
-	maxg = gr;
+        maxg = gr;
       }
       getoa(rob,i) = ob1;
     }
@@ -699,12 +701,12 @@ int *gradep;
       rp = oRingp(rob);
       if (rp == (struct ring *)NULL) rp = CurrentRingp;
       for (i=0; i<size; i++) {
-	gr = oGrade(getoa(rob,i));
-	/**printf("maxg=%d, gr=%d(i=%d) ",maxg,gr,i); fflush(stdout);**/
-	if (maxg > gr) {
-	  f = cdd(1,0,maxg-gr-i,rp); /* h^{maxg-gr-i} */
-	  getoa(rob,i) = KooMult(KpoPOLY(f),getoa(rob,i));
-	}
+        gr = oGrade(getoa(rob,i));
+        /**printf("maxg=%d, gr=%d(i=%d) ",maxg,gr,i); fflush(stdout);**/
+        if (maxg > gr) {
+          f = cdd(1,0,maxg-gr-i,rp); /* h^{maxg-gr-i} */
+          getoa(rob,i) = KooMult(KpoPOLY(f),getoa(rob,i));
+        }
       }
     }
     *gradep = maxg;
@@ -717,8 +719,8 @@ int *gradep;
 }
 
 struct object homogenizeObject_vec(ob,gradep)
-struct object ob;
-int *gradep;
+     struct object ob;
+     int *gradep;
 {
   struct object rob,ob1;
   int maxg;
@@ -744,13 +746,14 @@ int *gradep;
     if (size == 0) {
       errorKan1("%s\n","homogenizeObject_vec() is called for the empty array.");
     }
+	if (getoa(ob,0).tag == Sdollar) return(homogenizeObject_go(ob,gradep));
     rob = newObjectArray(size);
     for (i=0; i<size; i++) {
       ob1 = getoa(ob,i);
       ob1 = homogenizeObject_vec(ob1,&gr);
       if (i==0) maxg = gr;
       else {
-	maxg = (maxg > gr? maxg: gr);
+        maxg = (maxg > gr? maxg: gr);
       }
       putoa(rob,i,ob1);
     }
@@ -763,8 +766,65 @@ int *gradep;
   }
 }
 
+struct object homogenizeObject_go(struct object ob,int *gradep) {
+  int size,i,dssize,j;
+  struct object ob0;
+  struct object ob1;
+  struct object ob2;
+  struct object rob;
+  struct object tob;
+  struct object ob1t;
+  int *ds;
+  POLY f;
+  rob = NullObject;
+  if (ob.tag != Sarray) errorKan1("%s\n","homogenizeObject_go(): Invalid argument data type.");
+
+  size = getoaSize(ob);
+  if (size == 0) errorKan1("%s\n","homogenizeObject_go(): the first argument must be a string.");
+  ob0 = getoa(ob,0);
+  if (ob0.tag != Sdollar) {
+    errorKan1("%s\n","homogenizeObject_go(): the first argument must be a string.");
+  }
+  if (strcmp(KopString(ob0),"degreeShift") == 0) {
+	if (size != 3)
+	  errorKan1("%s\n","homogenizeObject_go(): [(degreeShift) shift-vector obj]");
+	ob1 = getoa(ob,1); ob2 = getoa(ob,2);
+	dssize = getoaSize(ob1);
+	ds = (int *)sGC_malloc(sizeof(int)*(dssize>0?dssize:1));
+	for (i=0; i<dssize; i++) {
+	  ds[i] = objToInteger(getoa(ob1,i));
+	}
+	if (ob2.tag == Spoly) {
+	  f = goHomogenize11(KopPOLY(ob2),ds,dssize,-1);
+	  rob = KpoPOLY(f);
+	}else if (ob2.tag == SuniversalNumber) {
+	  rob = ob2;
+	}else if (ob2.tag == Sarray) {
+	  rob = newObjectArray(getoaSize(ob2));
+	  for (i=0; i<getoaSize(ob2); i++) {
+		tob = newObjectArray(3);
+		ob1t = newObjectArray(dssize);
+		if (getoa(ob2,i).tag == Spoly) {
+		  for (j=0; j<dssize; j++) getoa(ob1t,j) = KpoInteger(0);
+		  for (j=0; j<dssize-i; j++) getoa(ob1t,j) = getoa(ob1,j+i);
+		}else{
+		  ob1t = ob1;
+		}
+		getoa(tob,0) = ob0; getoa(tob,1) = ob1t; getoa(tob,2) = getoa(ob2,i);
+		getoa(rob,i) = homogenizeObject_go(tob,gradep);
+	  }
+	}else{
+	  errorKan1("%s\n","homogenizeObject_go(): invalid object for the third element.");
+	}
+  }else{
+	  errorKan1("%s\n","homogenizeObject_go(): unknown key word.");
+  }
+  return( rob );	
+}
+
+
 struct ring *oRingp(ob)
-struct object ob;
+     struct object ob;
 {
   struct ring *rp,*rptmp;
   int i,size;
@@ -791,7 +851,7 @@ struct object ob;
 }
 
 int oGrade(ob)
-struct object ob;
+     struct object ob;
 {
   int i,size;
   POLY f;
@@ -819,7 +879,7 @@ struct object ob;
 
 
 struct object oPrincipalPart(ob)
-struct object ob;
+     struct object ob;
 {
   POLY f;
   struct object rob;
@@ -835,8 +895,8 @@ struct object ob;
   }
 }
 struct object oInitW(ob,oWeight)
-struct object ob;
-struct object oWeight;
+     struct object ob;
+     struct object oWeight;
 {
   POLY f;
   struct object rob;
@@ -993,10 +1053,20 @@ struct object KvectorToSchreyer_es(struct object obarr
       /*   g = es^i  g */
       g = mpMult_poly(cxx(1,nn,i,rp), g);
       if (!isOrdered(g)) {
-	errorKan1("%s\n","KvectorToSchreyer_es(): given polynomial is not ordered properly by the given Schreyer order.");
+        errorKan1("%s\n","KvectorToSchreyer_es(): given polynomial is not ordered properly by the given Schreyer order.");
       }
       f = ppAdd(f,g);
     }
   }
   return(KpoPOLY(f));
+}
+
+int objToInteger(struct object ob) {
+  if (ob.tag == Sinteger) {
+	return KopInteger(ob);
+  }else if (ob.tag == SuniversalNumber) {
+	return(coeffToInt(KopUniversalNumber(ob)));
+  }else {
+	errorKan1("%s\n","objToInteger(): invalid argument.");
+  }
 }