===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.h,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- OpenXM_contrib2/asir2018/engine/nd.h	2018/09/25 21:51:21	1.2
+++ OpenXM_contrib2/asir2018/engine/nd.h	2020/06/19 10:18:13	1.8
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.h,v 1.1 2018/09/19 05:45:07 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.h,v 1.7 2019/08/21 00:37:47 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -28,12 +28,18 @@ typedef struct oPGeoBucket {
   struct oND *body[32];
 } *PGeoBucket;
 
+typedef struct oSIG {
+  int pos;
+  DL dl;
+} *SIG;
+
 /* distributed polynomial; linked list rep. */
 typedef struct oND {
   struct oNM *body;
   int nv;
   int len;
   int sugar;
+  SIG sig;
 } *ND;
 
 /* distributed polynomial; array rep. */
@@ -42,13 +48,13 @@ typedef struct oNDV {
   int nv;
   int len;
   int sugar;
+  SIG sig;
 } *NDV;
 
 typedef union oNDC {
-  int m;
+  long m;
   Z z;
   LM lm;
-  Z gz;
   P p;
   R r;
   DAlg a;
@@ -72,6 +78,7 @@ typedef struct oRHist {
   struct oRHist *next;
   int index;
   int sugar;
+  SIG sig;
   UINT dl[1];
 } *RHist;
 
@@ -81,6 +88,7 @@ typedef struct oND_pairs {
   int i1,i2;
   int sugar;
   int sugar2;
+  SIG sig;
   UINT lcm[1];
 } *ND_pairs;
 
@@ -145,14 +153,12 @@ extern int *current_module_weight_vector;
 #define HCU(d) ((d)->body->c)
 #define HCM(d) ((d)->body->c.m)
 #define HCLM(d) ((d)->body->c.lm)
-#define HCQ(d) ((d)->body->c.z)
-#define HCZ(d) ((d)->body->c.gz)
+#define HCZ(d) ((d)->body->c.z)
 #define HCP(d) ((d)->body->c.p)
 #define HCA(d) ((d)->body->c.a)
 #define CM(x) ((x)->c.m)
 #define CLM(x) ((x)->c.lm)
-#define CQ(x) ((x)->c.z)
-#define CZ(x) ((x)->c.gz)
+#define CZ(x) ((x)->c.z)
 #define CP(x) ((x)->c.p)
 #define CA(x) ((x)->c.a)
 #define DL(x) ((x)->dl)
@@ -201,6 +207,8 @@ NV(d)=(n); LEN(d)=(len); BDY(d)=(m)
 #define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l;
 #define NEWNM_ind_pair(p)\
 ((p)=(NM_ind_pair)MALLOC(sizeof(struct oNM_ind_pair)))
+#define NEWSIG(r) \
+((r)=(SIG)MALLOC(sizeof(struct oSIG)),NEWDL((r)->dl,nd_nvar))
 
 /* allocate and link a new object */
 #define NEXTRHist(r,c) \
@@ -260,15 +268,16 @@ ND_pairs crit_B( ND_pairs d, int s );
 ND_pairs crit_M( ND_pairs d1 );
 ND_pairs crit_F( ND_pairs d1 );
 int crit_2( int dp1, int dp2 );
-int ndv_newps(int m,NDV a,NDV aq,int f4);
+int ndv_newps(int m,NDV a,NDV aq);
 
 /* 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);
 NODE nd_f4_trace(int m,int **indp);
+void nd_sba(LIST f,LIST v,int m,int homo,int retdp,struct order_spec *ord,LIST *rp);
 
 /* ndl functions */
 int ndl_weight(UINT *d);
@@ -293,7 +302,7 @@ INLINE int ndl_hash_value(UINT *d);
 INLINE int ndl_find_reducer(UINT *g);
 int nd_sp(int mod,int trace,ND_pairs p,ND *nf);
 int nd_sp_f4(int m,int trace,ND_pairs l,PGeoBucket bucket);
-int nd_nf(int mod,ND d,ND g,NDV *ps,int full,NDC dn,ND *nf);
+int nd_nf(int mod,ND d,ND g,NDV *ps,int full,ND *nf);
 int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf);
 
 /* finalizers */
@@ -317,7 +326,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);
-int 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,int sba);
 void nd_setup_parameters(int nvar,int max);
 BlockMask nd_create_blockmask(struct order_spec *ord);
 EPOS nd_create_epos(struct order_spec *ord);
@@ -386,7 +395,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);
@@ -398,12 +407,12 @@ int nd_gauss_elim_q(Z **mat0,int *sugar,int row,int co
 
 int ndl_ww_lex_compare(UINT *a1,UINT *a2);
 
-#if defined(__GNUC__) && SIZEOF_LONG == 8
-int nd_to_vect64(int mod,UINT *s0,int n,ND d,U64 *r);
-int ndv_reduce_vect64(int m,U64 *svect,U64 *cvect,int col,IndArray *imat,NM_ind_pair *rp0,int nred);
-NDV vect64_to_ndv(U64 *vect,int spcol,int col,int *rhead,UINT *s0vect);
-void red_by_vect64(int m, U64 *p,unsigned int *c,U64 *r,unsigned int hc,int len);
-int nd_gauss_elim_mod64(U64 **mat,int *sugar,ND_pairs *spactive,int row,int col,int md,int *colstat);
+#if SIZEOF_LONG == 8
+int nd_to_vect64(int mod,UINT *s0,int n,ND d,mp_limb_t *r);
+int ndv_reduce_vect64(int m,mp_limb_t *svect,mp_limb_t *cvect,int col,IndArray *imat,NM_ind_pair *rp0,int nred);
+NDV vect64_to_ndv(mp_limb_t *vect,int spcol,int col,int *rhead,UINT *s0vect);
+void red_by_vect64(int m, mp_limb_t *p,unsigned int *c,mp_limb_t *r,unsigned int hc,int len);
+int nd_gauss_elim_mod64(mp_limb_t **mat,int *sugar,ND_pairs *spactive,int row,int col,int md,int *colstat);
 #endif