===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- OpenXM_contrib2/asir2000/engine/nd.h	2004/10/06 11:58:52	1.10
+++ OpenXM_contrib2/asir2000/engine/nd.h	2006/04/17 04:35:20	1.14
@@ -1,3 +1,4 @@
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.13 2005/08/03 06:10:48 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -45,8 +46,9 @@ typedef struct oNDV {
 
 typedef union oNDC {
 	int m;
-	Z z;
+	Q z;
 	P p;
+	DAlg a;
 } *NDC;
 
 /* monomial; linked list rep. */
@@ -131,15 +133,17 @@ extern int *current_weyl_weight_vector;
 #define HDL(d) ((d)->body->dl)
 #define HTD(d) (TD(HDL(d)))
 #define HCM(d) ((d)->body->c.m)
-#define HCZ(d) ((d)->body->c.z)
+#define HCQ(d) ((d)->body->c.z)
 #define HCP(d) ((d)->body->c.p)
-#define CM(a) ((a)->c.m)
-#define CZ(a) ((a)->c.z)
-#define CP(a) ((a)->c.p)
-#define DL(a) ((a)->dl)
-#define SG(a) ((a)->sugar)
-#define LEN(a) ((a)->len)
-#define LCM(a) ((a)->lcm)
+#define HCA(d) ((d)->body->c.a)
+#define CM(x) ((x)->c.m)
+#define CQ(x) ((x)->c.z)
+#define CP(x) ((x)->c.p)
+#define CA(x) ((x)->c.a)
+#define DL(x) ((x)->dl)
+#define SG(x) ((x)->sugar)
+#define LEN(x) ((x)->len)
+#define LCM(x) ((x)->lcm)
 #define GET_EXP(d,a) (((d)[nd_epos[a].i]>>nd_epos[a].s)&nd_mask0)
 #define GET_EXP_MASK(d,a,m) ((((d)[nd_epos[a].i]&(m)[nd_epos[a].i])>>nd_epos[a].s)&nd_mask0)
 #define PUT_EXP(r,a,e) ((r)[nd_epos[a].i] |= ((e)<<nd_epos[a].s))
@@ -214,16 +218,16 @@ 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(Z *c,int n);
+void removecont_array(Q *c,int n);
 
 /* GeoBucket functions */
 ND normalize_pbucket(int mod,PGeoBucket g);
 int head_pbucket(int mod,PGeoBucket g);
-int head_pbucket_z(PGeoBucket g);
+int head_pbucket_q(PGeoBucket g);
 void add_pbucket_symbolic(PGeoBucket g,ND d);
 void add_pbucket(int mod,PGeoBucket g,ND d);
 void free_pbucket(PGeoBucket b);
-void mulz_pbucket(PGeoBucket g,Z c);
+void mulq_pbucket(PGeoBucket g,Q c);
 NM remove_head_pbucket_symbolic(PGeoBucket g);
 PGeoBucket create_pbucket();
 
@@ -270,7 +274,7 @@ INLINE int ndl_hash_value(UINT *d);
 /* normal forms */
 INLINE int ndl_find_reducer(UINT *g);
 int nd_sp(int mod,int trace,ND_pairs p,ND *nf);
-int nd_nf(int mod,ND g,NDV *ps,int full,Q *dn,ND *nf);
+int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *nf);
 int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf);
 
 /* finalizers */
@@ -287,14 +291,14 @@ void nd_free_redlist();
 /* printing */
 void ndl_print(UINT *dl);
 void nd_print(ND p);
-void nd_print_z(ND p);
+void nd_print_q(ND p);
 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);
+void ndv_setup(int mod,int trace,NODE f,int dont_sort);
 void nd_setup_parameters(int nvar,int max);
 BlockMask nd_create_blockmask(struct order_spec *ord);
 EPOS nd_create_epos(struct order_spec *ord);
@@ -306,7 +310,7 @@ ND nd_dup(ND p);
 /* ND functions */
 int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand);
 void nd_mul_c(int mod,ND p,int mul);
-void nd_mul_c_z(ND p,Z mul);
+void nd_mul_c_q(ND p,Q mul);
 void nd_mul_c_p(VL vl,ND p,P mul);
 ND nd_remove_head(ND p);
 ND nd_separate_head(ND p,ND *head);
@@ -317,7 +321,7 @@ UINT *nd_compute_bound(ND p);
 ND nd_copy(ND p);
 ND nd_merge(ND p1,ND p2);
 ND nd_add(int mod,ND p1,ND p2);
-ND nd_add_z(ND p1,ND p2);
+ND nd_add_q(ND p1,ND p2);
 ND nd_add_sf(ND p1,ND p2);
 ND nd_quo(int mod,PGeoBucket p,NDV d);
 INLINE int nd_length(ND p);
@@ -325,14 +329,14 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col
 NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0);
 NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col,
 	NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred);
-NODE nd_f4_red_z_main(ND_pairs sp0,int nsp,UINT *s0vect,int col,
+NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,UINT *s0vect,int col,
 	NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred);
 
 /* NDV functions */
 ND weyl_ndv_mul_nm(int mod,NM m0,NDV p);
 void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *tab,int tlen);
 void ndv_mul_c(int mod,NDV p,int mul);
-void ndv_mul_c_z(NDV p,Z mul);
+void ndv_mul_c_q(NDV p,Q mul);
 ND ndv_mul_nm_symbolic(NM m0,NDV p);
 ND ndv_mul_nm(int mod,NM m0,NDV p);
 ND ndv_mul_nmv_trunc(int mod,NMV m0,NDV p,UINT *d);
@@ -342,7 +346,7 @@ void ndv_homogenize(NDV p,int obpe,int oadv,EPOS eops)
 void ndv_dehomogenize(NDV p,struct order_spec *spec);
 void ndv_removecont(int mod,NDV p);
 void ndv_print(NDV p);
-void ndv_print_z(NDV p);
+void ndv_print_q(NDV p);
 void ndv_free(NDV p);
 void ndv_save(NDV p,int index);
 NDV ndv_load(int index);
@@ -353,16 +357,16 @@ NDV ptondv(VL vl,VL dvl,P p);
 P ndvtop(int mod,VL vl,VL dvl,NDV p);
 NDV ndtondv(int mod,ND p);
 ND ndvtond(int mod,NDV p);
-int nm_ind_pair_to_vect(int m,UINT *s0,int n,NM_ind_pair pair,UINT *r);
+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);
 int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r);
-int nd_to_vect_z(UINT *s0,int n,ND d,Z *r);
-NDV vect_to_ndv_z(Z *vect,int spcol,int col,int *rhead,UINT *s0vect);
+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);
 
 /* elimination */
 int nd_gauss_elim_mod(int **mat0,int *sugar,int row,int col,int md,int *colstat);
 int nd_gauss_elim_sf(int **mat0,int *sugar,int row,int col,int md,int *colstat);
-int nd_gauss_elim_z(Z **mat0,int *sugar,int row,int col,int *colstat);
+int nd_gauss_elim_q(Q **mat0,int *sugar,int row,int col,int *colstat);
 
 int ndl_ww_lex_compare(UINT *a1,UINT *a2);