===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.h,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2018/engine/nd.h	2018/10/01 05:49:06	1.4
+++ OpenXM_contrib2/asir2018/engine/nd.h	2019/08/21 00:37:47	1.7
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.h,v 1.3 2018/09/28 08:20:28 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.h,v 1.6 2018/10/23 04:53:38 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -45,10 +45,9 @@ typedef struct oNDV {
 } *NDV;
 
 typedef union oNDC {
-  int m;
+  long m;
   Z z;
   LM lm;
-  Z gz;
   P p;
   R r;
   DAlg a;
@@ -262,7 +261,7 @@ int ndv_newps(int m,NDV a,NDV aq,int f4);
 
 /* top level functions */
 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);
+void nd_gr_trace(LIST f,LIST v,int trace,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);
 NODE nd_f4(int m,int checkonly,int **indp);
 NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,int **indp);
 NODE nd_gb_trace(int m,int ishomo,int **indp);
@@ -384,7 +383,7 @@ P ndvtop(int mod,VL vl,VL dvl,NDV p);
 NDV ndtondv(int mod,ND p);
 ND ndvtond(int mod,NDV p);
 Z *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,int *s0hash,NM_ind_pair pair);
+IndArray nm_ind_pair_to_vect_compress(int m,UINT *s0,int n,NM_ind_pair pair,int prevh);
 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,Z *r);
 NDV vect_to_ndv_q(Z *vect,int spcol,int col,int *rhead,UINT *s0vect);