===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.16
retrieving revision 1.20
diff -u -p -r1.16 -r1.20
--- OpenXM_contrib2/asir2000/engine/nd.h	2006/11/27 07:31:26	1.16
+++ OpenXM_contrib2/asir2000/engine/nd.h	2009/01/05 02:08:18	1.20
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.15 2006/06/05 08:11:10 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.19 2009/01/04 05:44:51 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -128,6 +128,7 @@ extern char *Demand;
 extern VL CO;
 extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar;
 extern int *current_weyl_weight_vector;
+extern int *current_module_weight_vector;
 
 /* fundamental macros */
 #define TD(d) (d[0])
@@ -152,6 +153,7 @@ 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 MPOS(d) (d[nd_mpos])
 
 #define ROUND_FOR_ALIGN(s) ((((s)+sizeof(void *)-1)/sizeof(void *))*sizeof(void *))
 
@@ -219,7 +221,7 @@ NODE append_one(NODE,int);
 /* manipulation of coefficients */
 void nd_removecont(int mod,ND p);
 void nd_removecont2(ND p1,ND p2);
-void removecont_array(P *c,int n);
+void removecont_array(P *c,int n,int full);
 void removecont_array_q(Q *c,int n);
 
 /* GeoBucket functions */
@@ -301,7 +303,7 @@ void ndp_print(ND_pairs d);
 /* setup, reconstruct */
 void nd_init_ord(struct order_spec *spec);
 ND_pairs nd_reconstruct(int trace,ND_pairs ndp);
-void ndv_setup(int mod,int trace,NODE f,int dont_sort);
+void ndv_setup(int mod,int trace,NODE f,int dont_sort,int dont_removecont);
 void nd_setup_parameters(int nvar,int max);
 BlockMask nd_create_blockmask(struct order_spec *ord);
 EPOS nd_create_epos(struct order_spec *ord);