===================================================================
RCS file: /home/cvs/OpenXM/src/asir-contrib/packages/sample/contiguity,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- OpenXM/src/asir-contrib/packages/sample/contiguity	2000/01/22 11:20:00	1.2
+++ OpenXM/src/asir-contrib/packages/sample/contiguity	2000/01/24 10:44:34	1.3
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/asir-contrib/packages/sample/contiguity,v 1.1 2000/01/21 10:39:44 takayama Exp $ */
+/* $OpenXM: OpenXM/src/asir-contrib/packages/sample/contiguity,v 1.2 2000/01/22 11:20:00 takayama Exp $ */
 
 /* contiguity */
 
@@ -23,10 +23,10 @@ def contiguity_eliminated(G) {
 def contiguity_f4_a_bf() {
    V = [x,y,a,b,c,cp];
    W = [[dx,1,dy,1,x,1,y,1]];
-   G = sm1_gb([[dx*(x*dx+c-1)-(x*dx+y*dy+a)*(x*dx+y*dy+b),
-                dy*(y*dy+cp-1)-(x*dx+y*dy+a)*(x*dx+y*dy+b),
-                x*dx+y*dy+a],V,W]);
-
+   F = [x*dx+y*dy+a,
+        sm1_mul(dx,x*dx+c-1,V)-sm1_mul(x*dx+y*dy+a,x*dx+y*dy+b,V),
+        sm1_mul(dy,y*dy+cp-1,V)-sm1_mul(x*dx+y*dy+a,x*dx+y*dy+b,V)];
+   G = sm1_gb([F,V,W]);
    G = G[0];
    B = contiguity_eliminated(G);
    print("b-function for HG is ",0);
@@ -37,9 +37,9 @@ def contiguity_f4_a_bf() {
 def contiguity_f4_a() {
    V = [x,y,a,b,c,cp];
    W = [[dx,1,dy,1,x,1,y,1]];
-   F = [x*dx+y*dy+a, 
-        dx*(x*dx+c-1)-(x*dx+y*dy+a)*(x*dx+y*dy+b),
-        dy*(y*dy+cp-1)-(x*dx+y*dy+a)*(x*dx+y*dy+b)];
+   F = [x*dx+y*dy+a,
+        sm1_mul(dx,x*dx+c-1,V)-sm1_mul(x*dx+y*dy+a,x*dx+y*dy+b,V),
+        sm1_mul(dy,y*dy+cp-1,V)-sm1_mul(x*dx+y*dy+a,x*dx+y*dy+b,V)];
    G = sm1_syz([F,V,W]);
 
    Gb = map(first,G[1][0]);
@@ -48,7 +48,7 @@ def contiguity_f4_a() {
    for (I=0; I<length(Gb); I++) {
      if (contiguity_param_only(Gb[I]) != 0) {
         Ans = append(Ans,[ [Gb[I],C[I][0]] ]);
-        print(sm1_mul(C[I],F,[x,y,a,b,c,cp])); /* check ! */
+        /* print(sm1_mul(C[I],F,[x,y,a,b,c,cp])); */ /* check ! */
      }
    }
    return(Ans);