===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- OpenXM_contrib2/asir2018/include/ca.h	2019/08/21 00:37:47	1.9
+++ 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.8 2019/03/28 06:46:03 ohara 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>
@@ -538,6 +538,7 @@ typedef struct oDMM {
 typedef struct oDMMstack {
   int rank,ordtype;
   DMM *in;
+  LIST obj;
   struct oDMMstack *next;
 } *DMMstack;
 
@@ -678,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 {
@@ -1783,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);
@@ -1808,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 *);