===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.10
retrieving revision 1.16
diff -u -p -r1.10 -r1.16
--- OpenXM_contrib2/asir2018/include/ca.h	2019/08/28 23:27:34	1.10
+++ OpenXM_contrib2/asir2018/include/ca.h	2019/12/19 08:34:42	1.16
@@ -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.9 2019/08/21 00:37:47 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.15 2019/12/13 14:40:49 fujimoto Exp $
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,8 +95,13 @@ typedef caddr_t pointer;
 
 typedef void * pointer;
 
-#if defined(sun)
+#if defined(ANDROID)
 #include <strings.h>
+#include <string.h>
+#define index(s,c) strchr(s,c)
+#define rindex(s,c) strrchr(s,c)
+#elif defined(sun)
+#include <strings.h>
 #else
 #include <string.h>
 #if defined(VISUAL) || defined(__MINGW32__)
@@ -538,9 +543,16 @@ typedef struct oDMM {
 typedef struct oDMMstack {
   int rank,ordtype;
   DMM *in;
+  DMM *sum;
+  LIST obj;
   struct oDMMstack *next;
 } *DMMstack;
 
+typedef struct oDMMstack_array {
+  int len;
+  DMMstack *body;
+} *DMMstack_array;
+
 typedef struct oDL {
   int td;
   int d[1];
@@ -604,6 +616,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 +695,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 {
@@ -810,7 +829,11 @@ void (*set_signal(int sig, void (*handler)(int)))(int)
 #endif
 
 /* for setjmp/longjmp compatibility */
-#if defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))
+#if defined(ANDROID)
+#define JMP_BUF jmp_buf
+#define SETJMP(x) _setjmp(x)
+#define LONGJMP(x,y) _longjmp(x,y)
+#elif defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))
 #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)
@@ -903,6 +926,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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 NEWDMMstack_array(m) ((m)=(DMMstack_array)MALLOC(sizeof(struct oDMMstack_array)))
 #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))
 #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))
 
@@ -939,6 +963,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)))