===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/order.c,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -p -r1.6 -r1.12
--- OpenXM/src/kan96xx/Kan/order.c	2002/09/08 10:49:50	1.6
+++ OpenXM/src/kan96xx/Kan/order.c	2004/05/15 12:00:48	1.12
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.5 2002/02/09 06:21:02 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/order.c,v 1.11 2004/05/13 06:30:51 takayama Exp $ */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -180,7 +180,21 @@ void showRing(level,ringp) 
     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) {
@@ -336,6 +350,9 @@ int mmLarger_matrix(ff,gg)
   int in2;
   int *from, *to;
   int omsize;
+  int dssize;
+  int dsn;
+  int *degreeShiftVector;
   
   if (ff == POLYNULL ) {
     if (gg == POLYNULL) return( 2 );
@@ -353,6 +370,10 @@ int mmLarger_matrix(ff,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++) {
@@ -369,6 +390,15 @@ int mmLarger_matrix(ff,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);
   }
@@ -647,7 +677,227 @@ int mmLarger_tower3(POLY f,POLY g,struct object *gbLis
   else if (fv > gv) return(0); /* modifiable */
   else if (fv < gv) return(1); /* modifiable */
 }
-  
+
+static struct object auxPruneZeroRow(struct object ob) {
+  int i,m,size;
+  struct object obt;
+  struct object rob;
+  m = getoaSize(ob);
+  size=0;
+  for (i=0; i<m; i++) {
+	obt = getoa(ob,i);
+	if (getoaSize(obt) != 0) size++;
+  }
+  if (size == m) return ob;
+  rob = newObjectArray(size);
+  for (i=0, size=0; i<m; i++) {
+	obt = getoa(ob,i);
+	if (getoaSize(obt) != 0) {
+	  putoa(rob,size,obt); size++;
+	}
+  }
+  return rob;
+}  
+static struct object oRingToOXringStructure_long(struct ring *ringp)
+{
+  struct object rob,ob2;
+  struct object obMat;
+  struct object obV;
+  struct object obShift;
+  struct object obt;
+  char **TransX; char **TransD;
+  int n,i,j,m,p,nonzero;
+  int *om;
+  n = ringp->n;
+  m = ringp->orderMatrixSize;
+  om = ringp->order;
+  TransX = ringp->x; TransD = ringp->D;
+  if (m<=0) m = 1;
+  /*test: (1). getRing /rr set rr (oxRingStructure) dc  */
+  obMat = newObjectArray(m);
+  for (i=0; i<m; i++) {
+    nonzero = 0;
+    for (j=0; j<2*n; j++) {
+      if (om[2*n*i+j] != 0) nonzero++;
+    }
+    ob2 = newObjectArray(nonzero*2);
+    nonzero=0;
+    for (j=0; j<2*n; j++) {
+      /* fprintf(stderr,"%d, ",nonzero); */
+      if (om[2*n*i+j] != 0) {
+        if (j < n) {
+          putoa(ob2,nonzero,KpoString(TransX[n-1-j])); nonzero++;
+        }else{
+          putoa(ob2,nonzero,KpoString(TransD[n-1-(j-n)])); nonzero++;
+        }
+        putoa(ob2,nonzero,KpoUniversalNumber(newUniversalNumber(om[2*n*i+j]))); nonzero++;
+      }
+    }
+    /* printObject(ob2,0,stderr); fprintf(stderr,".\n"); */
+    putoa(obMat,i,ob2);
+  }
+  obMat = auxPruneZeroRow(obMat);
+  /* printObject(obMat,0,stderr); */
+
+  obV = newObjectArray(2*n);
+  for (i=0; i<n; i++) putoa(obV,i,KpoString(TransX[n-1-i]));
+  for (i=0; i<n; i++) putoa(obV,i+n,KpoString(TransD[n-1-i]));
+  /* printObject(obV,0,stderr); */
+
+  if (ringp->degreeShiftSize) {
+    /*test:
+    [(x) ring_of_differential_operators [[(x)]] weight_vector 0
+      [(weightedHomogenization) 1 (degreeShift) [[1 2 1]]] ] define_ring ;
+     (1). getRing /rr set rr (oxRingStructure) dc message
+    */
+    obShift = newObjectArray(ringp->degreeShiftN);
+    for (i=0; i<ringp->degreeShiftN; i++) {
+      obt = newObjectArray(ringp->degreeShiftSize);
+      for (j=0; j< ringp->degreeShiftSize; j++) {
+        putoa(obt,j,KpoUniversalNumber(newUniversalNumber(ringp->degreeShift[i*(ringp->degreeShiftSize)+j])));
+      }
+      putoa(obShift,i,obt);
+    }
+    /* printObject(obShift,0,stderr); */
+  }
+
+  p = 0;
+  if (ringp->degreeShiftSize) {
+    rob = newObjectArray(3);
+    obt = newObjectArray(2);
+    putoa(obt,0,KpoString("degreeShift"));
+    putoa(obt,1,obShift);
+    putoa(rob,p, obt); p++;
+  }else {
+    rob = newObjectArray(2);
+  }
+
+  obt = newObjectArray(2);
+  putoa(obt,0,KpoString("v"));
+  putoa(obt,1,obV);
+  putoa(rob,p, obt); p++;
+
+  obt = newObjectArray(2);
+  putoa(obt,0,KpoString("order"));
+  putoa(obt,1,obMat);
+  putoa(rob,p, obt); p++;
+
+  return(rob);
+}
+static int auxEffectiveVar(int idx,int n) {
+  int x;
+  if (idx < n) x=1; else x=0;
+  if (x) {
+	if ((idx >= 1) && (idx < n-1)) return 1;
+	else return 0;
+  }else{
+	if ( 1 <= idx-n )  return 1;
+	else return 0;
+  }
+}
+/*test: 
+   [(x,y) ring_of_differential_operators [[(Dx) 1 (Dy)  1]]
+    weight_vector 0] define_ring
+    (x). getRing (oxRingStructure) dc ::
+ */
+static struct object oRingToOXringStructure_short(struct ring *ringp)
+{
+  struct object rob,ob2;
+  struct object obMat;
+  struct object obV;
+  struct object obShift;
+  struct object obt;
+  char **TransX; char **TransD;
+  int n,i,j,m,p,nonzero;
+  int *om;
+  n = ringp->n;
+  m = ringp->orderMatrixSize;
+  om = ringp->order;
+  TransX = ringp->x; TransD = ringp->D;
+  if (m<=0) m = 1;
+  /*test: (1). getRing /rr set rr (oxRingStructure) dc  */
+  obMat = newObjectArray(m);
+  for (i=0; i<m; i++) {
+    nonzero = 0;
+    for (j=0; j<2*n; j++) {
+      if ((om[2*n*i+j] != 0) && auxEffectiveVar(j,n)) nonzero++;
+    }
+    ob2 = newObjectArray(nonzero*2);
+    nonzero=0;
+    for (j=0; j<2*n; j++) {
+      /* fprintf(stderr,"%d, ",nonzero); */
+      if ((om[2*n*i+j] != 0) && auxEffectiveVar(j,n)) {
+        if (j < n) {
+          putoa(ob2,nonzero,KpoString(TransX[n-1-j])); nonzero++;
+        }else{
+          putoa(ob2,nonzero,KpoString(TransD[n-1-(j-n)])); nonzero++;
+        }
+        putoa(ob2,nonzero,KpoUniversalNumber(newUniversalNumber(om[2*n*i+j]))); nonzero++;
+      }
+    }
+    /* printObject(ob2,0,stderr); fprintf(stderr,".\n"); */
+    putoa(obMat,i,ob2);
+  }
+  obMat = auxPruneZeroRow(obMat);
+  /* printObject(obMat,0,stderr); */
+
+  obV = newObjectArray(2*n-3);
+  for (i=0; i<n-2; i++) putoa(obV,i,KpoString(TransX[n-1-i-1]));
+  for (i=0; i<n-1; i++) putoa(obV,i+n-2,KpoString(TransD[n-1-i-1]));
+  /* printObject(obV,0,stderr); */
+
+  if (ringp->degreeShiftSize) {
+    /*test:
+    [(x) ring_of_differential_operators [[(x)]] weight_vector 0
+      [(weightedHomogenization) 1 (degreeShift) [[1 2 1]]] ] define_ring ;
+     (1). getRing /rr set rr (oxRingStructure) dc message
+    */
+    obShift = newObjectArray(ringp->degreeShiftN);
+    for (i=0; i<ringp->degreeShiftN; i++) {
+      obt = newObjectArray(ringp->degreeShiftSize);
+      for (j=0; j< ringp->degreeShiftSize; j++) {
+        putoa(obt,j,KpoUniversalNumber(newUniversalNumber(ringp->degreeShift[i*(ringp->degreeShiftSize)+j])));
+      }
+      putoa(obShift,i,obt);
+    }
+    /* printObject(obShift,0,stderr); */
+  }
+
+  p = 0;
+  if (ringp->degreeShiftSize) {
+    rob = newObjectArray(3);
+    obt = newObjectArray(2);
+    putoa(obt,0,KpoString("degreeShift"));
+    putoa(obt,1,obShift);
+    putoa(rob,p, obt); p++;
+  }else {
+    rob = newObjectArray(2);
+  }
+
+  obt = newObjectArray(2);
+  putoa(obt,0,KpoString("v"));
+  putoa(obt,1,obV);
+  putoa(rob,p, obt); p++;
+
+  obt = newObjectArray(2);
+  putoa(obt,0,KpoString("order"));
+  putoa(obt,1,obMat);
+  putoa(rob,p, obt); p++;
+
+  return(rob);
+}
+struct object oRingToOXringStructure(struct ring *ringp)
+{
+  struct object rob;
+  struct object tob;
+  rob = newObjectArray(2);
+  tob = oRingToOXringStructure_short(ringp);
+  putoa(rob,0,tob);
+  tob = oRingToOXringStructure_long(ringp);
+  putoa(rob,1,tob);
+  return(rob);
+}
+
 static void warningOrder(s)
      char *s;
 {