=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/gr,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- OpenXM_contrib2/asir2000/lib/gr 2001/09/06 00:24:07 1.10 +++ OpenXM_contrib2/asir2000/lib/gr 2001/09/28 00:41:16 1.11 @@ -45,7 +45,7 @@ * 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.9 2001/09/05 08:09:10 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/lib/gr,v 1.10 2001/09/06 00:24:07 noro Exp $ */ extern INIT_COUNT,ITOR_FAIL$ extern REMOTE_MATRIX,REMOTE_NF,REMOTE_VARS$ @@ -1330,7 +1330,33 @@ def dgr(G,V,O) Win = "nonhomo"; Lose = P1; } else { - Win = "nhomo"; + Win = "homo"; + Lose = P0; + } + ox_reset(Lose); + return [Win,R]; +} + +/* competitive Gbase computation : F4 vs. Bucbberger */ +/* P : process list */ + +def dgrf4mod(G,V,M,O) +{ + P = getopt(proc); + if ( type(P) == -1 ) + return dp_f4_mod_main(G,V,M,O); + P0 = P[0]; P1 = P[1]; P = [P0,P1]; + map(ox_reset,P); + ox_cmo_rpc(P0,"dp_f4_mod_main",G,V,M,O); + ox_cmo_rpc(P1,"dp_gr_mod_main",G,V,0,M,O); + map(ox_push_cmd,P,262); /* 262 = OX_popCMO */ + F = ox_select(P); + R = ox_get(F[0]); + if ( F[0] == P0 ) { + Win = "F4"; + Lose = P1; + } else { + Win = "Buchberger"; Lose = P0; } ox_reset(Lose);