=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/spexpr.c,v retrieving revision 1.2 retrieving revision 1.13 diff -u -p -r1.2 -r1.13 --- OpenXM_contrib2/asir2000/io/spexpr.c 2000/02/07 03:14:39 1.2 +++ OpenXM_contrib2/asir2000/io/spexpr.c 2001/04/20 02:34:23 1.13 @@ -1,4 +1,51 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/spexpr.c,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * 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/spexpr.c,v 1.12 2001/03/15 05:52:12 noro Exp $ +*/ #include "ca.h" #include "al.h" #include "parse.h" @@ -40,6 +87,8 @@ int fortran_output; #define PRINTUI printui #define PRINTGF2MAT printgf2mat #define PRINTGFMMAT printgfmmat +#define PRINTBYTEARRAY printbytearray +#define PRINTQUOTE printquote #define PRINTERR printerr #define PRINTLF printlf #define PRINTLOP printlop @@ -55,6 +104,8 @@ static char *buf; extern char DFORMAT[BUFSIZ]; extern int hex_output; extern int fortran_output; +extern int double_output; +extern int real_digit; #define TAIL while ( *OUT ) OUT++; #define PUTS(s) strcat(OUT,s) @@ -78,6 +129,8 @@ extern int fortran_output; #define PRINTUI sprintui #define PRINTGF2MAT sprintgf2mat #define PRINTGFMMAT sprintgfmmat +#define PRINTBYTEARRAY sprintbytearray +#define PRINTQUOTE sprintquote #define PRINTERR sprinterr #define PRINTLF sprintlf #define PRINTLOP sprintlop @@ -102,6 +155,8 @@ void PRINTDP(); void PRINTUI(); void PRINTGF2MAT(); void PRINTGFMMAT(); +void PRINTBYTEARRAY(); +void PRINTQUOTE(); void PRINTERR(); void PRINTCPLX(); void PRINTLM(); @@ -118,7 +173,11 @@ int mmono(p) P p; { if ( NUM(p) ) +#if defined(INTERVAL) + if ( NID(p) != N_IP && compnum(CO,(Num)p,0) < 0 ) +#else if ( compnum(CO,(Num)p,0) < 0 ) +#endif return ( 1 ); else return ( 0 ); @@ -132,7 +191,7 @@ P p; void printbf(a) BF a; { - sor(a->body,'g',-1,0); + sor(a->body,double_output ? 'f' : 'g',-1,0); } #endif #endif @@ -145,13 +204,26 @@ char *s; } #if 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); } @@ -198,6 +270,10 @@ Obj p; PRINTLF(vl,(F)p); break; case O_GFMMAT: PRINTGFMMAT(vl,(GFMMAT)p); break; + case O_BYTEARRAY: + PRINTBYTEARRAY(vl,(BYTEARRAY)p); break; + case O_QUOTE: + PRINTQUOTE(vl,(QUOTE)p); break; default: break; } @@ -234,9 +310,13 @@ N n; } } +extern int printmode; + void PRINTNUM(q) Num q; { + char real_format[20]; + if ( !q ) { PUTS("0"); return; @@ -251,7 +331,27 @@ 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,"%.15e",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(")"); @@ -260,6 +360,37 @@ Num q; case N_B: PRINTBF((BF)q); break; #endif +#if defined(INTERVAL) + case N_IP: + case N_IF: + PUTS("["); + PRINTNUM(INF((Itv)q)); + PUTS(","); + PRINTNUM(SUP((Itv)q)); + PUTS("]"); + break; + case N_ID: + switch (printmode) { + case PRINTF_E: + TAIL PRINTF(OUT, "[%.16e,%.16e]",INF((ItvD)q),SUP((ItvD)q)); +#if defined(ITVDEBUG) + printbin(INF((ItvD)q)); + printbin(SUP((ItvD)q)); +#endif + break; + case MID_PRINTF_G: + TAIL PRINTF(OUT, "<%g,%g>", (SUP((ItvD)q)+INF((ItvD)q))*0.5,(SUP((ItvD)q)-INF((ItvD)q))*0.5); + break; + case MID_PRINTF_E: + TAIL PRINTF(OUT, "<%.16e,%.16e>", (SUP((ItvD)q)+INF((ItvD)q))*0.5,(SUP((ItvD)q)-INF((ItvD)q))*0.5); + break; + case PRINTF_G: + default: + TAIL PRINTF(OUT, "[%g,%g]",INF((ItvD)q),SUP((ItvD)q)); + break; + } + break; +#endif case N_C: PRINTCPLX((C)q); break; case N_M: @@ -275,6 +406,8 @@ Num q; case N_GFPN: PRINTUP((UP)(((GFPN)q)->body)); break; + case N_GFS: + TAIL PRINTF(OUT,"@_%d",CONT((GFS)q)); break; } } @@ -565,6 +698,31 @@ GFMMAT mat; } PUTS("]\n"); } +} + +void PRINTBYTEARRAY(vl,array) +VL vl; +BYTEARRAY array; +{ + int len,i; + unsigned int t; + unsigned char *b; + + len = array->len; + b = array->body; + PUTS("|"); + for ( i = 0; i < len-1; i++ ) { + TAIL PRINTF(OUT,"%02x ",(unsigned int)b[i]); + } + TAIL PRINTF(OUT,"%02x",(unsigned int)b[i]); + PUTS("|"); +} + +void PRINTQUOTE(vl,quote) +VL vl; +QUOTE quote; +{ + PUTS("<...quoted...>"); } void PRINTERR(vl,e)