===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.37
retrieving revision 1.40
diff -u -p -r1.37 -r1.40
--- OpenXM_contrib2/asir2000/engine/nd.c	2003/08/20 08:38:20	1.37
+++ OpenXM_contrib2/asir2000/engine/nd.c	2003/08/21 04:44:36	1.40
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.36 2003/08/20 07:55:45 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.39 2003/08/21 03:13:01 noro Exp $ */
 
 #include "ca.h"
 #include "inline.h"
@@ -15,11 +15,14 @@
 
 #define REDTAB_LEN 32003
 
+/* GeoBucket for polynomial addition */
+
 typedef struct oPGeoBucket {
 	int m;
 	struct oND *body[32];
 } *PGeoBucket;
 
+/* distributed polynomial; linked list rep. */
 typedef struct oND {
 	struct oNM *body;
 	int nv;
@@ -27,6 +30,7 @@ typedef struct oND {
 	int sugar;
 } *ND;
 
+/* distributed polynomial; array rep. */
 typedef struct oNDV {
 	struct oNMV *body;
 	int nv;
@@ -34,6 +38,7 @@ typedef struct oNDV {
 	int sugar;
 } *NDV;
 
+/* monomial; linked list rep. */
 typedef struct oNM {
 	struct oNM *next;
 	union {
@@ -43,6 +48,7 @@ typedef struct oNM {
 	unsigned int dl[1];
 } *NM;
 
+/* monomial; array rep. */
 typedef struct oNMV {
 	union {
 		int m;
@@ -51,6 +57,7 @@ typedef struct oNMV {
 	unsigned int dl[1];
 } *NMV;
 
+/* history of reducer */
 typedef struct oRHist {
 	struct oRHist *next;
 	int index;
@@ -58,6 +65,7 @@ typedef struct oRHist {
 	unsigned int dl[1];
 } *RHist;
 
+/* S-pair list */
 typedef struct oND_pairs {
 	struct oND_pairs *next;
 	int i1,i2;
@@ -85,7 +93,6 @@ RHist *nd_psh;
 int nd_psn,nd_pslen;
 
 RHist *nd_red;
-int nd_red_len;
 
 int nd_found,nd_create,nd_notfirst;
 int nm_adv;
@@ -94,6 +101,7 @@ int nd_dcomp;
 
 extern int Top,Reverse,dp_nelim;
 
+/* fundamental macros */
 #define TD(d) (d[0])
 #define HDL(d) ((d)->body->dl)
 #define HTD(d) (TD(HDL(d)))
@@ -106,13 +114,13 @@ extern int Top,Reverse,dp_nelim;
 #define LEN(a) ((a)->len)
 #define LCM(a) ((a)->lcm)
 
+/* macros for term comparison */
 #define TD_DL_COMPARE(d1,d2)\
 (TD(d1)>TD(d2)?1:(TD(d1)<TD(d2)?-1:ndl_lex_compare(d1+1,d2+1)))
-
 #define DL_COMPARE(d1,d2)\
 (nd_dcomp?TD_DL_COMPARE(d1,d2):(*nd_compare_function)(d1,d2))
 
-#define NM_ADV(m) (m = (NM)(((char *)m)+nm_adv))
+/* allocators */
 #define NEWRHist(r) \
 ((r)=(RHist)MALLOC(sizeof(struct oRHist)+nd_wpd*sizeof(unsigned int)))
 #define NEWND_pairs(m) \
@@ -125,29 +133,37 @@ if(!_nm_free_list)_NM_alloc();\
 if(!_nd_free_list)_ND_alloc();\
 (d)=_nd_free_list; _nd_free_list = (ND)BDY(_nd_free_list);\
 NV(d)=(n); LEN(d)=(len); BDY(d)=(m)
+#define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV)))
+#define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l;
 
+/* allocate and link a new object */
 #define NEXTRHist(r,c) \
 if(!(r)){NEWRHist(r);(c)=(r);}else{NEWRHist(NEXT(c));(c)=NEXT(c);}
 #define NEXTNM(r,c) \
 if(!(r)){NEWNM(r);(c)=(r);}else{NEWNM(NEXT(c));(c)=NEXT(c);}
 #define NEXTNM2(r,c,s) \
 if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);}
+#define NEXTND_pairs(r,c) \
+if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);}
 
+/* deallocators */
 #define FREENM(m) NEXT(m)=_nm_free_list; _nm_free_list=(m)
 #define FREENDP(m) NEXT(m)=_ndp_free_list; _ndp_free_list=(m)
 #define FREEND(m) BDY(m)=(NM)_nd_free_list; _nd_free_list=(m)
 
-#define NEXTND_pairs(r,c) \
-if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);}
+/* macro for increasing pointer to NMV */
+#define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv))
 
-void nd_init_ord(struct order_spec *spec);
-int nd_check_candidate(NODE input,NODE cand);
+/* external functions */
+void GC_gcollect();
+NODE append_one(NODE,int);
+
+/* manipulation of coefficients */
 void nd_removecont(int mod,ND p);
 void nd_removecont2(ND p1,ND p2);
-void ndv_removecont(int mod,NDV p);
-void ndv_dehomogenize(NDV p);
-void ndv_mul_c_q(NDV p,Q mul);
-void nd_mul_c_q(ND p,Q mul);
+void removecont_array(Q *c,int n);
+
+/* GeoBucket functions */
 ND normalize_pbucket(int mod,PGeoBucket g);
 int head_pbucket(int mod,PGeoBucket g);
 int head_pbucket_q(PGeoBucket g);
@@ -155,37 +171,41 @@ void add_pbucket(int mod,PGeoBucket g,ND d);
 void free_pbucket(PGeoBucket b);
 void mulq_pbucket(PGeoBucket g,Q c);
 PGeoBucket create_pbucket();
-ND nd_remove_head(ND p);
 
-void GC_gcollect();
-NODE append_one(NODE,int);
-NODE nd_reducebase(NODE x);
-
-void removecont_array(Q *c,int n);
-ND_pairs crit_B( ND_pairs d, int s );
-void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp);
-void nd_gr_trace(LIST f,LIST v,int m,int homo,struct order_spec *ord,LIST *rp);
-void nd_setup(int mod,NODE f);
-void nd_setup_trace(int mod,NODE f);
-int nd_newps(int mod,ND a);
-int nd_newps_trace(int mod,ND nf,ND nfq);
+/* manipulation of pairs and bases */
+int nd_newps(int mod,ND a,ND aq);
+ND_pairs nd_newpairs( NODE g, int t );
 ND_pairs nd_minp( ND_pairs d, ND_pairs *prest );
 NODE update_base(NODE nd,int ndp);
-static ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest );
-int crit_2( int dp1, int dp2 );
-ND_pairs crit_F( ND_pairs d1 );
-ND_pairs crit_M( ND_pairs d1 );
-ND_pairs nd_newpairs( NODE g, int t );
 ND_pairs update_pairs( ND_pairs d, NODE /* of index */ g, int t);
+ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest );
+ND_pairs crit_B( ND_pairs d, int s );
+ND_pairs crit_M( ND_pairs d1 );
+ND_pairs crit_F( ND_pairs d1 );
+int crit_2( int dp1, int dp2 );
+
+/* top level functions */
+void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp);
+void nd_gr_trace(LIST f,LIST v,int m,int homo,struct order_spec *ord,LIST *rp);
 NODE nd_gb(int m,int checkonly);
 NODE nd_gb_trace(int m);
-void nd_free_private_storage();
-void _NM_alloc();
-void _ND_alloc();
-int ndl_td(unsigned int *d);
+
+/* ndl functions */
+int ndl_weight(unsigned int *d);
 void ndl_dehomogenize(unsigned int *p);
-ND nd_add(int mod,ND p1,ND p2);
-ND nd_add_q(ND p1,ND p2);
+void ndl_reconstruct(int obpe,unsigned int *d,unsigned int *r);
+INLINE int nd_length(ND p);
+INLINE int ndl_reducible(unsigned int *d1,unsigned int *d2);
+INLINE int ndl_lex_compare(unsigned int *d1,unsigned int *d2);
+INLINE int ndl_equal(unsigned int *d1,unsigned int *d2);
+INLINE void ndl_copy(unsigned int *d1,unsigned int *d2);
+INLINE void ndl_add(unsigned int *d1,unsigned int *d2,unsigned int *d);
+INLINE void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d);
+INLINE int ndl_hash_value(unsigned int *d);
+INLINE int nd_find_reducer(ND g);
+INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len);
+
+/* normal forms */
 int nd_sp(int mod,ND_pairs p,ND *nf);
 int nd_find_reducer(ND g);
 int nd_find_reducer_direct(ND g,NDV *ps,int len);
@@ -193,40 +213,62 @@ int nd_nf(int mod,ND g,int full,ND *nf);
 int nd_nf_pbucket(int mod,ND g,int full,ND *nf);
 int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp);
 int nd_nf_direct_pbucket(int mod,ND g,NDV *ps,int len,int full,ND *rp);
-ND nd_reduce(ND p1,ND p2);
-ND nd_reduce_special(ND p1,ND p2);
+
+/* finalizers */
+NODE nd_reducebase(NODE x);
 NODE nd_reduceall(int m,NODE f);
 int nd_gbcheck(int m,NODE f);
 int nd_membercheck(int m,NODE f);
+
+/* allocators */
+void nd_free_private_storage();
+void _NM_alloc();
+void _ND_alloc();
 void nd_free(ND p);
-void ndv_free(NDV p);
+void nd_realloc(ND p,int obpe);
+void nd_free_redlist();
+
+/* printing */
 void ndl_print(unsigned int *dl);
 void nd_print(ND p);
 void nd_print_q(ND p);
-void ndv_print(NDV p);
-void ndv_print_q(NDV p);
 void ndp_print(ND_pairs d);
-int nd_length(ND p);
+
+
+/* setup, reconstruct */
+void nd_init_ord(struct order_spec *spec);
+ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp);
+void nd_reconstruct_direct(int mod,NDV *ps,int len);
+void nd_setup(int mod,int trace,NODE f);
+void nd_setup_parameters();
+
+/* ND functions */
+int nd_check_candidate(NODE input,NODE cand);
 void nd_mul_c(int mod,ND p,int mul);
-void nd_free_redlist();
+void nd_mul_c_q(ND p,Q mul);
+ND nd_remove_head(ND p);
+int nd_length(ND p);
 void nd_append_red(unsigned int *d,int i);
 unsigned int *nd_compute_bound(ND p);
 unsigned int *dp_compute_bound(DP p);
-ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp);
-void nd_reconstruct_direct(int mod,NDV *ps,int len);
-void nd_setup_parameters();
-void nd_realloc(ND p,int obpe);
 ND nd_copy(ND p);
-void ndl_dup(int obpe,unsigned int *d,unsigned int *r);
+ND nd_add(int mod,ND p1,ND p2);
+ND nd_add_q(ND p1,ND p2);
 
-#define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv))
-#define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV)))
-#define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l;
+/* NDV functions */
 void ndv_mul_c(int mod,NDV p,int mul);
+void ndv_mul_c_q(NDV p,Q mul);
+void ndv_realloc(NDV p,int obpe,int oadv);
+ND ndv_mul_nm(int mod,NDV p,NM m0);
+void ndv_dehomogenize(NDV p);
+void ndv_removecont(int mod,NDV p);
+void ndv_print(NDV p);
+void ndv_print_q(NDV p);
+void ndv_free(NDV p);
+
+/* converters */
 NDV ndtondv(int mod,ND p);
 ND ndvtond(int mod,NDV p);
-ND ndv_mul_nm(int mod,NDV p,NM m0);
-void ndv_realloc(NDV p,int obpe,int oadv);
 NDV dptondv(int,DP);
 DP ndvtodp(int,NDV);
 ND dptond(int,DP);
@@ -445,10 +487,10 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in
 			}
 			break;
 	}
-	TD(d) = ndl_td(d);
+	TD(d) = ndl_weight(d);
 }
 
-int ndl_td(unsigned int *d)
+int ndl_weight(unsigned int *d)
 {
 	unsigned int t,u;
 	int i,j;
@@ -754,6 +796,7 @@ INLINE int nd_find_reducer(ND g)
 	int d,k,i;
 
 	dg = HDL(g);
+#if 1
 	d = ndl_hash_value(HDL(g));
 	for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) {
 		if ( ndl_equal(dg,DL(r)) ) {
@@ -762,6 +805,7 @@ INLINE int nd_find_reducer(ND g)
 			return r->index;
 		}
 	}
+#endif
 	if ( Reverse )
 		for ( i = nd_psn-1; i >= 0; i-- ) {
 			r = nd_psh[i];
@@ -1249,7 +1293,7 @@ int nd_check_candidate(NODE input,NODE cand)
 	ND nf,d;
 	NODE t;
 
-	nd_setup(0,cand);
+	nd_setup(0,0,cand);
 	n = length(cand);
 
 	/* membercheck : list is a subset of Id(cand) ? */
@@ -1458,7 +1502,7 @@ again:
 		} else if ( nf ) {
 			if ( checkonly ) return 0;
 			printf("+"); fflush(stdout);
-			nh = nd_newps(m,nf);
+			nh = m?nd_newps(m,nf,0):nd_newps(m,0,nf);
 			d = update_pairs(d,g,nh);
 			g = update_base(g,nh);
 			FREENDP(l);
@@ -1512,9 +1556,9 @@ again:
 			nd_nf(0,h,!Top,&nfq);
 			if ( nfq ) {
 				printf("+"); fflush(stdout);
-				nh = nd_newps_trace(m,nf,nfq);
+				nh = nd_newps(m,nf,nfq);
 				/* failure; m|HC(nfq) */
-				if ( nf < 0 ) return 0;
+				if ( nh < 0 ) return 0;
 				d = update_pairs(d,g,nh);
 				g = update_base(g,nh);
 			} else {
@@ -1750,7 +1794,7 @@ int crit_2( int dp1, int dp2 )
 	return ndl_disjoint(DL(nd_psh[dp1]),DL(nd_psh[dp2]));
 }
 
-static ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest )
+ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest )
 {
 	ND_pairs w,p,r,s;
 	unsigned int *d;
@@ -1762,11 +1806,9 @@ static ND_pairs equivalent_pairs( ND_pairs d1, ND_pair
 	for ( r = 0; s; s = p ) {
 		p = NEXT(s);
 		if ( ndl_equal(d,LCM(s)) ) {
-			NEXT(s) = w;
-			w = s;
+			NEXT(s) = w; w = s;
 		} else {
-			NEXT(s) = r;
-			r = s;
+			NEXT(s) = r; r = s;
 		}
 	}
 	*prest = r;
@@ -1808,9 +1850,7 @@ ND_pairs nd_minp( ND_pairs d, ND_pairs *prest )
 	for ( ml = 0, l = m; p; p = NEXT(l = p) )
 		if ( (SG(p) < s) 
 			|| ((SG(p) == s) && (DL_COMPARE(LCM(p),LCM(m)) < 0)) ) {
-			ml = l;
-			m = p;
-			s = SG(m);
+			ml = l; m = p; s = SG(m);
 		}
 	if ( !ml ) *prest = NEXT(m);
 	else {
@@ -1821,7 +1861,7 @@ ND_pairs nd_minp( ND_pairs d, ND_pairs *prest )
 	return m;
 }
 
-int nd_newps(int mod,ND a)
+int nd_newps(int mod,ND a,ND aq)
 {
 	int len;
 	RHist r;
@@ -1835,95 +1875,30 @@ int nd_newps(int mod,ND a)
 		nd_bound = (unsigned int **)
 			REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *));
 	}
-	nd_removecont(mod,a);
-	nd_bound[nd_psn] = nd_compute_bound(a);
-	NEWRHist(r); SG(r) = SG(a); ndl_copy(HDL(a),DL(r)); 
-	nd_psh[nd_psn] = r;
-	b = ndtondv(mod,a);
-	len = LEN(b);
-	if ( mod )
-		nd_ps[nd_psn] = b;
-	else
-		nd_psq[nd_psn] = b;
-	nd_free(a);
-	return nd_psn++;
-}
-
-int nd_newps_trace(int mod,ND nf,ND nfq)
-{
-	int len;
-	RHist r;
-	NDV b;
-
-	if ( nd_psn == nd_pslen ) {
-		nd_pslen *= 2;
-		nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV));
-		nd_psq = (NDV *)REALLOC((char *)nd_psq,nd_pslen*sizeof(NDV));
-		nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist));
-		nd_bound = (unsigned int **)
-			REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *));
+	if ( a && aq ) {
+		/* trace lifting */
+		if ( !rem(NM(HCQ(aq)),mod) ) return -1;
 	}
-	if ( !rem(NM(HCQ(nfq)),mod) ) return -1;
-	nd_removecont(mod,nf);
-	nd_ps[nd_psn] = ndtondv(mod,nf);
-
-	nd_removecont(0,nfq);
-	nd_psq[nd_psn] = ndtondv(0,nfq);
-
-	nd_bound[nd_psn] = nd_compute_bound(nfq);
-	NEWRHist(r); SG(r) = SG(nf); ndl_copy(HDL(nf),DL(r)); 
-	nd_psh[nd_psn] = r;
-	nd_free(nf); nd_free(nfq);
-	return nd_psn++;
-}
-
-void nd_setup(int mod,NODE f)
-{
-	int i,j,td,len,max;
-	NODE s,s0,f0;
-	unsigned int *d;
-	RHist r;
-	NDV a;
-
-	nd_found = 0; nd_notfirst = 0; nd_create = 0;
-
-	nd_psn = length(f); nd_pslen = 2*nd_psn;
-	nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV));
-	nd_psq = (NDV *)MALLOC(nd_pslen*sizeof(NDV));
-	nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist));
-	nd_bound = (unsigned int **)MALLOC(nd_pslen*sizeof(unsigned int *));
-	for ( max = 0, i = 0, s = f; i < nd_psn; i++, s = NEXT(s) ) {
-		nd_bound[i] = d = dp_compute_bound((DP)BDY(s));
-		for ( j = 0; j < nd_nvar; j++ )
-			max = MAX(d[j],max);
+	NEWRHist(r); nd_psh[nd_psn] = r;
+	if ( aq ) {
+		nd_removecont(0,aq);
+		nd_psq[nd_psn] = ndtondv(0,aq);
+		nd_bound[nd_psn] = nd_compute_bound(aq);
+		SG(r) = SG(aq); ndl_copy(HDL(aq),DL(r));
 	}
-	if ( !nd_red )
-		nd_red = (RHist *)MALLOC(REDTAB_LEN*sizeof(RHist));
-	bzero(nd_red,REDTAB_LEN*sizeof(RHist));
-
-	if ( max < 2 ) nd_bpe = 2;
-	else if ( max < 4 ) nd_bpe = 4;
-	else if ( max < 64 ) nd_bpe = 6;
-	else if ( max < 256 ) nd_bpe = 8;
-	else if ( max < 65536 ) nd_bpe = 16;
-	else nd_bpe = 32;
-
-	nd_setup_parameters();
-	nd_free_private_storage();
-	len = 0;
-	for ( i = 0; i < nd_psn; i++, f = NEXT(f) ) {
-		NEWRHist(r);
-		a = dptondv(mod,(DP)BDY(f));
-		ndv_removecont(mod,a);
-		len = MAX(len,LEN(a));
-		SG(r) = HTD(a); ndl_copy(HDL(a),DL(r));
-		if ( mod ) nd_ps[i] = a;
-		else nd_psq[i] = a;
-		nd_psh[i] = r;
+	if ( a ) {
+		nd_removecont(mod,a);
+		nd_ps[nd_psn] = ndtondv(mod,a);
+		if ( !aq ) {
+			nd_bound[nd_psn] = nd_compute_bound(a);
+			SG(r) = SG(a); ndl_copy(HDL(a),DL(r));
+		}
 	}
+	nd_free(a); nd_free(aq);
+	return nd_psn++;
 }
 
-void nd_setup_trace(int mod,NODE f)
+void nd_setup(int mod,int trace,NODE f)
 {
 	int i,j,td,len,max;
 	NODE s,s0,f0;
@@ -1956,13 +1931,19 @@ void nd_setup_trace(int mod,NODE f)
 
 	nd_setup_parameters();
 	nd_free_private_storage();
-	len = 0;
 	for ( i = 0; i < nd_psn; i++, f = NEXT(f) ) {
-		a = dptondv(mod,(DP)BDY(f)); ndv_removecont(mod,a); nd_ps[i] = a;
-		a = dptondv(0,(DP)BDY(f)); ndv_removecont(0,a); nd_psq[i] = a;
 		NEWRHist(r);
-		len = MAX(len,LEN(a));
+		a = dptondv(mod,(DP)BDY(f)); ndv_removecont(mod,a);
 		SG(r) = HTD(a); ndl_copy(HDL(a),DL(r));
+
+		if ( trace ) {
+			nd_ps[i] = a;
+			a = dptondv(0,(DP)BDY(f)); ndv_removecont(0,a);
+			nd_psq[i] = a;
+		} else {
+			if ( mod ) nd_ps[i] = a;
+			else nd_psq[i] = a;
+		}
 		nd_psh[i] = r;
 	}
 }
@@ -1984,7 +1965,7 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,
 		NEXTNODE(fd0,fd); BDY(fd) = (pointer)b;
 	}
 	if ( fd0 ) NEXT(fd) = 0;
-	nd_setup(m,fd0);
+	nd_setup(m,0,fd0);
 	x = nd_gb(m,0);
 	fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n",
 		nd_found,nd_notfirst,nd_create);
@@ -2040,7 +2021,7 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o
 		nd_init_ord(ord);
 	}
 	do {
-		nd_setup_trace(m,fd0);
+		nd_setup(m,1,fd0);
 		cand = nd_gb_trace(m);
 		if ( !cand ) continue;
 		if ( homo ) {
@@ -2084,7 +2065,7 @@ void dltondl(int n,DL dl,unsigned int *r)
 	else
 		for ( i = 0; i < n; i++ )
 			r[i/nd_epw+1] |= d[i]<<((nd_epw-(i%nd_epw)-1)*nd_bpe);
-	TD(r) = ndl_td(r);
+	TD(r) = ndl_weight(r);
 }
 
 DL ndltodl(int n,unsigned int *ndl)
@@ -2502,7 +2483,7 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d)
 		s->i1 = t->i1;
 		s->i2 = t->i2;
 		SG(s) = SG(t);
-		ndl_dup(obpe,LCM(t),LCM(s));
+		ndl_reconstruct(obpe,LCM(t),LCM(s));
 	}
 	
 	old_red = (RHist *)ALLOCA(REDTAB_LEN*sizeof(RHist));
@@ -2515,7 +2496,7 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d)
 			NEWRHist(mr);
 			mr->index = r->index;
 			SG(mr) = SG(r);
-			ndl_dup(obpe,DL(r),DL(mr));
+			ndl_reconstruct(obpe,DL(r),DL(mr));
 			h = ndl_hash_value(DL(mr));
 			NEXT(mr) = nd_red[h];
 			nd_red[h] = mr;
@@ -2524,7 +2505,7 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d)
 	old_red = 0;
 	for ( i = 0; i < nd_psn; i++ ) {
 		NEWRHist(r); SG(r) = SG(nd_psh[i]);
-		ndl_dup(obpe,DL(nd_psh[i]),DL(r));
+		ndl_reconstruct(obpe,DL(nd_psh[i]),DL(r));
 		nd_psh[i] = r;
 	}
 	if ( s0 ) NEXT(s) = 0;
@@ -2568,7 +2549,7 @@ void nd_reconstruct_direct(int mod,NDV *ps,int len)
 			NEWRHist(mr);
 			mr->index = r->index;
 			SG(mr) = SG(r);
-			ndl_dup(obpe,DL(r),DL(mr));
+			ndl_reconstruct(obpe,DL(r),DL(mr));
 			h = ndl_hash_value(DL(mr));
 			NEXT(mr) = nd_red[h];
 			nd_red[h] = mr;
@@ -2580,7 +2561,7 @@ void nd_reconstruct_direct(int mod,NDV *ps,int len)
 	GC_gcollect();
 }
 
-void ndl_dup(int obpe,unsigned int *d,unsigned int *r)
+void ndl_reconstruct(int obpe,unsigned int *d,unsigned int *r)
 {
 	int n,i,ei,oepw,cepw,cbpe;
 
@@ -2613,7 +2594,7 @@ void nd_realloc(ND p,int obpe)
 		for ( mr0 = 0; m; m = NEXT(m) ) {
 			NEXTNM(mr0,mr);
 			CM(mr) = CM(m);
-			ndl_dup(obpe,DL(m),DL(mr));
+			ndl_reconstruct(obpe,DL(m),DL(mr));
 		}
 		NEXT(mr) = 0; 
 		BDY(p) = mr0;
@@ -2756,7 +2737,7 @@ void ndv_realloc(NDV p,int obpe,int oadv)
 		for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) {
 			CQ(t) = CQ(m);
 			for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0;
-			ndl_dup(obpe,DL(m),DL(t));
+			ndl_reconstruct(obpe,DL(m),DL(t));
 			CQ(mr) = CQ(t);
 			ndl_copy(DL(t),DL(mr));
 		}