===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM_contrib2/asir2018/include/ca.h	2019/08/21 00:37:47	1.9
+++ OpenXM_contrib2/asir2018/include/ca.h	2019/11/12 07:47:45	1.12
@@ -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.11 2019/09/19 06:29:48 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;
 
@@ -604,6 +605,11 @@ typedef struct oNODE {
   struct oNODE *next;
 } *NODE;
 
+typedef struct oNODE2 {
+  pointer body1,body2;
+  struct oNODE2 *next;
+} *NODE2;
+
 /* univariate poly over small finite field; dense */
 typedef struct oUM {
   int d;
@@ -678,11 +684,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 {
@@ -939,6 +947,11 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
 DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKNODE(a,b,c) \
 (NEWNODE(a),(a)->body=(pointer)b,NEXT(a)=(NODE)(c))
+#define NEWNODE2(a) ((a)=(NODE2)MALLOC(sizeof(struct oNODE2)))
+#define MKNODE2(a,b,c,d) \
+(NEWNODE2(a),(a)->body1=(pointer)b,(a)->body2=(pointer)c,NEXT(a)=(NODE2)(d))
+#define BDY1(a) ((a)->body1)
+#define BDY2(a) ((a)->body2)
 #define MKLIST(a,b) (NEWLIST(a),(a)->body=(NODE)(b))
 #define MKVECT(m,l) \
 (NEWVECT(m),(m)->len=(l),(m)->body=(pointer *)CALLOC((l),sizeof(pointer)))
@@ -1783,6 +1796,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 +1822,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 *);