===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/output.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM/src/kan96xx/Kan/output.c	2005/07/03 11:08:54	1.5
+++ OpenXM/src/kan96xx/Kan/output.c	2020/10/06 11:33:46	1.8
@@ -1,7 +1,8 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/output.c,v 1.4 2003/08/26 12:46:05 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/output.c,v 1.7 2011/10/05 05:46:14 takayama Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -58,6 +59,8 @@ char *POLYToString(f,multSym,brace)
      int brace;
 {
   extern int Wrap;
+  extern int UseDsmall;
+  extern int COutput;
   int i,j,jj,fi;
   int printed = 0;
   int vi; /* index for variables */
@@ -86,7 +89,9 @@ char *POLYToString(f,multSym,brace)
     printed = 1;
     xnames = dnames = (char **)NULL;
   }else{
-    ringp = f->m->ringp; xnames = f->m->ringp->x; dnames = f->m->ringp->D;
+    ringp = f->m->ringp; xnames = f->m->ringp->x; 
+    if (UseDsmall) dnames = f->m->ringp->Dsmall;
+    else dnames = f->m->ringp->D;
     n = ringp->n;
     xout = ringp->outputOrder;
   }
@@ -127,34 +132,67 @@ char *POLYToString(f,multSym,brace)
     for (jj=0; jj<n*2; jj++) {
       j = xout[jj];
       if (j <n) {
-        if (f->m->e[j].x) {
-          vi++;
-          if (vi != 1) putstr(multStr(multSym),&oq);
-          putstr(xnames[j],&oq);
-          if (f->m->e[j].x >= 2) {
-            putstr("^",&oq);
-            putstr(intToString(f->m->e[j].x),&oq);
-          }else if (f->m->e[j].x < 0) {
-            putstr("^(",&oq);
-            putstr(intToString(f->m->e[j].x),&oq);
-            putstr(")",&oq);
-          }
-        }
+		if (COutput) {
+		  if (f->m->e[j].x) {
+			vi++;
+			if (vi != 1) putstr(multStr(multSym),&oq);
+			if (f->m->e[j].x == 1) {
+			  putstr(xnames[j],&oq);
+			} else {
+			  putstr("sm1power(",&oq);
+			  putstr(xnames[j],&oq);
+			  putstr(",",&oq);
+			  putstr(intToString(f->m->e[j].x),&oq);
+			  putstr(")",&oq);
+			}
+		  }
+		}else{
+		  if (f->m->e[j].x) {
+			vi++;
+			if (vi != 1) putstr(multStr(multSym),&oq);
+			putstr(xnames[j],&oq);
+			if (f->m->e[j].x >= 2) {
+			  putstr("^",&oq);
+			  putstr(intToString(f->m->e[j].x),&oq);
+			}else if (f->m->e[j].x < 0) {
+			  putstr("^(",&oq);
+			  putstr(intToString(f->m->e[j].x),&oq);
+			  putstr(")",&oq);
+			}
+		  }
+		}
       }else {
-        j = j-n;  
-        if (f->m->e[j].D) {
-          vi++;
-          if (vi != 1) putstr(multStr(multSym),&oq);
-          putstr(dnames[j],&oq);
-          if (f->m->e[j].D >= 2) {
-            putstr("^",&oq);
-            putstr(intToString(f->m->e[j].D),&oq);
-          }else if (f->m->e[j].D < 0) {
-            putstr("^(",&oq);
-            putstr(intToString(f->m->e[j].D),&oq);
-            putstr(")",&oq);
-          }
-        }
+		if (COutput) {
+		  j = j-n;  
+		  if (f->m->e[j].D) {
+			vi++;
+			if (vi != 1) putstr(multStr(multSym),&oq);
+			if (f->m->e[j].D == 1) {
+			  putstr(dnames[j],&oq);
+			}else {
+			  if (f->m->e[j].D) putstr("sm1power(",&oq);
+			  putstr(dnames[j],&oq);
+			  putstr(",",&oq);
+			  putstr(intToString(f->m->e[j].D),&oq);
+			  putstr(")",&oq);
+			}
+		  }
+		}else{
+		  j = j-n;  
+		  if (f->m->e[j].D) {
+			vi++;
+			if (vi != 1) putstr(multStr(multSym),&oq);
+			putstr(dnames[j],&oq);
+			if (f->m->e[j].D >= 2) {
+			  putstr("^",&oq);
+			  putstr(intToString(f->m->e[j].D),&oq);
+			}else if (f->m->e[j].D < 0) {
+			  putstr("^(",&oq);
+			  putstr(intToString(f->m->e[j].D),&oq);
+			  putstr(")",&oq);
+			}
+		  }
+		}
       }
     }
     fi++;
@@ -191,7 +229,7 @@ char *KPOLYToString(f)
   return(POLYToString(f,OutputStyle,0));
 }
 
-isOne(c)
+int isOne(c)
      struct coeff *c;
 {
   switch(c->tag) {
@@ -209,7 +247,7 @@ isOne(c)
     errorCoeff("not yet");
   }
 }
-isMinusOne(c)
+int isMinusOne(c)
      struct coeff *c;
 {
   switch(c->tag) {
@@ -227,7 +265,7 @@ isMinusOne(c)
   }
 
 }
-isNegative(c)
+int isNegative(c)
      struct coeff *c;
 {
   switch(c->tag) {
@@ -246,7 +284,7 @@ isNegative(c)
   }
 }
 
-isConstant(f)
+int isConstant(f)
      POLY f;
 {
   int i;
@@ -276,4 +314,17 @@ void errorOutput(s)
 {
   fprintf(stderr,"Error(output.c):%s\n",s);
   exit(15);
+}
+
+char **makeDsmall(char **dvars,int n) {
+  char **ans;
+  int i;
+  ans = (char **) sGC_malloc(sizeof(char *)*(n+1));
+  for (i=0; i<n; i++) {
+	ans[i] =  (char *) sGC_malloc(sizeof(char)*(strlen(dvars[i])+1));
+	strcpy(ans[i],dvars[i]);
+	ans[i][0] = tolower(ans[i][0]);
+  }
+  ans[n] = NULL;
+  return ans;
 }