=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/primdec_mod,v retrieving revision 1.12 retrieving revision 1.14 diff -u -p -r1.12 -r1.14 --- OpenXM_contrib2/asir2000/lib/primdec_mod 2003/10/20 00:58:47 1.12 +++ OpenXM_contrib2/asir2000/lib/primdec_mod 2004/07/30 02:24:11 1.14 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/lib/primdec_mod,v 1.11 2003/08/05 05:56:19 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/lib/primdec_mod,v 1.13 2004/02/09 23:37:12 noro Exp $ */ extern Hom,GBTime$ extern DIVLIST,INTIDEAL,ORIGINAL,ORIGINALDIMENSION,STOP,Trials,REM$ @@ -7,8 +7,8 @@ extern BuchbergerMinipoly,PartialDecompByLex,ParallelM extern B_Win,D_Win$ extern COMMONCHECK_SF,CID_SF$ -if (!module_definedp("fff")) load("fff") $$ -if (!module_definedp("gr")) load("gr") $$ +if (!module_definedp("fff")) load("fff"); else $ +if (!module_definedp("gr")) load("gr"); else $ module primdec_mod $ /* Empty for now. It will be used in a future. */ endmodule $ @@ -1978,7 +1978,8 @@ def contraction(P,V,W) YSet=setminus(W,V); Ord1 = [[Ord,length(V)],[0,length(YSet)]]; - GP1 = dp_gr_f_main(P,W,Hom,Ord1); + W1 = append(V,YSet); + GP1 = dp_gr_f_main(P,W1,Hom,Ord1); Factor = extcont_factor(GP1,V,Ord); for ( F = 1, T = Factor; T != []; T = cdr(T) )