===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.2
retrieving revision 1.14
diff -u -p -r1.2 -r1.14
--- OpenXM_contrib2/asir2018/include/ca.h	2018/09/21 07:06:51	1.2
+++ OpenXM_contrib2/asir2018/include/ca.h	2019/11/19 10:50:31	1.14
@@ -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.1 2018/09/19 06:00:58 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.13 2019/11/12 22:27:04 noro Exp $
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -197,10 +197,10 @@ typedef unsigned _int64 UL;
 #endif
 
 #if defined(__GNUC__) && SIZEOF_LONG == 8
-typedef __uint64_t U64;
 typedef __uint128_t U128;
 typedef __int64_t L64;
 typedef __int128_t L128;
+
 #endif
 
 typedef struct oZ {
@@ -535,6 +535,19 @@ typedef struct oDMM {
   struct oDMM *next;
 } *DMM;
 
+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];
@@ -598,6 +611,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;
@@ -672,11 +690,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 {
@@ -771,7 +791,7 @@ typedef unsigned int ModNum;
 #define COEF(p) ((p)->c)
 #define DEG(p) ((p)->d)
 #define CONT(a) ((a)->cont)
-#define UDEG(f) QTOS(DEG(DC(f)))
+#define UDEG(f) ZTOS(DEG(DC(f)))
 #define UCOEF(f) (COEF(DC(f)))
 #define LC(f) (NUM(f)?(f):COEF(DC(f)))
 
@@ -896,6 +916,8 @@ 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 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)))
 
@@ -932,6 +954,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)))
@@ -978,14 +1005,14 @@ 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 STOQ(n,q) ((!(n))?((q)=0):(NEWZ(q),mpz_set_si(BDY(q),n)))
-#define UTOQ(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 STOQ0(n,q) (OID(q)=O_N,NID(q)=N_Q,(q)->z=1,mpz_init(BDY(q)),mpz_set_si(BDY(q),n))
+#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))
 #define STOLM0(n,q) (OID(q)=O_N,NID(q)=N_LM,mpz_init(BDY(q)),mpz_set_si(BDY(q),n))
 
-#define QTOS(q) (!(q)?0:((q)->z==1?mpz_get_si(BDY((Z)q)):(error("QTOS : invalid argument"),0)))
+#define ZTOS(q) (!(q)?0:((q)->z==1?mpz_get_si(BDY((Z)q)):(error("ZTOS : invalid argument"),0)))
 #define LMTOS(q) (!(q)?0:mpz_get_si(BDY(q)))
 
 #define UTOMQ(a,b) ((a)?(NEWMQ(b),CONT(b)=(unsigned int)(a),(b)):((b)=0))
@@ -1021,6 +1048,8 @@ if(!(r)){NEWDMM(r);(c)=(r);}else{NEWDMM(NEXT(c));(c)=N
 #define UNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==1))
 #define MUNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==-1))
 #define EVENZ(n) ((!(n))||(INT(n)&&mpz_tstbit(((Z)(n))->body,0)==0))
+#define UNIMPZ(q) (mpz_cmp_si(q,1)==0)
+#define MUNIMPZ(q) (mpz_cmp_si(q,-1)==0)
 
 /* special macros for private memory management */
 
@@ -1436,7 +1465,6 @@ int geldb(VL,P);
 int getchomdeg(V,P);
 int getdeg(V,P);
 int getlchomdeg(V,P,int *);
-int get_lprime(int);
 int homdeg(P);
 unsigned int invm(unsigned int,int);
 int iscycm(P);
@@ -1775,6 +1803,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);
@@ -1800,6 +1829,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 *);
@@ -2518,7 +2548,7 @@ int compnbp(VL vl,NBP p1,NBP p2);
 #define MPQTOQ(g,q) (!mpq_sgn(g)?((q)=0):(NEWQ(q),BDY(q)[0]=(g)[0],(q)))
 
 #define INTMPQ(a)  (!mpz_cmp_ui(mpq_denref(a),1))
-#define INTQ(a) ((a)&&NUM(a)&&((Q)a)->z==1)
+#define INTQ(a) ((a)&&NUM(a)&&RATN(a)&&((Q)a)->z==1)
 #define UNIQ(a) (INTQ(a)&&!mpz_cmp_si(BDY((Z)a),1))
 #define MUNIQ(a) (INTQ(a)&&!mpz_cmp_si(BDY((Z)a),-1))
 
@@ -2620,7 +2650,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);
@@ -2690,6 +2720,14 @@ void hextoz(char *hex,Z *np);
 void todouble(Obj,Obj *);
 
 void lmtolf(LM f,Z *b);
+
+#if SIZEOF_LONG == 8
+mp_limb_t get_lprime64(int index);
+mp_limb_t **almat64(int,int);
+mp_limb_t remqi64(Q n,mp_limb_t m);
+int generic_gauss_elim64(MAT mat,MAT *nm,Z *dn,int **rindp,int **cindp);
+int generic_gauss_elim_mod64(mp_limb_t **mat,int row,int col,mp_limb_t md,int *colstat);
+#endif
 
 #if defined(VISUAL) || defined(__MINGW32__)
 void check_intr();