===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/order.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM/src/kan96xx/Kan/order.c	1999/10/08 02:12:01	1.1
+++ OpenXM/src/kan96xx/Kan/order.c	2002/09/08 10:49:50	1.6
@@ -1,3 +1,4 @@
+/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.5 2002/02/09 06:21:02 takayama Exp $ */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -20,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");
   }
@@ -45,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;
@@ -57,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;
@@ -79,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");
   }
@@ -91,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");
   }
@@ -105,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");
   }
@@ -165,7 +174,7 @@ 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));
@@ -202,7 +211,7 @@ if (isD(i))  D_{itod(i)}
 */
 
 void printOrder(ringp)
-struct ring *ringp;
+     struct ring *ringp;
 {
   int i,j;
   FILE *fp;
@@ -244,9 +253,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++) {
@@ -315,7 +324,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;
@@ -368,7 +377,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;
@@ -417,8 +426,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;
@@ -457,7 +466,7 @@ POLY g;
 
 
 void setFromTo(ringp)
-struct ring *ringp;
+     struct ring *ringp;
 {
   int n;
   int i,j,oasize;
@@ -473,14 +482,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;
       }
     }
   }
@@ -489,7 +498,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;
@@ -557,16 +566,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); */
@@ -597,7 +606,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. */
@@ -605,13 +614,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");
@@ -625,7 +634,8 @@ 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);
   }
   /* mpMult_poly is too expensive to call. @@@*/
@@ -639,13 +649,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);