===================================================================
RCS file: /home/cvs/OpenXM/src/asir-contrib/testing/noro/ndbf.rr,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM/src/asir-contrib/testing/noro/ndbf.rr	2010/04/28 05:58:43	1.10
+++ OpenXM/src/asir-contrib/testing/noro/ndbf.rr	2010/07/12 07:20:03	1.17
@@ -1,10 +1,11 @@
+/* $OpenXM: OpenXM/src/asir-contrib/testing/noro/ndbf.rr,v 1.16 2010/07/12 07:01:04 noro Exp $ */
 /* requires 'primdec' */
 
 #define TMP_H hhhhhhhh
 #define TMP_S ssssssss
 #define TMP_DS dssssssss
-#define TMP_T t
-#define TMP_DT dt
+#define TMP_T tttttttt
+#define TMP_DT dtttttttt
 #define TMP_Y1 yyyyyyyy1
 #define TMP_DY1 dyyyyyyyy1
 #define TMP_Y2 yyyyyyyy2
@@ -44,9 +45,15 @@ localf ideal_intersection$
 
 def bfunction(F)
 {
+	if ( member(s,vars(F)) )
+		error("ann : the variable 's' is reserved.");
+	/* F -> F/Fcont */
+	F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;
+
 	if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;
 	if ( type(Vord=getopt(vord)) == -1 || type(Vord) != 4 ) Vord = 0;
 	if ( type(Wt=getopt(weight)) == -1 ) Wt = 0;
+	if ( type(Op=getopt(op)) == -1 ) Op = 0;
 	L = in_ww(F|weight=Wt,heuristic=Heu,vord=Vord);
 	Indata = L[0]; AllData = L[1]; VData = L[2];
 	GIN = Indata[0]; VDV = Indata[1]; WVDV = AllData[4];
@@ -54,7 +61,34 @@ def bfunction(F)
 	dp_set_weight(W);
 	B = weyl_minipoly(GIN,VDV,0,WVDV);
 	dp_set_weight(0);	
-	return subst(B,s,-s-1);
+	if ( !Op ) return subst(B,s,-s-1);
+
+	V0 = VData[0]; DV0 = VData[1]; T = VData[2]; DT = VData[3];
+	BPT = weyl_subst(B,T*DT,VDV);
+
+	/* computation using G0,GIN0,VDV0 */
+	G0 = AllData[0]; GIN0 = AllData[1]; VDV0 = AllData[2]; WtV0 = AllData[5];
+	dp_set_weight(WtV0); dp_ord(0);
+	PS = map(dp_ptod,GIN0,VDV0); Len = length(PS);
+	for ( I = Len-1, Ind = []; I >= 0; I-- ) Ind = cons(I,Ind);
+	/* QR = [D,M,Coef] */
+	Ax = 1;
+	AxBPT = dp_ptod(Ax*BPT,VDV0);
+	QR = weyl_nf_quo(Ind,AxBPT,1,PS);
+	if ( !weyl_nf_quo_check(AxBPT,PS,QR) ) 
+		error("bfunction : invalid quotient");
+	if ( QR[0] ) error("bfunction : invalid quotient");
+	Den = QR[1]; Coef = QR[2];
+	for ( I = 0, R = Den*AxBPT; I < Len; I++ )
+		R -= dp_weyl_mul(Coef[I],dp_ptod(G0[I],VDV0));
+	R = dp_dtop(R,VDV0);
+	CR = conv_tdt(R,F,V0,DV0,T,DT);
+
+	dp_set_weight(0);
+	Cont = cont(CR); CR /= Cont; 
+	Cont *= dn(Fcont); Den *= nm(Fcont);
+	Gcd = igcd(Den,Cont);
+	return [subst(B,s,-s-1),(Cont*CR)/(Den*Ax)];
 }
 
 /*
@@ -265,8 +299,13 @@ def ann(F)
 {
 	if ( member(s,vars(F)) )
 		error("ann : the variable 's' is reserved.");
+	if ( type(Vord=getopt(vord)) == -1 ) Vord = 0;
 	F = ptozp(F);
 	V = vars(F);
+	if ( Vord ) {
+		Param = setminus(V,Vord);
+		V = Vord;
+	}
 	N = length(V);
 	D = newvect(N);
 	if ( type(Wt=getopt(weight)) == -1 )
@@ -507,7 +546,7 @@ def ann_fa(F,A)
 		B = car(S);
 		for ( R = []; B != []; B = cdr(B) )
 			if ( H = car(car(B)) )
-				R = cons(H,R);
+				R = cons(ptozp(H),R);
 	} else {
 		/* colon method */
 		for ( I = 0; I < D; I++ )
@@ -1229,6 +1268,9 @@ def replace_var(V,X,Y)
 
 def action_on_gfs(P,V,GFS)
 {
+	for ( T = V, DV = []; T != []; T = cdr(T) )
+		DV = cons(strtov("d"+rtostr(car(T))),DV);
+	V = append(append(V,[s]),reverse(cons(ds,DV)));
 	DP = dp_ptod(P,V);	
 	N = length(V)/2;
 	for ( I = N-1, V0 = []; I >= 0; I-- )
@@ -1375,6 +1417,8 @@ def weyl_ideal_quotient(B,F,VDV)
 
 def bf_strat(F)
 {
+	if ( member(s,vars(F)) )
+		error("ann : the variable 's' is reserved.");
 	dp_ord(0);
 	T0 = time();
 	if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;
@@ -1528,6 +1572,8 @@ def bf_strat_stage3(L)
 
 def bf_local(F,P)
 {
+	if ( member(s,vars(F)) )
+		error("ann : the variable 's' is reserved.");
 	/* F -> F/Fcont */
 	F1 = ptozp(F); Fcont = sdiv(F,F1); F = F1;
 	if ( type(Heu=getopt(heuristic)) == -1 ) Heu = 0;