===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.178
retrieving revision 1.183
diff -u -p -r1.178 -r1.183
--- OpenXM_contrib2/asir2000/engine/nd.c	2009/10/13 08:53:51	1.178
+++ OpenXM_contrib2/asir2000/engine/nd.c	2010/02/22 05:27:53	1.183
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.177 2009/10/12 10:43:45 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.182 2010/02/22 02:20:43 noro Exp $ */
 
 #include "nd.h"
 
@@ -3137,12 +3137,13 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
             ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos,ompos);
     }
     while ( 1 ) {
+		tl1 = tl2 = tl3 = tl4 = 0;
         if ( Demand )
             nd_demand = 1;
+        ret = ndv_setup(m,1,fd0,0,0);
         if ( nd_gentrace ) {
             MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0);
         }
-        ret = ndv_setup(m,1,fd0,0,0);
         if ( ret )
             cand = f4?nd_f4_trace(m,&perm):nd_gb_trace(m,ishomo || homo,&perm);
         if ( !ret || !cand ) {
@@ -4052,7 +4053,9 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta
     NEWNM(m); d = DL(m);
     if ( mod ) {
         c0 = CM(m0); c1 = CM(m1); DMAR(c0,c1,0,mod,c); CM(m) = c;
-    } else
+    } else if ( nd_vc )
+        mulp(nd_vc,CP(m0),CP(m1),&CP(m));
+	else
         mulq(CQ(m0),CQ(m1),&CQ(m));
     for ( i = 0; i < nd_wpd; i++ ) d[i] = 0;
     homo = n&1 ? 1 : 0;
@@ -4107,7 +4110,9 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta
                         ndl_addto(DL(tab[u]),d);
                         if ( mod ) {
                             c0 = CM(tab[u]); DMAR(c0,c,0,mod,c1); CM(tab[u]) = c1;
-                        } else {
+                        } else if ( nd_vc )
+                            mulp(nd_vc,CP(tab[u]),(P)q,&CP(tab[u]));
+						else {
                             mulq(CQ(tab[u]),q,&q1); CQ(tab[u]) = q1;
                         }
                     }
@@ -4119,7 +4124,9 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta
                         ndl_add(DL(tab[u]),d,DL(t));
                         if ( mod ) {
                             c0 = CM(tab[u]); DMAR(c0,c,0,mod,c1); CM(t) = c1;
-                        } else
+                        } else if ( nd_vc )
+                            mulp(nd_vc,CP(tab[u]),(P)q,&CP(t));
+						else
                             mulq(CQ(tab[u]),q,&CQ(t));
                         *p = t;
                     }