===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.24
retrieving revision 1.29
diff -u -p -r1.24 -r1.29
--- OpenXM_contrib2/asir2000/engine/nd.h	2009/02/11 03:04:42	1.24
+++ OpenXM_contrib2/asir2000/engine/nd.h	2013/09/26 00:38:47	1.29
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.23 2009/02/09 10:21:29 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.28 2012/08/27 05:38:00 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -131,7 +131,7 @@ extern ND_pairs _ndp_free_list;
 extern struct order_spec *dp_current_spec;
 extern char *Demand;
 extern VL CO;
-extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar,GenTrace,GenSyz;
+extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar;
 extern int *current_weyl_weight_vector;
 extern int *current_module_weight_vector;
 
@@ -256,7 +256,7 @@ int crit_2( int dp1, int dp2 );
 int ndv_newps(int m,NDV a,NDV aq);
 
 /* top level functions */
-void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp);
+void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);
 void nd_gr_trace(LIST f,LIST v,int trace,int homo,int f4,struct order_spec *ord,LIST *rp);
 NODE nd_f4(int m,int **indp);
 NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,int **indp);
@@ -309,7 +309,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,int dont_removecont);
+int 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);
@@ -369,7 +369,7 @@ P ndvtop(int mod,VL vl,VL dvl,NDV p);
 NDV ndtondv(int mod,ND p);
 ND ndvtond(int mod,NDV p);
 Q *nm_ind_pair_to_vect(int m,UINT *s0,int n,NM_ind_pair pair);
-IndArray nm_ind_pair_to_vect_compress(int m,UINT *s0,int n,NM_ind_pair pair);
+IndArray nm_ind_pair_to_vect_compress(int m,UINT *s0,int n,int *s0hash,NM_ind_pair pair);
 int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r);
 int nd_to_vect_q(UINT *s0,int n,ND d,Q *r);
 NDV vect_to_ndv_q(Q *vect,int spcol,int col,int *rhead,UINT *s0vect);