===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.189
retrieving revision 1.192
diff -u -p -r1.189 -r1.192
--- OpenXM_contrib2/asir2000/engine/nd.c	2010/05/06 09:22:09	1.189
+++ OpenXM_contrib2/asir2000/engine/nd.c	2010/12/14 05:29:37	1.192
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.188 2010/04/26 01:10:04 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.191 2010/09/27 05:05:58 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_newelim;
 static int *nd_gbblock;
 
 NumberField get_numberfield();
@@ -1918,6 +1918,11 @@ again:
             goto again;
         } else if ( nf ) {
             if ( checkonly || gensyz ) return 0;
+			if ( nd_newelim ) {
+				if ( nd_module ) {
+					if ( MPOS(HDL(nf)) > 1 ) return 0;
+				} else if ( !(HDL(nf)[nd_exporigin] & nd_mask[0]) ) return 0;
+			}
             if ( DP_Print ) { printf("+"); fflush(stdout); }
             hc = HCU(nf);
             nd_removecont(m,nf);
@@ -2910,6 +2915,9 @@ void nd_gr(LIST f,LIST v,int m,int homo,int f4,struct 
         MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0);
     }
     x = f4?nd_f4(m,&perm):nd_gb(m,ishomo || homo,0,0,&perm);
+	if ( !x ) {
+		*rp = 0; return;
+	}
 	if ( !ishomo && homo ) {
 	   	/* dehomogenization */
 		for ( t = x; t; t = NEXT(t) ) ndv_dehomogenize((NDV)BDY(t),ord);
@@ -4928,16 +4936,17 @@ EPOS nd_create_epos(struct order_spec *ord)
 
 /* external interface */
 
-void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec *ord,P *rp)
+void nd_nf_p(Obj f,LIST g,LIST v,int m,struct order_spec *ord,Obj *rp)
 {
     NODE t,in0,in;
-    ND nd,nf;
-    NDV ndv;
+    ND ndf,nf;
+    NDV ndvf;
     VL vv,tv;
-    int stat,nvar,max,e;
+    int stat,nvar,max,mrank;
     union oNDC dn;
     Q cont;
     P pp;
+    LIST ppl;
 
     if ( !f ) {
         *rp = 0;
@@ -4946,47 +4955,48 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec
     pltovl(v,&vv);
     for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
 
-    /* get the degree bound */
-    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);
-        }
-    for ( tv = vv; tv; tv = NEXT(tv) ) {
-        e = getdeg(tv->v,f);
-        max = MAX(e,max);
-    }
+    /* max=65536 implies nd_bpe=32 */
+    max = 65536; 
 
+	nd_module = 0;
+	/* nd_module will be set if ord is a module ordering */
     nd_init_ord(ord);
     nd_setup_parameters(nvar,max);
-
+    if ( nd_module && OID(f) != O_LIST )
+        error("nd_nf_p : the first argument must be a list");
+	if ( nd_module ) mrank = length(BDY((LIST)f));
     /* conversion to ndv */
     for ( in0 = 0, t = BDY(g); t; t = NEXT(t) ) {
         NEXTNODE(in0,in);
-        ptozp((P)BDY(t),1,&cont,&pp);
-        BDY(in) = (pointer)ptondv(CO,vv,pp);
+        if ( nd_module ) {
+          if ( !BDY(t) || OID(BDY(t)) != O_LIST 
+               || length(BDY((LIST)BDY(t))) != mrank )
+              error("nd_nf_p : inconsistent basis element");
+          if ( !m ) pltozpl((LIST)BDY(t),&cont,&ppl);
+          else ppl = (LIST)BDY(t);
+          BDY(in) = (pointer)pltondv(CO,vv,ppl);
+        } else {
+          if ( !m ) ptozp((P)BDY(t),1,&cont,&pp);
+          else pp = (P)BDY(t);
+          BDY(in) = (pointer)ptondv(CO,vv,pp);
+        }
         if ( m ) ndv_mod(m,(NDV)BDY(in));
     }
-    NEXTNODE(in0,in);
-    BDY(in) = (pointer)ptondv(CO,vv,f);
-    if ( m ) ndv_mod(m,(NDV)BDY(in));
-    NEXT(in) = 0;
+    if ( in0 ) NEXT(in) = 0;
 
+    if ( nd_module ) ndvf = pltondv(CO,vv,(LIST)f);
+    else ndvf = ptondv(CO,vv,(P)f);
+    if ( m ) ndv_mod(m,ndvf);
+    ndf = (pointer)ndvtond(m,ndvf);
+
     /* dont sort, dont removecont */
     ndv_setup(m,0,in0,1,1);
-    nd_psn--;
     nd_scale=2;
-    while ( 1 ) {
-        nd = (pointer)ndvtond(m,nd_ps[nd_psn]);
-        stat = nd_nf(m,0,nd,nd_ps,1,0,&nf);
-        if ( !stat ) {
-            nd_psn++;
-            nd_reconstruct(0,0);
-            nd_psn--;
-        } else
-            break;
-    }
-    *rp = ndvtop(m,CO,vv,ndtondv(m,nf));
+    stat = nd_nf(m,0,ndf,nd_ps,1,0,&nf);
+    if ( !stat )
+        error("nd_nf_p : exponent too large");
+    if ( nd_module ) *rp = (Obj)ndvtopl(m,CO,vv,ndtondv(m,nf),mrank);
+    else *rp = (Obj)ndvtop(m,CO,vv,ndtondv(m,nf));
 }
 
 int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r)
@@ -6600,24 +6610,16 @@ 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);
@@ -6953,6 +6955,7 @@ void parse_nd_option(NODE opt)
     Obj value;
 
     nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_gbblock = 0;
+	nd_newelim = 0;
     for ( t = opt; t; t = NEXT(t) ) {
         p = BDY((LIST)BDY(t));
         key = BDY((STRING)BDY(p));
@@ -6974,6 +6977,7 @@ void parse_nd_option(NODE opt)
 				nd_gbblock[i++] = s+QTOS((Q)BDY(NEXT(p)))-1;
 			}
 			nd_gbblock[i] = -1;
-		}
+		} else if ( !strcmp(key,"newelim") )
+            nd_newelim = value?1:0;
     }
 }