===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- OpenXM_contrib2/asir2018/include/ca.h	2018/10/02 09:06:15	1.7
+++ OpenXM_contrib2/asir2018/include/ca.h	2019/09/19 06:29:48	1.11
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.6 2018/10/01 05:54:09 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.10 2019/08/28 23:27:34 noro Exp $
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -535,6 +535,13 @@ typedef struct oDMM {
   struct oDMM *next;
 } *DMM;
 
+typedef struct oDMMstack {
+  int rank,ordtype;
+  DMM *in;
+  LIST obj;
+  struct oDMMstack *next;
+} *DMMstack;
+
 typedef struct oDL {
   int td;
   int d[1];
@@ -672,11 +679,13 @@ struct order_spec {
   int id;
   Obj obj;
   int nv;
-  int ispot; /* 1 means Position over Term (Pos then Term) */
+  int module_ordtype; /* 0=TOP, 1=POT, 2=wPOT, 3=Schreyer */
   int pot_nelim; /* size of positions for pot-elimination order */
   int *top_weight;
   int module_rank;
   int *module_top_weight;
+  struct order_spec *base; /* for schreyer order */
+  DMMstack dmmstack;
   union {
     int simple;
     struct {
@@ -896,6 +905,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL)))
 #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))
 #define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM)))
+#define NEWDMMstack(m) ((m)=(DMMstack)MALLOC(sizeof(struct oDMMstack)))
 #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))
 #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))
 
@@ -978,8 +988,8 @@ if(!(r)){NEWDMM(r);(c)=(r);}else{NEWDMM(NEXT(c));(c)=N
 #define DUPZ(p,q) (NEWZ(q),BDY(q)=BDY(p))
 #define DUPQ(p,q) (NEWQ(q),BDY(q)=BDY(p))
 
-#define STOZ(n,q) ((!(n))?((q)=0):(NEWZ(q),mpz_set_si(BDY(q),n)))
-#define UTOZ(n,q) ((!(n))?((q)=0):(NEWZ(q),mpz_set_ui(BDY(q),n)))
+#define STOZ(n,q) ((!(n))?(void)((q)=0):(NEWZ(q),mpz_set_si(BDY(q),n)))
+#define UTOZ(n,q) ((!(n))?(void)((q)=0):(NEWZ(q),mpz_set_ui(BDY(q),n)))
 
 /* for initializing static object */
 #define STOZ0(n,q) (OID(q)=O_N,NID(q)=N_Q,(q)->z=1,mpz_init(BDY(q)),mpz_set_si(BDY(q),n))
@@ -1776,6 +1786,7 @@ void vntovl(VN,int,VL *);
 void saveerror(FILE *,ERR);
 void saveui(FILE *,USINT);
 void savedp(FILE *,DP);
+void savedpm(FILE *,DPM);
 void savestring(FILE *,STRING);
 void savemat(FILE *,MAT);
 void savevect(FILE *,VECT);
@@ -1801,6 +1812,7 @@ void savegfsn(FILE *,GFSN);
 void loaderror(FILE *,ERR *);
 void loadui(FILE *,USINT *);
 void loaddp(FILE *,DP *);
+void loaddpm(FILE *,DPM *);
 void loadstring(FILE *,STRING *);
 void loadmat(FILE *,MAT *);
 void loadvect(FILE *,VECT *);
@@ -2621,7 +2633,7 @@ void nd_det(int mod,MAT f,P *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_postproc(LIST f,LIST v,int m,struct order_spec *ord,int do_check,LIST *rp);
 void nd_gr_recompute_trace(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,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);
 void nd_nf_p(Obj f,LIST g,LIST v,int m,struct order_spec *ord,Obj *rp);
 void obj_algtodalg(Obj obj,Obj *r);
 void obj_dalgtoalg(Obj obj,Obj *r);