===================================================================
RCS file: /home/cvs/OpenXM/src/asir-contrib/testing/noro/grcrt.rr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- OpenXM/src/asir-contrib/testing/noro/grcrt.rr	2015/03/16 06:55:15	1.1
+++ OpenXM/src/asir-contrib/testing/noro/grcrt.rr	2016/09/12 03:37:05	1.2
@@ -416,8 +416,8 @@ def iso_eq_mod(Mod,UseNZ)
 {
   B = GB_B; V = GB_V;
 
-  /* V = [c1,bb,aa,b,a], W = [1,3,2,3,1] */
-  W = [1,3,2,3,1];
+  /* V = [c1,bb,aa,b,a], W = [1,3,2,3,2,1] */
+  W = [1,3,2,3,2,1];
   dp_set_weight(W);
   G1 = nd_f4(B,V,Mod,[[0,1],[0,4]]);
   V1 = cdr(V);
@@ -445,7 +445,7 @@ def iso_eq_mod(Mod,UseNZ)
 
 def iso_eq_gentrace(B,V,Mod)
 {
-  W = [1,3,2,3,1];
+  W = [1,3,2,3,2,1];
 
   dp_set_weight(W);
   N1 = nd_f4(B,V,Mod,[[0,1],[0,4]]|dp=1,nora=1,gentrace=1);
@@ -469,7 +469,7 @@ def iso_eq_gentrace(B,V,Mod)
 def iso_eq_mod(Mod)
 {
   V = [c1,bb,aa,b,a];
-  W = [1,3,2,3,1];
+  W = [1,3,2,3,2,1];
 
   dp_set_weight(W);
   if ( GB_N1 )
@@ -578,7 +578,7 @@ T1 = time(); IRTime += (T1[0]-T0[0])+(T1[1]-T0[1]);
 def iso_c1eq_mod(Mod)
 {
   V = [c1,bb,aa,b,a];
-  W = [1,3,2,3,1];
+  W = [1,3,2,3,2,1];
 
   dp_set_weight(W);
   if ( GB_N1 )
@@ -610,7 +610,7 @@ def iso_c1eq_d2(L)
 	NProc = length(Proc);
 	CRTime = 0; IRTime = 0;
 	/* gentrace */
-    W = [1,3,2,3,1];
+    W = [1,3,2,3,2,1];
     dp_set_weight(W);
     N1 = nd_f4(B,V,lprime(0),[[0,1],[0,4]]|dp=1,nora=1,gentrace=1);
 	map(ox_rpc,Proc,"noro_grcrt.store_bvn3",B,V,N1,0,0);
@@ -657,7 +657,7 @@ T1 = time(); IRTime += (T1[0]-T0[0])+(T1[1]-T0[1]);
 
 def iso_eq_gentrace2(B,V,Mod)
 {
-  Wt = [1,1,3,2,3,1];
+  Wt = [1,1,3,2,3,2,1];
   Vt = cons(t,V);
   dp_set_weight(Wt);
   D = res(x,x^3+a*x+b,3*x^2+a);
@@ -684,7 +684,7 @@ def iso_eq_mod2(Mod)
 {
   V = [c1,bb,aa,b,a];
   Vt = cons(t,V);
-  Wt = [1,1,3,2,3,1];
+  Wt = [1,1,3,2,3,2,1];
   dp_set_weight(Wt);
   D = res(x,x^3+a*x+b,3*x^2+a);
   if ( GB_N1 )
@@ -781,7 +781,7 @@ T1 = time(); IRTime += (T1[0]-T0[0])+(T1[1]-T0[1]);
 
 def iso_sat_gentrace(B,V,Mod)
 {
-  Wt = [1,1,3,2,3,1];
+  Wt = [1,1,3,2,3,2,1];
   Vt = cons(t,V);
   dp_set_weight(Wt);
   D = res(x,x^3+a*x+b,3*x^2+a);
@@ -793,7 +793,7 @@ def iso_sat_mod(Mod)
 {
   V = [c1,bb,aa,b,a];
   Vt = cons(t,V);
-  Wt = [1,1,3,2,3,1];
+  Wt = [1,1,3,2,3,2,1];
   dp_set_weight(Wt);
   D = res(x,x^3+a*x+b,3*x^2+a);
   if ( GB_N1 )