=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/sp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- OpenXM_contrib2/asir2000/lib/sp 2006/06/23 08:57:47 1.15 +++ OpenXM_contrib2/asir2000/lib/sp 2010/07/14 04:48:14 1.16 @@ -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/sp,v 1.14 2005/08/18 23:35:20 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.15 2006/06/23 08:57:47 noro Exp $ */ /* sp : functions related to algebraic number fields @@ -60,7 +60,7 @@ #include "defs.h" extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$ -extern Ord$ +extern SpOrd$ extern USE_PARI_FACTOR$ /* gen_sp can handle non-monic poly */ @@ -846,7 +846,7 @@ def cr_gcda(P1,P2) break; if ( J != length(DL) ) continue; - Ord = 2; NOSUGAR = 1; + SpOrd = 2; NOSUGAR = 1; T = ag_mod(G1 % MOD,G2 % MOD,ML,VL,MOD); if ( dp_gr_print() ) print("."); @@ -1060,7 +1060,7 @@ def ag_mod(F1,F2,D,VL,MOD) VL = cons(V,VL); B = append([F1,F2],D); N = length(VL); while ( 1 ) { FLAGS = dp_gr_flags(); dp_gr_flags(["Reverse",1,"NoSugar",1]); - G = dp_gr_mod_main(B,VL,0,MOD,Ord); + G = dp_gr_mod_main(B,VL,0,MOD,SpOrd); dp_gr_flags(FLAGS); if ( length(G) == 1 ) return 1; @@ -1294,9 +1294,9 @@ def ag_mod_single6(F1,F2,D,MOD) def inverse_by_gr_mod(C,D,MOD) { - Ord = 2; + SpOrd = 2; dp_gr_flags(["NoSugar",1]); - G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,Ord); + G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,SpOrd); dp_gr_flags(["NoSugar",0]); if ( length(G) == 1 ) return 1;