=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/gr,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM_contrib2/asir2000/lib/gr 2000/01/11 06:43:37 1.2 +++ OpenXM_contrib2/asir2000/lib/gr 2000/09/07 23:59:55 1.7 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/lib/gr,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/lib/gr,v 1.6 2000/08/22 05:04:22 noro Exp $ +*/ extern INIT_COUNT,ITOR_FAIL$ extern REMOTE_MATRIX,REMOTE_NF,REMOTE_VARS$ @@ -206,7 +254,8 @@ def tolex_gsl_main(G0,V,O,W,NFL,NPOSV,GM,M,MB) R += B[0][K]*TERMS[K]; LCM *= B[1]; SL = cons(cons(V1,[R,LCM]),SL); - print(["DN",B[1]]); + if ( dp_gr_print() ) + print(["DN",B[1]]); } return SL; } @@ -217,7 +266,8 @@ def hen_ttob_gsl(LHS,RHS,TERMS,M) L1 = idiv(LCM,LDN); R1 = idiv(LCM,RDN); T0 = time()[0]; S = henleq_gsl(RHS[0],LHS[0]*L1,M); - print(["henleq_gsl",time()[0]-T0]); + if ( dp_gr_print() ) + print(["henleq_gsl",time()[0]-T0]); N = length(TERMS); return [S[0],S[1]*R1]; } @@ -282,7 +332,8 @@ def tolex_main(V,O,NF,GM,M,MB) U += B[0][I-1]*S[I]; R = ptozp(U); SL = cons(R,SL); - print(["DN",B[1]]); + if ( dp_gr_print() ) + print(["DN",B[1]]); } return SL; } @@ -351,7 +402,8 @@ def gennf(G,TL,V,O,V0,FLAG) if ( dp_gr_print() ) print(".",2); } - print(""); + if ( dp_gr_print() ) + print(""); TTAB = time()[0]-T0; } @@ -506,7 +558,8 @@ def tolexm_main(PS,HL,V,W,M,FLAG) print(".",2); UTAB[I] = [MB[I],dp_nf_mod(GI,U*dp_mod(MB[I],M,[]),PS,1,M)]; } - print(""); + if ( dp_gr_print() ) + print(""); T = dp_mod(dp_ptod(dp_dtop(dp_vtoe(D),W),V),M,[]); H = G = [[T,T]]; DL = []; G2 = []; @@ -1086,7 +1139,8 @@ def henleq_gsl(L,B,MOD) if ( !COUNT ) COUNT = 1; MOD2 = idiv(MOD,2); - for ( I = 0, C = BB, X = 0, PK = 1, CCC = 0, ITOR_FAIL = -1; ; + X = newvect(size(AA)[0]); + for ( I = 0, C = BB, PK = 1, CCC = 0, ITOR_FAIL = -1; ; I++, PK *= MOD ) { if ( zerovector(C) ) if ( zerovector(RESTA*X+RESTB) ) { @@ -1306,5 +1360,77 @@ def r_ttob_gsl(L,M) def get_matrix() { REMOTE_MATRIX; +} + +extern NFArray$ + +/* + * HL = [[c,i,m,d],...] + * if c != 0 + * g = 0 + * g = (c*g + m*gi)/d + * ... + * finally compare g with NF + * if g == NF then NFArray[NFIndex] = g + * + * if c = 0 then HL consists of single history [0,i,0,0], + * which means that dehomogenization of NFArray[i] should be + * eqall to NF. + */ + +def check_trace(NF,NFIndex,HL) +{ + if ( !car(HL)[0] ) { + /* dehomogenization */ + DH = dp_dehomo(NFArray[car(HL)[1]]); + if ( NF == DH ) { + realloc_NFArray(NFIndex); + NFArray[NFIndex] = NF; + return 0; + } else + error("check_trace(dehomo)"); + } + + for ( G = 0, T = HL; T != []; T = cdr(T) ) { + H = car(T); + + Coeff = H[0]; + Index = H[1]; + Monomial = H[2]; + Denominator = H[3]; + + Reducer = NFArray[Index]; + G = (Coeff*G+Monomial*Reducer)/Denominator; + } + if ( NF == G ) { + realloc_NFArray(NFIndex); + NFArray[NFIndex] = NF; + return 0; + } else + error("check_trace"); +} + +/* + * realloc NFArray so that it can hold * an element as NFArray[Ind]. + */ + +def realloc_NFArray(Ind) +{ + if ( Ind == size(NFArray)[0] ) { + New = newvect(Ind + 100); + for ( I = 0; I < Ind; I++ ) + New[I] = NFArray[I]; + NFArray = New; + } +} + +/* + * create NFArray and initialize it by List. + */ + +def register_input(List) +{ + Len = length(List); + NFArray = newvect(Len+100,List); } end$