===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.89
retrieving revision 1.91
diff -u -p -r1.89 -r1.91
--- OpenXM_contrib2/asir2000/engine/nd.c	2004/02/03 23:31:57	1.89
+++ OpenXM_contrib2/asir2000/engine/nd.c	2004/03/13 07:32:08	1.91
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.88 2003/12/24 02:20:19 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.90 2004/03/13 06:49:15 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -146,7 +146,6 @@ static int nd_psn,nd_pslen;
 static RHist *nd_red;
 
 static int nd_found,nd_create,nd_notfirst;
-static int nm_adv;
 static int nmv_adv;
 static int nd_dcomp;
 static int nd_demand;
@@ -179,6 +178,8 @@ extern int *current_weyl_weight_vector;
 #define GET_EXP_OLD(d,a) (((d)[oepos[a].i]>>oepos[a].s)&omask0)
 #define PUT_EXP_OLD(r,a,e) ((r)[oepos[a].i] |= ((e)<<oepos[a].s))
 
+#define ROUND_FOR_ALIGN(s) ((((s)+sizeof(void *)-1)/sizeof(void *))*sizeof(void *))
+
 /* macros for term comparison */
 #define TD_DL_COMPARE(d1,d2)\
 (TD(d1)>TD(d2)?1:(TD(d1)<TD(d2)?-1:ndl_lex_compare(d1,d2)))
@@ -1857,6 +1858,53 @@ again:
 	return g;
 }
 
+void do_diagonalize(int sugar,int m)
+{
+	int i,nh,stat;
+	NODE r,g,t;
+	ND h,nf,nfq,s,head;
+	NDV nfv,nfqv;
+	Q q,den,num;
+	union oNDC dn;
+
+	for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) {
+		/* for nd_ps */
+		s = ndvtond(m,nd_ps[i]);
+		s = nd_separate_head(s,&head);
+		nd_nf_pbucket(m,s,nd_ps,1,&nf);
+		nf = nd_add(m,head,nf);
+		ndv_free(nd_ps[i]);
+		nd_ps[i] = ndtondv(m,nf);
+		nd_free(nf);
+
+		/* for nd_ps_trace */
+		if ( nd_demand )
+			nfv = ndv_load(i);
+		else
+			nfv = nd_ps_trace[i];
+		s = ndvtond(0,nfv);
+		s = nd_separate_head(s,&head);
+		nd_nf(0,s,nd_ps_trace,1,&dn,&nf);
+		NTOQ(NM(dn.z),SGN(dn.z),num);
+		mulq(HCQ(head),num,&q); HCQ(head) = q;
+		if ( DN(dn.z) ) {
+			NTOQ(DN(dn.z),1,den);
+			nd_mul_c_q(nf,den);
+		}
+		nf = nd_add(0,head,nf);
+		ndv_free(nfv);
+		nd_removecont(0,nf);
+		nfv = ndtondv(0,nf);
+		nd_free(nf);
+		nd_bound[i] = ndv_compute_bound(nfv);
+		if ( nd_demand ) {
+			ndv_save(nfv,i);
+			ndv_free(nfv);
+		} else
+			nd_ps_trace[i] = nfv;
+	}
+}
+
 NODE nd_gb_trace(int m,int ishomo)
 {
 	int i,nh,sugar,stat;
@@ -1878,44 +1926,7 @@ NODE nd_gb_trace(int m,int ishomo)
 again:
 		l = nd_minp(d,&d);
 		if ( SG(l) != sugar ) {
-			if ( ishomo ) {
-				for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) {
-					/* for nd_ps */
-					s = ndvtond(m,nd_ps[i]);
-					s = nd_separate_head(s,&head);
-					nd_nf_pbucket(m,s,nd_ps,1,&nf);
-					nf = nd_add(m,head,nf);
-					ndv_free(nd_ps[i]);
-					nd_ps[i] = ndtondv(m,nf);
-					nd_free(nf);
-
-					/* for nd_ps_trace */
-					if ( nd_demand )
-						nfv = ndv_load(i);
-					else
-						nfv = nd_ps_trace[i];
-					s = ndvtond(0,nfv);
-					s = nd_separate_head(s,&head);
-					nd_nf(0,s,nd_ps_trace,1,&dn,&nf);
-					NTOQ(NM(dn.z),SGN(dn.z),num);
-					mulq(HCQ(head),num,&q); HCQ(head) = q;
-					if ( DN(dn.z) ) {
-						NTOQ(DN(dn.z),1,den);
-						nd_mul_c_q(nf,den);
-					}
-					nf = nd_add(0,head,nf);
-					ndv_free(nfv);
-					nd_removecont(0,nf);
-					nfv = ndtondv(0,nf);
-					nd_free(nf);
-					nd_bound[i] = ndv_compute_bound(nfv);
-					if ( nd_demand ) {
-						ndv_save(nfv,i);
-						ndv_free(nfv);
-					} else
-						nd_ps_trace[i] = nfv;
-				}
-			}
+			if ( ishomo ) do_diagonalize(sugar,m);
 			sugar = SG(l);
 			if ( DP_Print ) fprintf(asir_out,"%d",sugar);
 		}
@@ -2775,7 +2786,7 @@ void ndv_dehomogenize(NDV p,struct order_spec *ord)
 	for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ )
 		ndl_dehomogenize(DL(m));
 	if ( newwpd != nd_wpd ) {
-		newadv = sizeof(struct oNMV)+(newwpd-1)*sizeof(UINT);
+		newadv = ROUND_FOR_ALIGN(sizeof(struct oNMV)+(newwpd-1)*sizeof(UINT));
 		for ( m = r = BDY(p), i = 0; i < len; NMV_ADV(m), NDV_NADV(r), i++ ) {
 			CQ(r) = CQ(m);
 			for ( j = 0; j < newexporigin; j++ ) DL(r)[j] = DL(m)[j];
@@ -2971,8 +2982,7 @@ void nd_setup_parameters(int nvar,int max) {
 		nd_mask[nd_epw-i-1] = (nd_mask0<<(i*nd_bpe));
 		nd_mask1 |= (1<<(nd_bpe-1))<<(i*nd_bpe);
 	}
-	nm_adv = sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT);
-	nmv_adv = sizeof(struct oNMV)+(nd_wpd-1)*sizeof(UINT);
+	nmv_adv = ROUND_FOR_ALIGN(sizeof(struct oNMV)+(nd_wpd-1)*sizeof(UINT));
 	nd_epos = nd_create_epos(nd_ord);
 	nd_blockmask = nd_create_blockmask(nd_ord);
 }