===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.23
retrieving revision 1.28
diff -u -p -r1.23 -r1.28
--- OpenXM_contrib2/asir2000/engine/nd.h	2009/02/09 10:21:29	1.23
+++ OpenXM_contrib2/asir2000/engine/nd.h	2012/08/27 05:38:00	1.28
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.22 2009/02/08 02:47:10 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.27 2010/04/16 07:13:42 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);
@@ -319,7 +319,7 @@ NDV ndv_dup(int mod,NDV p);
 ND nd_dup(ND p);
 
 /* ND functions */
-int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand);
+int ndv_check_membership(int m,NODE input,int obpe,int oadv,EPOS oepos,NODE cand);
 void nd_mul_c(int mod,ND p,int mul);
 void nd_mul_c_q(ND p,P mul);
 void nd_mul_c_p(VL vl,ND p,P mul);