=================================================================== RCS file: /home/cvs/OpenXM/src/asir-contrib/testing/noro/de.rr,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- OpenXM/src/asir-contrib/testing/noro/de.rr 2009/12/02 04:38:48 1.2 +++ OpenXM/src/asir-contrib/testing/noro/de.rr 2014/09/05 11:55:19 1.3 @@ -137,7 +137,7 @@ def sort_lex_dec(B,V) { dp_ord(2); B = map(dp_ptod,B,V); - B = vtol(qsort(ltov(B),comp_by_ht)); + B = vtol(qsort(ltov(B),de.comp_by_ht)); B = map(dp_dtop,B,V); return reverse(B); } @@ -146,7 +146,7 @@ def sort_lex_inc(B,V) { dp_ord(2); B = map(dp_ptod,B,V); - B = vtol(qsort(ltov(B),comp_by_ht)); + B = vtol(qsort(ltov(B),de.comp_by_ht)); B = map(dp_dtop,B,V); return B; } @@ -221,7 +221,7 @@ def intdpltoratdpl(G,Mod,M) R = cons(T,R); } R = reverse(R); - return vtol(qsort(newvect(length(R),R),comp_by_ht)); + return vtol(qsort(newvect(length(R),R),de.comp_by_ht)); } def intdptoratdp(F,Mod,M) @@ -262,7 +262,7 @@ def monic_gb(G,V,O,P) dp_ord(O); setmod(P); D = map(dp_ptod,G,V); D = map(dp_monic_mod,D,P); - D = vtol(qsort(newvect(length(D),D),comp_by_ht)); + D = vtol(qsort(newvect(length(D),D),de.comp_by_ht)); return [D,map(dp_ht,D)]; }