===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/pexpr.c,v
retrieving revision 1.5
retrieving revision 1.21
diff -u -p -r1.5 -r1.21
--- OpenXM_contrib2/asir2000/io/pexpr.c	2000/11/08 08:02:51	1.5
+++ OpenXM_contrib2/asir2000/io/pexpr.c	2003/02/14 22:29:15	1.21
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.4 2000/08/22 05:04:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/pexpr.c,v 1.20 2002/09/11 07:23:27 noro Exp $
 */
 #include "ca.h"
 #include "al.h"
@@ -64,6 +64,9 @@ FILE *asir_out;
 char DFORMAT[BUFSIZ];
 int hex_output;
 int fortran_output;
+int double_output;
+int real_digit;
+int print_quote;
 
 #define TAIL
 #define PUTS(s) fputs(s,OUT)
@@ -76,7 +79,7 @@ int fortran_output;
 #define PRINTV printv
 #define PRINTEXPR printexpr
 #define PRINTNUM printnum
-#define PRINTP printp
+#define PRINTP asir_printp
 #define PRINTR printr
 #define PRINTLIST printlist
 #define PRINTVECT printvect
@@ -88,6 +91,7 @@ int fortran_output;
 #define PRINTGF2MAT printgf2mat
 #define PRINTGFMMAT printgfmmat
 #define PRINTBYTEARRAY printbytearray
+#define PRINTQUOTE printquote
 #define PRINTERR printerr
 #define PRINTLF printlf
 #define PRINTLOP printlop
@@ -95,6 +99,8 @@ int fortran_output;
 #define PRINTEOP printeop
 #define PRINTQOP printqop
 #define PRINTUP printup
+#define PRINTUM printum
+#define PRINTSF printsf
 #endif
 
 #ifdef SPRINT
@@ -103,6 +109,9 @@ static char *buf;
 extern char DFORMAT[BUFSIZ];
 extern int hex_output;
 extern int fortran_output;
+extern int double_output;
+extern int real_digit;
+extern int print_quote;
 
 #define TAIL while ( *OUT ) OUT++;
 #define PUTS(s) strcat(OUT,s)
@@ -115,7 +124,7 @@ extern int fortran_output;
 #define PRINTV sprintv
 #define PRINTEXPR sprintexpr
 #define PRINTNUM sprintnum
-#define PRINTP sprintp
+#define PRINTP asir_sprintp
 #define PRINTR sprintr
 #define PRINTLIST sprintlist
 #define PRINTVECT sprintvect
@@ -127,6 +136,7 @@ extern int fortran_output;
 #define PRINTGF2MAT sprintgf2mat
 #define PRINTGFMMAT sprintgfmmat
 #define PRINTBYTEARRAY sprintbytearray
+#define PRINTQUOTE sprintquote
 #define PRINTERR sprinterr
 #define PRINTLF sprintlf
 #define PRINTLOP sprintlop
@@ -134,6 +144,8 @@ extern int fortran_output;
 #define PRINTEOP sprinteop
 #define PRINTQOP sprintqop
 #define PRINTUP sprintup
+#define PRINTUM sprintum
+#define PRINTSF sprintsf
 #endif
 
 void PRINTEXPR();
@@ -152,11 +164,19 @@ void PRINTUI();
 void PRINTGF2MAT();
 void PRINTGFMMAT();
 void PRINTBYTEARRAY();
+void PRINTQUOTE();
 void PRINTERR();
 void PRINTCPLX();
 void PRINTLM();
 void PRINTLF();
 void PRINTUP2();
+void PRINTUP();
+void PRINTUM();
+void PRINTFOP();
+void PRINTEOP();
+void PRINTLOP();
+void PRINTQOP();
+void PRINTSF();
 
 #ifdef FPRINT
 void output_init() {
@@ -168,7 +188,12 @@ int mmono(p)
 P p;
 {
 	if ( NUM(p) )
+#if defined(INTERVAL)
+		if ( NID(p) != N_IP && NID(p) != N_IntervalDouble && NID(p) != N_IntervalQuad && NID(p) != N_IntervalBigFloat
+			&& compnum(CO,(Num)p,0) < 0 ) 
+#else
 		if ( compnum(CO,(Num)p,0) < 0 ) 
+#endif
 			return ( 1 );
 		else
 			return ( 0 );
@@ -178,11 +203,13 @@ P p;
 		return (mmono(COEF(DC(p))));
 }
 
-#if PARI
+#if defined(PARI)
 void printbf(a)
 BF a;
 {
-	sor(a->body,'g',-1,0);
+	void sor();
+
+	sor(a->body,double_output ? 'f' : 'g',-1,0);
 }
 #endif
 #endif
@@ -194,14 +221,27 @@ char *s;
 	s[0] = 0; buf = s;
 }
 
-#if PARI
+#if defined(PARI)
+#include "genpari.h"
+
+void myoutbrute(g)
+GEN g;
+{
+	bruteall(g,'f',-1,1);
+}
+
 void sprintbf(a)
 BF a;
 {
 	char *str;
 	char *GENtostr();
+	char *GENtostr0();
 
-	str = GENtostr(a->body);
+	if ( double_output ) {
+		str = GENtostr0(a->body,myoutbrute);
+	} else {
+		str = GENtostr(a->body);
+	}
 	TAIL PRINTF(OUT,"%s",str);
 	free(str);
 }
@@ -250,6 +290,8 @@ Obj p;
 			PRINTGFMMAT(vl,(GFMMAT)p); break;
 		case O_BYTEARRAY:
 			PRINTBYTEARRAY(vl,(BYTEARRAY)p); break;
+		case O_QUOTE:
+			PRINTQUOTE(vl,(QUOTE)p); break;
 		default:
 			break;
 	}
@@ -286,9 +328,45 @@ N n;
 	}
 }
 
+#if defined(FPRINT)
+#if defined(ITVDEBUG)
+void printbin(double z)
+{
+	int	i, j, mask;
+	union {
+		double  x;
+		char    c[8];
+	} a;
+
+	a.x = z;
+	for(i=7;i>=0;i--) {
+		mask = 0x80;
+		for(j=0;j<8;j++) {
+			if (a.c[i] & mask) fprintf(stderr,"1");
+			else fprintf(stderr,"0");
+			mask >>= 1;
+		}
+	}
+	fprintf(stderr,"\n");
+}
+#endif
+#endif
+
+#if defined(FPRINT)
+#if 0
+int	printmode = PRINTF_E;
+#else
+int	printmode = PRINTF_G;
+#endif
+#else
+extern int printmode;
+#endif
+
 void PRINTNUM(q)
 Num q;
 {
+	char real_format[20];
+
 	if ( !q ) {
 		PUTS("0");
 		return;
@@ -303,15 +381,66 @@ Num q;
 			}
 			break;
 		case N_R:
-			TAIL PRINTF(OUT,"%g",BDY((Real)q));
+			switch (printmode) {
+				case PRINTF_E:
+#if defined(INTERVAL)
+				case MID_PRINTF_E:
+#endif
+					TAIL PRINTF(OUT,"%.16e",BDY((Real)q));
+					break;
+				case PRINTF_G:
+#if defined(INTERVAL)
+				case MID_PRINTF_G:
+#endif
+				default:
+					if ( real_digit ) {
+						sprintf(real_format,
+							double_output?"%%.%df":"%%.%dg",real_digit);
+						TAIL PRINTF(OUT,real_format,BDY((Real)q));
+					} else {
+						TAIL PRINTF(OUT,double_output?"%f":"%g",BDY((Real)q));
+					}
+					break;
+			}
 			break;
 		case N_A:
 			PUTS("("); PRINTR(ALG,(R)BDY((Alg)q)); PUTS(")");
 			break;
-#if PARI
+#if defined(PARI)
 		case N_B:
 			PRINTBF((BF)q); break;
 #endif
+#if defined(INTERVAL)
+		case N_IP:
+		case N_IntervalBigFloat:
+			PUTS("[");
+			PRINTNUM(INF((Itv)q));
+			PUTS(",");
+			PRINTNUM(SUP((Itv)q));
+			PUTS("]");
+			break;
+		case N_IntervalDouble:
+			switch (printmode) {
+				case PRINTF_E:
+					TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((IntervalDouble)q),SUP((IntervalDouble)q));
+#if defined(ITVDEBUG)
+					printbin(INF((IntervalDouble)q));
+					printbin(SUP((IntervalDouble)q));
+#endif
+					break;
+				case MID_PRINTF_G:
+					TAIL PRINTF(OUT, "<%g,%g>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5);
+					break;
+				case MID_PRINTF_E:
+					TAIL PRINTF(OUT, "<%.16e,%.16e>", (SUP((IntervalDouble)q)+INF((IntervalDouble)q))*0.5,(SUP((IntervalDouble)q)-INF((IntervalDouble)q))*0.5);
+					break;
+				case PRINTF_G:
+				default:
+					TAIL PRINTF(OUT, "[%g,%g]",INF((IntervalDouble)q),SUP((IntervalDouble)q));
+				break;
+			}
+			break;
+#endif
 		case N_C:
 			PRINTCPLX((C)q); break;
 		case N_M:
@@ -327,6 +456,12 @@ Num q;
 		case N_GFPN:
 			PRINTUP((UP)(((GFPN)q)->body));
 			break;
+		case N_GFS:
+			TAIL PRINTF(OUT,"@_%d",CONT((GFS)q));
+			break;
+		case N_GFSN:
+			PRINTUM(BDY((GFSN)q));
+			break;
 	}
 }
 
@@ -337,7 +472,13 @@ C a;
 	if ( a->r )
 		PRINTNUM(a->r);
 	if ( a->i ) {
+#if defined(INTERVAL)
+		if ( a->r && ((compnum(0,a->i,0) > 0)
+			|| NID(a->i) == N_IP || NID(a->i) == N_IntervalDouble
+			|| NID(a->i) == N_IntervalQuad || NID(a->i) == N_IntervalBigFloat) )
+#else
 		if ( a->r && (compnum(0,a->i,0) > 0) )
+#endif
 			PUTS("+");
 		PRINTNUM(a->i); PUTS("*@i");
 	}
@@ -414,8 +555,8 @@ V v;
 	else if ( (vid)v->attr == V_PF ) {
 		pf = ((PFINS)v->priv)->pf; ad = ((PFINS)v->priv)->ad;
 		if ( !strcmp(NAME(pf),"pow") ) {
-			PUTS("("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
-			PRINTR(vl,(R)ad[1].arg); PUTS(")");
+			PUTS("(("); PRINTR(vl,(R)ad[0].arg); PUTS(")"); PRINTHAT; PUTS("(");
+			PRINTR(vl,(R)ad[1].arg); PUTS("))");
 		} else if ( !pf->argc ) {
 			TAIL PRINTF(OUT,"%s",NAME(pf));
 		} else {
@@ -604,7 +745,6 @@ VL vl;
 GFMMAT mat;
 {
 	int row,col,i,j;
-	unsigned int t;
 	unsigned int **b;
 
 	row = mat->row;
@@ -624,7 +764,6 @@ VL vl;
 BYTEARRAY array;
 {
 	int len,i;
-	unsigned int t;
 	unsigned char *b;
 
 	len = array->len;
@@ -637,6 +776,20 @@ BYTEARRAY array;
 	PUTS("|");
 }
 
+void PRINTQUOTE(vl,quote)
+VL vl;
+QUOTE quote;
+{
+	LIST list;
+
+	if ( print_quote ) {
+		fnodetotree(BDY(quote),&list);
+		PRINTEXPR(vl,(Obj)list);
+	} else {
+		PUTS("<...quoted...>");
+	}
+}
+
 void PRINTERR(vl,e)
 VL vl;
 ERR e;
@@ -703,7 +856,7 @@ F f;
 	}
 }
 
-PRINTFOP(vl,f)
+void PRINTFOP(vl,f)
 VL vl;
 F f;
 {
@@ -718,7 +871,7 @@ F f;
 	}
 }
 
-PRINTEOP(vl,f)
+void PRINTEOP(vl,f)
 VL vl;
 F f;
 {
@@ -745,7 +898,7 @@ F f;
 	PUTS(")");
 }
 
-PRINTLOP(vl,f)
+void PRINTLOP(vl,f)
 VL vl;
 F f;
 {
@@ -771,7 +924,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FPL(f)); PUTS(op); PUTS("0");
 }
 
-PRINTQOP(vl,f)
+void PRINTQOP(vl,f)
 VL vl;
 F f;
 {
@@ -782,7 +935,7 @@ F f;
 	PRINTEXPR(vl,(Obj)FQMAT(f)); PUTS(")");
 }
 
-PRINTUP(n)
+void PRINTUP(n)
 UP n;
 {
 	int i,d;
@@ -813,5 +966,49 @@ UP n;
 			}
 		}
 		PUTS(")");
+	}
+}
+
+void PRINTUM(n)
+UM n;
+{
+	int i,d;
+
+	if ( !n )
+		PUTS("0");
+	else if ( !n->d )
+		PRINTSF(n->c[0]);
+	else {
+		d = n->d;
+		PUTS("(");
+		if ( !d ) {
+			PRINTSF(n->c[d]);
+		} else if ( d == 1 ) {
+			PRINTSF(n->c[d]);
+			PUTS("*@s");
+		} else {
+			PRINTSF(n->c[d]);
+			PUTS("*@s"); PRINTHAT; TAIL PRINTF(OUT,"%d",d);
+		}
+		for ( i = d-1; i >= 0; i-- ) {
+			if ( n->c[i] ) {
+				PUTS("+("); PRINTSF(n->c[i]); PUTS(")");
+				if ( i >= 2 ) {
+					PUTS("*@s"); PRINTHAT; TAIL PRINTF(OUT,"%d",i);
+				} else if ( i == 1 )
+					PUTS("*@s");
+			}
+		}
+		PUTS(")");
+	}
+}
+
+void PRINTSF(i)
+unsigned int i;
+{
+	if ( !i ) {
+		PUTS("0");
+	} else {
+		TAIL PRINTF(OUT,"@_%d",IFTOF(i));
 	}
 }