===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/bfct,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM_contrib2/asir2000/lib/bfct	2000/06/05 04:59:34	1.1
+++ OpenXM_contrib2/asir2000/lib/bfct	2000/12/11 02:00:42	1.5
@@ -1,4 +1,52 @@
-/* $OpenXM$ */
+/*
+ * 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/bfct,v 1.4 2000/12/08 08:26:09 noro Exp $ 
+*/
 /* requires 'primdec' */
 
 /* annihilating ideal of F^s ? */
@@ -15,9 +63,8 @@ def ann(F)
 	for ( I = 0; I < N; I++ ) {
 		B = cons(DV[I]+y1*diff(F,V[I])*dt,B);
 	}
-	ctrl("do_weyl",1);
 	dp_nelim(2);
-	G0 = dp_gr_main(B,append(W,DW),0,0,6);
+	G0 = dp_weyl_gr_main(B,append(W,DW),0,0,6);
 	G1 = [];
 	for ( T = G0; T != []; T = cdr(T) ) {
 		E = car(T); VL = vars(E);
@@ -27,7 +74,6 @@ def ann(F)
 	G2 = map(subst,G1,dt,1);
 	G3 = map(b_subst,G2,t);
 	G4 = map(subst,G3,t,-1-s);
-	ctrl("do_weyl",0);
 	return G4;
 }
 
@@ -37,7 +83,6 @@ def bfct(F)
 {
 	G4 = ann(F);
 
-	ctrl("do_weyl",1);
 	V = vars(F);
 	N = length(V);
 	for ( I = N-1, DV = []; I >= 0; I-- )
@@ -63,13 +108,24 @@ def bfct(F)
 		M[I+2][I] = 1;
 #endif
 	V1 = cons(s,V); DV1 = cons(ds,DV);
-	G5 = dp_gr_main(cons(F,G4),append(V1,DV1),0,0,M);
+	dp_nelim(0);
+/*	G4 = dp_weyl_gr_main(G4,append(V1,DV1),0,0,10); */
+	for ( PrimeIndex = 0; ; PrimeIndex++ ) {
+		Prime = lprime(PrimeIndex);
+		dp_nelim(0); /* XXX */
+		Success = dp_weyl_gr_main(cons(F,G4),append(V1,DV1),0,Prime,10);
+		if ( !Success )
+			continue;
+		dp_nelim(N+1);
+		G5 = dp_weyl_gr_main(cons(F,G4),append(V1,DV1),0,-Prime,10);
+		if ( G5 )
+			break;
+	}
 	for ( T = G5, G6 = []; T != []; T = cdr(T) ) {
 		E = car(T);
 		if ( intersection(vars(E),DV1) == [] )
 			G6 = cons(E,G6);
 	}
-	ctrl("do_weyl",0);
 	G6_0 = remove_zero(map(z_subst,G6,V));
 	F0 = flatmf(cdr(fctr(dp_gr_main(G6_0,[s],0,0,0)[0])));
 	for ( T = F0, BF = []; T != []; T = cdr(T) ) {