===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/order.c,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/kan96xx/Kan/order.c	2000/06/09 08:02:02	1.3
+++ OpenXM/src/kan96xx/Kan/order.c	2003/06/26 13:00:11	1.8
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.2 2000/01/16 07:55:39 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.7 2003/06/26 08:14:46 takayama Exp $ */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -21,15 +21,15 @@ static void warningOrder(char *s);
 static void errorOrder(char *s);
 
 void setOrderByMatrix(order,n,c,l,omsize)
-int order[];
-int n,c,l,omsize;
+     int order[];
+     int n,c,l,omsize;
 {
   int i,j;
   int *Order;
   extern struct ring *CurrentRingp;
 
   switch_mmLarger("default");
-    /* q-case */
+  /* q-case */
   if ( l-c > 0) {
     switch_mmLarger("qmatrix");
   }
@@ -46,8 +46,8 @@ int n,c,l,omsize;
 }
   
 void showRing(level,ringp) 
-int level;
-struct ring *ringp;
+     int level;
+     struct ring *ringp;
 {
   int i,j;
   FILE *fp;
@@ -58,6 +58,10 @@ struct ring *ringp;
   int P;
   char *mtype;
   extern char *F_isSameComponent;
+  POLY f;
+  POLY fx;
+  POLY fd;
+  POLY rf;
   fp = stdout;
 
   N=ringp->n; M = ringp->m; L = ringp->l; C = ringp->c;
@@ -80,8 +84,10 @@ struct ring *ringp;
     fprintf(fp,"\n");
     fprintf(fp,"where ");
     for (i=M; i<N; i++) {
-      fprintf(fp," %s %s - %s %s = 1, ",TransD[i],TransX[i],
-	                                TransX[i],TransD[i]);
+      fx = cxx(1,i,1,ringp); fd = cdd(1,i,1,ringp);
+	  rf = ppSub(ppMult(fd,fx),ppMult(fx,fd));
+      fprintf(fp," %s %s - %s %s = %s, ",TransD[i],TransX[i],
+              TransX[i],TransD[i],POLYToString(rf,'*',0));
     }
     fprintf(fp,"\n\n");
   }
@@ -92,9 +98,11 @@ struct ring *ringp;
     fprintf(fp,"\n");
     fprintf(fp,"where ");
     for (i=L; i<M; i++) {
-      fprintf(fp," %s %s - %s %s = %s, ",TransD[i],TransX[i],
-	                                 TransX[i],TransD[i],
-	                                 TransD[i]);
+      fprintf(fp," %s %s - %s %s = ",TransD[i],TransX[i],
+              TransX[i],TransD[i]);
+      f=ppSub(ppMult(cdd(1,i,1,ringp),cxx(1,i,1,ringp)),
+              ppMult(cxx(1,i,1,ringp),cdd(1,i,1,ringp)));
+      fprintf(fp," %s, ",POLYToString(f,'*',0));
     }
     fprintf(fp,"\n\n");
   }
@@ -106,8 +114,8 @@ struct ring *ringp;
     fprintf(fp,"where ");
     for (i=C; i<L; i++) {
       fprintf(fp," %s %s = %s %s %s, ",TransD[i],TransX[i],
-	                               TransX[0],
-	                               TransX[i],TransD[i]);
+              TransX[0],
+              TransX[i],TransD[i]);
     }
     fprintf(fp,"\n\n");
   }
@@ -166,13 +174,27 @@ struct ring *ringp;
     mtype = "unknown";
   }
   fprintf(fp,"Multiplication function --%s(%xH).\n",
-	  mtype,(unsigned int) ringp->multiplication);
+          mtype,(unsigned int) ringp->multiplication);
   if (ringp->schreyer) {
     fprintf(fp,"schreyer=1, gbListTower=");
     printObjectList((struct object *)(ringp->gbListTower));
     fprintf(fp,"\n");
   }
-
+  if (ringp->degreeShiftSize) {
+    fprintf(fp,"degreeShift vector (N=%d,Size=%d)= \n[\n",ringp->degreeShiftN,ringp->degreeShiftSize);
+    {
+      int i,j;
+      for (i=0; i<ringp->degreeShiftN; i++) {
+        fprintf(fp," [");
+        for (j=0; j< ringp->degreeShiftSize; j++) {
+          fprintf(fp," %d ",ringp->degreeShift[i*(ringp->degreeShiftSize)+j]);
+        }
+        fprintf(fp,"]\n");
+      }
+    }
+    fprintf(fp,"]\n");
+  }
+  fprintf(fp,"---  weight vectors ---\n");
   if (level) printOrder(ringp);
   
   if (ringp->next != (struct ring *)NULL) {
@@ -203,7 +225,7 @@ if (isD(i))  D_{itod(i)}
 */
 
 void printOrder(ringp)
-struct ring *ringp;
+     struct ring *ringp;
 {
   int i,j;
   FILE *fp;
@@ -245,9 +267,9 @@ struct ring *ringp;
   fprintf(fp,"\n");
 
   /* print D: differential     DE: differential, should be eliminated
-           E: difference
-	   Q: q-difference
-	   C: commutative
+     E: difference
+     Q: q-difference
+     C: commutative
   */
   if (strcmp(F_isSameComponent,"x")== 0 || strcmp(F_isSameComponent,"xd")==0) {
     for (i=0; i<N; i++) {
@@ -316,7 +338,7 @@ struct object oGetOrderMatrix(struct ring *ringp)
 
 
 int mmLarger_matrix(ff,gg)
-POLY ff; POLY gg;
+     POLY ff; POLY gg;
 {
   int exp[2*N0]; /* exponents */
   int i,k;
@@ -328,6 +350,9 @@ POLY ff; POLY gg;
   int in2;
   int *from, *to;
   int omsize;
+  int dssize;
+  int dsn;
+  int *degreeShiftVector;
   
   if (ff == POLYNULL ) {
     if (gg == POLYNULL) return( 2 );
@@ -345,6 +370,10 @@ POLY ff; POLY gg;
   from = rp->from;
   to = rp->to;
   omsize = rp->orderMatrixSize;
+  if (dssize = rp->degreeShiftSize) {
+	degreeShiftVector = rp->degreeShift;  /* Note. 2003.06.26 */
+	dsn = rp->degreeShiftN;
+  }
  
   flag = 1;
   for (i=N-1,k=0; i>=0; i--,k++) {
@@ -361,6 +390,15 @@ POLY ff; POLY gg;
     sum = 0; in2 = i*2*N;
     /* for (k=0; k<2*N; k++) sum += exp[k]*Order[in2+k]; */
     for (k=from[i]; k<to[i]; k++) sum += exp[k]*Order[in2+k];
+    if (dssize && ( i < dsn)) { /* Note, 2003.06.26 */
+      if ((f->e[N-1].x < dssize) && (f->e[N-1].x >= 0) &&
+          (g->e[N-1].x < dssize) && (g->e[N-1].x >= 0)) {
+        sum += degreeShiftVector[i*dssize+ (f->e[N-1].x)]
+              -degreeShiftVector[i*dssize+ (g->e[N-1].x)];
+      }else{
+        warningOrder("Size mismatch in the degree shift vector. It is ignored.");
+      }
+    }
     if (sum > 0) return(1);
     if (sum < 0) return(0);
   }
@@ -369,7 +407,7 @@ POLY ff; POLY gg;
 
 /* This should be used in case of q */
 int mmLarger_qmatrix(ff,gg)
-POLY ff; POLY gg;
+     POLY ff; POLY gg;
 {
   int exp[2*N0]; /* exponents */
   int i,k;
@@ -418,8 +456,8 @@ POLY ff; POLY gg;
 
 /* x(N-1)>x(N-2)>....>D(N-1)>....>D(0) */
 mmLarger_pureLexicographic(f,g)
-POLY f;
-POLY g;
+     POLY f;
+     POLY g;
 {
   int i,r;
   int n;
@@ -458,7 +496,7 @@ POLY g;
 
 
 void setFromTo(ringp)
-struct ring *ringp;
+     struct ring *ringp;
 {
   int n;
   int i,j,oasize;
@@ -474,14 +512,14 @@ struct ring *ringp;
     ringp->from[i] = 0; ringp->to[i] = n;
     for (j=0; j<n; j++) {
       if (ringp->order[i*n+j] != 0) {
-	ringp->from[i] = j;
-	break;
+        ringp->from[i] = j;
+        break;
       }
     }
     for (j=n-1; j>=0; j--) {
       if (ringp->order[i*n+j] != 0) {
-	ringp->to[i] = j+1;
-	break;
+        ringp->to[i] = j+1;
+        break;
       }
     }
   }
@@ -490,7 +528,7 @@ struct ring *ringp;
 /* It ignores h and should be used with mmLarger_tower */
 /* cf. mmLarger_matrix.  h always must be checked at last. */
 static int mmLarger_matrix_schreyer(ff,gg)
-POLY ff; POLY gg;
+     POLY ff; POLY gg;
 {
   int exp[2*N0]; /* exponents */
   int i,k;
@@ -558,16 +596,16 @@ int mmLarger_tower(POLY f,POLY g) {
   }
   if (!(f->m->ringp->schreyer) || !(g->m->ringp->schreyer))
     return(mmLarger_matrix(f,g));
-    /* modifiable: mmLarger_qmatrix */
+  /* modifiable: mmLarger_qmatrix */
   gbList = (struct object *)(g->m->ringp->gbListTower);
   if (gbList == NULL) return(mmLarger_matrix(f,g));
-                      /* modifiable: mmLarger_qmatrix */
+  /* modifiable: mmLarger_qmatrix */
   if (gbList->tag != Slist) {
     warningOrder("mmLarger_tower(): gbList must be in Slist.\n");
     return(1);
   }
   if (klength(gbList) ==0) return(mmLarger_matrix(f,g));
-                      /* modifiable: mmLarger_qmatrix */
+  /* modifiable: mmLarger_qmatrix */
 
   r = mmLarger_tower3(f,g,gbList);
   /* printf("mmLarger_tower3(%s,%s) -->  %d\n",POLYToString(head(f),'*',1),POLYToString(head(g),'*',1),r); */
@@ -598,7 +636,7 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis
   n = f->m->ringp->n;
   nn = f->m->ringp->nn;
   /* critical and modifiable */  /* m e_u > m e_v <==> m g_u > m g_v */
-                                 /*                  or equal and u < v */  
+  /*                  or equal and u < v */  
   fv = f->m->e[nn].x ; /* extract component (vector) number of f! */
   gv = g->m->e[nn].x ;
   if (fv == gv) { /* They have the same component number. */
@@ -606,13 +644,13 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis
   }
 
   if (gbList == NULL) return(mmLarger_matrix_schreyer(f,g));
-                      /* modifiable: mmLarger_qmatrix */
+  /* modifiable: mmLarger_qmatrix */
   if (gbList->tag != Slist) {
     warningOrder("mmLarger_tower(): gbList must be in Slist.\n");
     return(1);
   }
   if (klength(gbList) ==0) return(mmLarger_matrix(f,g));
-                      /* modifiable: mmLarger_qmatrix */
+  /* modifiable: mmLarger_qmatrix */
   gb = car(gbList);  /* each entry must be monomials */
   if (gb.tag != Sarray) {
     warningOrder("mmLarger_tower3(): car(gbList) must be an array.\n");
@@ -626,7 +664,7 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis
   if (fv >= t || gv >= t) {
     warningOrder("mmLarger_tower3(): incompatible input and gbList.\n");
     printf("Length of gb is %d, f is %s, g is %s\n",t,KPOLYToString(f),
-	   KPOLYToString(g));
+           KPOLYToString(g));
     KSexecuteString(" show_ring ");
     return(1);
   }
@@ -641,13 +679,13 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis
 }
   
 static void warningOrder(s)
-char *s;
+     char *s;
 {
   fprintf(stderr,"Warning in order.c: %s\n",s);
 }
 
 static void errorOrder(s)
-char *s;
+     char *s;
 {
   fprintf(stderr,"order.c: %s\n",s);
   exit(14);