===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.176
retrieving revision 1.183
diff -u -p -r1.176 -r1.183
--- OpenXM_contrib2/asir2000/engine/nd.c	2009/09/24 07:13:00	1.176
+++ 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.175 2009/09/09 08:13:24 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.182 2010/02/22 02:20:43 noro Exp $ */
 
 #include "nd.h"
 
@@ -2594,8 +2594,9 @@ int ndv_newps(int m,NDV a,NDV aq)
 }
 
 /* nd_tracelist = [[0,index,div],...,[nd_psn-1,index,div]] */
+/* return 1 if success, 0 if failure (HC(a mod p)) */
 
-void ndv_setup(int mod,int trace,NODE f,int dont_sort,int dont_removecont)
+int ndv_setup(int mod,int trace,NODE f,int dont_sort,int dont_removecont)
 {
     int i,j,td,len,max;
     NODE s,s0,f0,tn;
@@ -2649,6 +2650,8 @@ void ndv_setup(int mod,int trace,NODE f,int dont_sort,
             register_hcf(a);
             am = nd_ps[i] = ndv_dup(mod,a);
             ndv_mod(mod,am);
+	    if ( DL_COMPARE(HDL(am),HDL(a)) ) 
+	    	return 0;
             ndv_removecont(mod,am);
         } else {
             a = nd_ps[i] = ndv_dup(mod,w[i].p);
@@ -2675,6 +2678,7 @@ void ndv_setup(int mod,int trace,NODE f,int dont_sort,
         }
     }
     if ( nd_gentrace && nd_tracelist ) NEXT(tn) = 0;
+    return 1;
 }
 
 struct order_spec *append_block(struct order_spec *spec,
@@ -2841,7 +2845,7 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
     }
     nd_init_ord(ord);
     mrank = 0;
-    for ( t = BDY(f), max = 0; t; t = NEXT(t) )
+    for ( t = BDY(f), max = 1; t; t = NEXT(t) )
         for ( tv = vv; tv; tv = NEXT(tv) ) {
             if ( nd_module ) {
                 s = BDY((LIST)BDY(t));
@@ -2971,7 +2975,7 @@ void nd_gr_postproc(LIST f,LIST v,int m,struct order_s
         nvar += nalg;
     }
     nd_init_ord(ord);
-    for ( t = BDY(f), max = 0; t; t = NEXT(t) )
+    for ( t = BDY(f), max = 1; t; t = NEXT(t) )
         for ( tv = vv; tv; tv = NEXT(tv) ) {
             e = getdeg(tv->v,(P)BDY(t));
             max = MAX(e,max);
@@ -3083,7 +3087,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
     m = trace > 1 ? trace : get_lprime(mindex);
     nd_init_ord(ord);
     mrank = 0;
-    for ( t = BDY(f), max = 0; t; t = NEXT(t) )
+    for ( t = BDY(f), max = 1; t; t = NEXT(t) )
         for ( tv = vv; tv; tv = NEXT(tv) ) {
             if ( nd_module ) {
                 s = BDY((LIST)BDY(t));
@@ -3133,14 +3137,16 @@ 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;
-        ndv_setup(m,1,fd0,0,0);
+        ret = ndv_setup(m,1,fd0,0,0);
         if ( nd_gentrace ) {
             MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0);
         }
-        cand = f4?nd_f4_trace(m,&perm):nd_gb_trace(m,ishomo || homo,&perm);
-        if ( !cand ) {
+        if ( ret )
+            cand = f4?nd_f4_trace(m,&perm):nd_gb_trace(m,ishomo || homo,&perm);
+        if ( !ret || !cand ) {
             /* failure */
             if ( trace > 1 ) { *rp = 0; return; }
             else m = get_lprime(++mindex);
@@ -3443,7 +3449,7 @@ void ndv_homogenize(NDV p,int obpe,int oadv,EPOS oepos
     NMV m,mr0,mr,t;
 
     len = p->len;
-    for ( m = BDY(p), i = 0, max = 0; i < len; NMV_OADV(m), i++ )
+    for ( m = BDY(p), i = 0, max = 1; i < len; NMV_OADV(m), i++ )
         max = MAX(max,TD(DL(m)));
     mr0 = nmv_adv>oadv?(NMV)REALLOC(BDY(p),len*nmv_adv):BDY(p);
     m = (NMV)((char *)mr0+(len-1)*oadv);
@@ -4047,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;
@@ -4102,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;
                         }
                     }
@@ -4114,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;
                     }
@@ -4903,7 +4915,7 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec
     for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
 
     /* get the degree bound */
-    for ( t = BDY(g), max = 0; t; t = NEXT(t) )
+    for ( t = BDY(g), max = 1; t; t = NEXT(t) )
         for ( tv = vv; tv; tv = NEXT(tv) ) {
             e = getdeg(tv->v,(P)BDY(t));
             max = MAX(e,max);
@@ -6498,7 +6510,7 @@ void nd_det(int mod,MAT f,P *rp)
         m = (pointer **)w;
     }
 
-    for ( i = 0, max = 0; i < n; i++ )
+    for ( i = 0, max = 1; i < n; i++ )
         for ( j = 0; j < n; j++ )
             for ( tv = fv; tv; tv = NEXT(tv) ) {
                 e = getdeg(tv->v,(P)m[i][j]);
@@ -6506,7 +6518,7 @@ void nd_det(int mod,MAT f,P *rp)
             }
     nd_setup_parameters(nvar,max);
     dm = (NDV **)almat_pointer(n,n);
-    for ( i = 0, max = 0; i < n; i++ )
+    for ( i = 0, max = 1; i < n; i++ )
         for ( j = 0; j < n; j++ ) {
             dm[i][j] = ptondv(CO,fv,m[i][j]);
             if ( mod ) ndv_mod(mod,dm[i][j]);