=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/primdec,v retrieving revision 1.1.1.1 retrieving revision 1.8 diff -u -p -r1.1.1.1 -r1.8 --- OpenXM_contrib2/asir2000/lib/primdec 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/lib/primdec 2006/10/03 08:16:55 1.8 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM/src/asir99/lib/primdec,v 1.1.1.1 1999/11/10 08:12:30 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/primdec,v 1.7 2006/02/24 01:15:56 noro Exp $ +*/ /* Primary decomposition & Radical decomposition program */ /* written by T.Shimoyama, Fujitsu Lab. Date: 1995.10.12 */ @@ -16,8 +64,12 @@ COMMONCHECK if 1 : redundancy check by intersection (i SELECTFLAG selection strategy of separators (0 -- 3) */ -if (vtype(minipoly) != 3) load("gr")$$ +if (!module_definedp("gr")) load("gr")$ else {}$ +module primdec $ + /* Empty for now. It will be used in a future. */ +endmodule$ + #define GR(R,F,V,O) T2=newvect(4,time());R=dp_gr_main(F,V,0,0,O);GRTIME+=newvect(4,time())-T2; #define HGRM(R,F,V,O) T2=newvect(4,time());R=dp_gr_main(F,V,1,1,O);GRTIME+=newvect(4,time())-T2; #define NF(R,IN,F,G,O) T2=newvect(4,time());R=dp_nf(IN,F,G,O);NFTIME+=newvect(4,time())-T2; @@ -249,9 +301,10 @@ def primadec_main(F,REMS,H,VL) def isolated(IP,F,GF,RA,H,SC,VL) { T0 = newvect(4,time()); - if ( RA[0] == "begin" ) + if ( RA[0] == "begin" ) { PD = primedec_main([RA[1]],VL); - else if ( RA[0] == "ext" || RA[0] == "sep" ) { + PD = map(dp_gr_main,PD,VL,0,1,PRIMEORD); /* XXX */ + } else if ( RA[0] == "ext" || RA[0] == "sep" ) { if ( RA[0] == "sep" ) T = prime_irred(idealsav(RA[1]),VL); else @@ -404,11 +457,17 @@ def extraction(GF,Pr,VL) V = minalgdep(Pr,VL,PRIMEORD); U = listminus(VL,V); V0 = append(V,U); +#if 0 + /* This may be a bug. GF is not a GB w.r.t the elimination order */ if ( V0 != VL ) { ORD = [[TMPORD1,length(V)],[TMPORD2,length(U)]]; GR(G,GF,V0,ORD); } else G = GF; +#else + ORD = [[TMPORD1,length(V)],[TMPORD2,length(U)]]; + GR(G,GF,V0,ORD); +#endif dp_ord(TMPORD1); for (LL = [],HC = 1,I = 0; I < length(G); I++) LL = append(LL,cdr(fctr(dp_hc(dp_ptod(G[I],V))))); @@ -1335,8 +1394,8 @@ def zraddec(F,X) /* contraction from V to X */ def radcont(Q,V,X) { - dp_ord(irem(PRIMEORD,3)); for (R=[],I=length(Q)-1;I>=0;I--) { + dp_ord(irem(PRIMEORD,3)); G=Q[I]; for (E=1,J=0;J