===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.177
retrieving revision 1.186
diff -u -p -r1.177 -r1.186
--- OpenXM_contrib2/asir2000/engine/nd.c	2009/10/12 10:43:45	1.177
+++ OpenXM_contrib2/asir2000/engine/nd.c	2010/04/23 07:35:44	1.186
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.176 2009/09/24 07:13:00 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.185 2010/04/23 04:44:51 noro Exp $ */
 
 #include "nd.h"
 
@@ -49,7 +49,7 @@ static int nd_demand;
 static int nd_module,nd_ispot,nd_mpos,nd_pot_nelim;
 static NODE nd_tracelist;
 static NODE nd_alltracelist;
-static int nd_gentrace,nd_gensyz,nd_nora;
+static int nd_gentrace,nd_gensyz,nd_nora,nd_incr;
 
 NumberField get_numberfield();
 UINT *nd_det_compute_bound(NDV **dm,int n,int j);
@@ -2308,6 +2308,7 @@ ND_pairs nd_newpairs( NODE g, int t )
     for ( r0 = 0, h = g; h; h = NEXT(h) ) {
         if ( nd_module && (MPOS(DL(nd_psh[(long)BDY(h)])) != MPOS(dl)) )
                 continue;
+		if ( (long)BDY(h) < nd_incr && t < nd_incr ) continue;
         NEXTND_pairs(r0,r);
         r->i1 = (long)BDY(h);
         r->i2 = t;
@@ -2786,13 +2787,14 @@ NODE postprocess_algcoef(VL av,NODE alist,NODE r)
     return u0;
 }
 
-void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp)
+void nd_gr(LIST f,LIST v,int m,int homo,int f4,struct order_spec *ord,LIST *rp)
 {
     VL tv,fv,vv,vc,av;
     NODE fd,fd0,r,r0,t,x,s,xx,alist;
     int e,max,nvar,i;
     NDV b;
-    int ishomo,nalg,mrank,trank;
+    int ishomo,nalg,mrank,trank,wmax,len;
+	NMV a;
     Alg alpha,dp;
     P p,zp;
     Q dmy;
@@ -2845,7 +2847,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));
@@ -2879,11 +2881,31 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
         if ( b ) { NEXTNODE(fd0,fd); BDY(fd) = (pointer)b; }
     }
     if ( fd0 ) NEXT(fd) = 0;
-    ndv_setup(m,0,fd0,0,0);
+
+	if ( !ishomo && homo ) {
+        for ( t = fd0, wmax = max; t; t = NEXT(t) ) {
+            b = (NDV)BDY(t); len = LEN(b);
+            for ( a = BDY(b), i = 0; i < len; i++, NMV_ADV(a) )
+                wmax = MAX(TD(DL(a)),wmax);
+        }
+        homogenize_order(ord,nvar,&ord1);
+        nd_init_ord(ord1);
+        nd_setup_parameters(nvar+1,wmax);
+        for ( t = fd0; t; t = NEXT(t) )
+            ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos,ompos);
+    }
+
+    ndv_setup(m,0,fd0,nd_incr?1:0,0);
     if ( nd_gentrace ) {
         MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0);
     }
-    x = f4?nd_f4(m,&perm):nd_gb(m,ishomo,0,0,&perm);
+    x = f4?nd_f4(m,&perm):nd_gb(m,ishomo || homo,0,0,&perm);
+	if ( !ishomo && homo ) {
+	   	/* dehomogenization */
+		for ( t = x; t; t = NEXT(t) ) ndv_dehomogenize((NDV)BDY(t),ord);
+		nd_init_ord(ord);
+		nd_setup_parameters(nvar,0);
+	}
     nd_demand = 0;
     x = ndv_reducebase(x,perm);
     if ( nd_gentrace ) { tl1 = nd_alltracelist; nd_alltracelist = 0; }
@@ -2926,7 +2948,7 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 		}
        MKLIST(l1,tl1); MKLIST(l2,tl2); MKLIST(l3,t); MKLIST(l4,tl3);
        MKLIST(l5,tl4);
-      tr = mknode(7,*rp,0,l1,l2,l3,l4,l5); MKLIST(*rp,tr);
+      tr = mknode(7,*rp,(!ishomo&&homo)?ONE:0,l1,l2,l3,l4,l5); MKLIST(*rp,tr);
     }
 #if 0
     fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc);
@@ -2975,7 +2997,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);
@@ -3087,7 +3109,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));
@@ -3137,12 +3159,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,nd_incr?1: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 ) {
@@ -3448,7 +3471,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);
@@ -4052,7 +4075,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 +4132,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 +4146,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;
                     }
@@ -4908,7 +4937,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);
@@ -6503,7 +6532,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]);
@@ -6511,7 +6540,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]);
@@ -6561,16 +6590,24 @@ void nd_det(int mod,MAT f,P *rp)
                 bucket = create_pbucket();
                 if ( mi[k] ) {
                     nmv = BDY(mjj); len = LEN(mjj);
+					fprintf(stderr,"len=%d\n",len);
                     for ( a = 0; a < len; a++, NMV_ADV(nmv) ) {
+						fprintf(stderr,".");
                         u = ndv_mul_nmv_trunc(mod,nmv,mi[k],DL(BDY(d)));
                         add_pbucket(mod,bucket,u);
+						if ( !(a%1000) ) 
+							fprintf(stderr,"%d\n",a);
                     }
                 }
                 if ( mj[k] && mij ) {
                     nmv = BDY(mij); len = LEN(mij);
+					fprintf(stderr,"len=%d\n",len);
                     for ( a = 0; a < len; a++, NMV_ADV(nmv) ) {
+						fprintf(stderr,".");
                         u = ndv_mul_nmv_trunc(mod,nmv,mj[k],DL(BDY(d)));
                         add_pbucket(mod,bucket,u);
+						if ( !(a%1000) ) 
+							fprintf(stderr,"%d\n",a);
                     }
                 }
                 u = nd_quo(mod,bucket,d);
@@ -6904,7 +6941,7 @@ void parse_nd_option(NODE opt)
     char *key;
     Obj value;
 
-    nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0;
+    nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_incr = 0;
     for ( t = opt; t; t = NEXT(t) ) {
         p = BDY((LIST)BDY(t));
         key = BDY((STRING)BDY(p));
@@ -6915,5 +6952,7 @@ void parse_nd_option(NODE opt)
             nd_gensyz = value?1:0;
         else if ( !strcmp(key,"nora") )
             nd_nora = value?1:0;
+        else if ( !strcmp(key,"incr") )
+            nd_incr = QTOS((Q)value);
     }
 }