===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/engine/nd.h	2004/03/17 08:16:24	1.2
+++ OpenXM_contrib2/asir2000/engine/nd.h	2004/09/15 06:06:42	1.6
@@ -258,6 +258,7 @@ INLINE int ndl_reducible(UINT *d1,UINT *d2);
 INLINE int ndl_lex_compare(UINT *d1,UINT *d2);
 INLINE int ndl_block_compare(UINT *d1,UINT *d2);
 INLINE int ndl_matrix_compare(UINT *d1,UINT *d2);
+INLINE int ndl_composite_compare(UINT *d1,UINT *d2);
 INLINE int ndl_equal(UINT *d1,UINT *d2);
 INLINE void ndl_copy(UINT *d1,UINT *d2);
 INLINE void ndl_zero(UINT *d);
@@ -292,7 +293,7 @@ void ndp_print(ND_pairs d);
 
 /* setup, reconstruct */
 void nd_init_ord(struct order_spec *spec);
-ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp);
+ND_pairs nd_reconstruct(int trace,ND_pairs ndp);
 void ndv_setup(int mod,int trace,NODE f);
 void nd_setup_parameters(int nvar,int max);
 BlockMask nd_create_blockmask(struct order_spec *ord);
@@ -312,11 +313,13 @@ ND nd_separate_head(ND p,ND *head);
 int nd_length(ND p);
 void nd_append_red(UINT *d,int i);
 UINT *ndv_compute_bound(NDV p);
+UINT *nd_compute_bound(ND p);
 ND nd_copy(ND p);
 ND nd_merge(ND p1,ND p2);
 ND nd_add(int mod,ND p1,ND p2);
 ND nd_add_q(ND p1,ND p2);
 ND nd_add_sf(ND p1,ND p2);
+ND nd_quo(int mod,ND p,NDV d);
 INLINE int nd_length(ND p);
 NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0);
 NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0);
@@ -328,6 +331,7 @@ void ndv_mul_c(int mod,NDV p,int mul);
 void ndv_mul_c_q(NDV p,Q mul);
 ND ndv_mul_nm_symbolic(NM m0,NDV p);
 ND ndv_mul_nm(int mod,NM m0,NDV p);
+ND ndv_mul_nmv_trunc(int mod,NMV m0,NDV p,UINT *d);
 void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos);
 NDV ndv_dup_realloc(NDV p,int obpe,int oadv,EPOS oepos);
 void ndv_homogenize(NDV p,int obpe,int oadv,EPOS eops);