===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.34
retrieving revision 1.49
diff -u -p -r1.34 -r1.49
--- OpenXM_contrib2/asir2000/include/ca.h	2002/11/22 07:32:11	1.34
+++ OpenXM_contrib2/asir2000/include/ca.h	2004/05/14 06:02:54	1.49
@@ -45,17 +45,18 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.33 2002/01/28 00:54:43 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.48 2004/03/10 02:41:08 noro Exp $ 
 */
 #include <stdio.h>
+#include <stdlib.h>
 
 #if defined(hpux)
 #include <netinet/in.h>
 # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz)
 #endif
 
-#if defined(VISUAL)
-#include <stdlib.h>
+#if !defined(VISUAL)
+#include <unistd.h>
 #endif
 
 #if !defined(VISUAL)
@@ -81,12 +82,16 @@ typedef caddr_t pointer;
 
 typedef void * pointer;
 
-#if defined(VISUAL)
+#if defined(sun)
+#include <strings.h>
+#else
 #include <string.h>
+#if defined(VISUAL)
 #define index(s,c) strchr(s,c)
 #define bzero(s,len) memset(s,0,len)
 #define bcopy(x,y,len) memcpy(y,x,len)
 #endif
+#endif
 
 #define COPY(a,b) ((b)=(a))
 #define FREEN(p) 
@@ -113,6 +118,11 @@ typedef void * pointer;
 #define O_GFMMAT 15
 #define O_BYTEARRAY 16
 #define O_QUOTE 17
+#define O_OPTLIST 18
+#define O_SYMBOL 19
+#define O_RANGE 20
+#define O_TB 21
+#define O_DPV 22
 #define O_VOID -1
 
 #define N_Q 0
@@ -131,7 +141,7 @@ typedef void * pointer;
 #define ORD_GRADLEX 1
 #define ORD_LEX 2
 
-#if LONG_IS_32BIT
+#if defined(LONG_IS_32BIT)
 #if defined(VISUAL)
 typedef _int64 L;
 typedef unsigned _int64 UL;
@@ -318,6 +328,13 @@ typedef struct oDP {
 	struct oMP *body;
 } *DP;
 
+typedef struct oDPV {
+	short id;
+	int len;
+	int sugar;
+	struct oDP **body;
+} *DPV;
+
 typedef struct oUSINT {
 	short id;
 	short pad;
@@ -349,6 +366,32 @@ typedef struct oQUOTE {
 	pointer body;
 } *QUOTE;
 
+typedef struct oOPTLIST {
+	short id;
+	short pad;
+	struct oNODE *body;
+} *OPTLIST;
+
+typedef struct oSYMBOL {
+	short id;
+	short pad;
+	char *name;
+	int value;
+} *SYMBOL;
+
+typedef struct oRANGE {
+	short id;
+	short pad;
+	struct oObj *start,*end;
+} *RANGE;
+
+typedef struct oTB {
+	short id;
+	short pad;
+	int size,next;
+	char **body;
+} *TB;
+
 typedef struct oObj {
 	short id;
 	short pad;
@@ -414,6 +457,11 @@ typedef struct oDLBUCKET {
 	struct oDLBUCKET *next;
 } *DLBUCKET;
 
+typedef struct oGeoBucket {
+	int m;
+	struct oNODE *body[32];
+} *GeoBucket;
+
 typedef struct oVL {
 	V v;
 	struct oVL *next;
@@ -474,6 +522,26 @@ struct order_pair {
 	int order, length;
 };
 
+struct sparse_weight {
+	int pos, value;
+};
+
+#define IS_DENSE_WEIGHT 0
+#define IS_SPARSE_WEIGHT 1
+#define IS_BLOCK 2
+
+struct weight_or_block {
+	int type;
+	int length;
+	union {
+		int *dense_weight;
+		struct sparse_weight *sparse_weight;
+		struct {
+			int order, start;
+		} block;
+	} body;
+};
+
 struct order_spec {
 	int id;
 	Obj obj;
@@ -488,9 +556,21 @@ struct order_spec {
 			int row;
 			int **matrix;
 		} matrix;
+		struct {
+			int length;
+			struct weight_or_block *w_or_b;
+		} composite;
 	} ord;
 };
 
+struct modorder_spec {
+	/* id : ORD_REVGRADLEX, ORD_GRADLEX, ORD_LEX */
+	int id;
+	Obj obj;
+	int len;
+	int *degree_shift;
+};
+
 /* structure for cputime */
 
 struct oEGT {
@@ -512,7 +592,7 @@ struct oEGT {
 
 #define INDEX 100
 
-#if USE_FLOAT
+#if defined(USE_FLOAT)
 typedef float ModNum;
 #define NPrimes 536
 #else
@@ -573,7 +653,7 @@ typedef unsigned int ModNum;
 #endif
 
 /* for setjmp/longjmp compatibility */
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__x86_64)
 #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)
@@ -646,11 +726,16 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWSTR(l) ((l)=(STRING)MALLOC(sizeof(struct oSTRING)),OID(l)=O_STR)
 #define NEWCOMP(c,n) ((c)=(COMP)MALLOC(sizeof(struct oCOMP)+((n)-1)*sizeof(Obj)),OID(c)=O_COMP)
 #define NEWDP(d) ((d)=(DP)MALLOC(sizeof(struct oDP)),OID(d)=O_DP)
+#define NEWDPV(d) ((d)=(DPV)MALLOC(sizeof(struct oDPV)),OID(d)=O_DPV)
 #define NEWUSINT(u) ((u)=(USINT)MALLOC_ATOMIC(sizeof(struct oUSINT)),OID(u)=O_USINT)
 #define NEWERR(e) ((e)=(ERR)MALLOC(sizeof(struct oERR)),OID(e)=O_ERR)
 #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP)
 #define NEWBYTEARRAY(e) ((e)=(BYTEARRAY)MALLOC(sizeof(struct oBYTEARRAY)),OID(e)=O_BYTEARRAY)
 #define NEWQUOTE(e) ((e)=(QUOTE)MALLOC(sizeof(struct oQUOTE)),OID(e)=O_QUOTE)
+#define NEWOPTLIST(l) ((l)=(OPTLIST)MALLOC(sizeof(struct oOPTLIST)),OID(l)=O_OPTLIST)
+#define NEWSYMBOL(l) ((l)=(SYMBOL)MALLOC(sizeof(struct oSYMBOL)),OID(l)=O_SYMBOL)
+#define NEWRANGE(l) ((l)=(RANGE)MALLOC(sizeof(struct oRANGE)),OID(l)=O_RANGE)
+#define NEWTB(l) ((l)=(TB)MALLOC(sizeof(struct oTB)),OID(l)=O_TB,(l)->size=256,(l)->next=0,(l)->body=(char **)MALLOC((l)->size*sizeof(char *)))
 
 #define NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE)))
 #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP)))
@@ -696,6 +781,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define TOGFMMAT(r,c,b,m) (NEWGFMMAT(m),(m)->row=(r),(m)->col=(c),(m)->body=(b))
 #define MKSTR(a,b) (NEWSTR(a),(a)->body=(char *)(b))
 #define MKDP(n,m,d) (NEWDP(d),(d)->nv=(n),BDY(d)=(m))
+#define MKDPV(len,m,d) (NEWDPV(d),(d)->len=(len),BDY(d)=(m))
 #define MKLM(b,l) (!(b)?(l)=0:(NEWLM(l),(l)->body=(b),(l)))
 #define MKGF2N(b,l) (!(b)?(l)=0:(NEWGF2N(l),(l)->body=(b),(l)))
 #define MKGFPN(b,l) (!(b)?(l)=0:(NEWGFPN(l),(l)->body=(b),(l)))
@@ -756,7 +842,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define MKAlg(b,r) \
 (!(b)?((r)=0):NUM(b)?((r)=(Alg)(b)):(NEWAlg(r),BDY(r)=(Obj)(b),(r)))
 
-#if PARI
+#if defined(PARI)
 #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):BIGFLOAT(a)?rtodbl(BDY((BF)a)):0)
 #else
 #define ToReal(a) (!(a)?(double)0.0:REAL(a)?BDY((Real)a):RATN(a)?RatnToReal((Q)a):0.0)
@@ -845,6 +931,7 @@ extern VL CO,ALG;
 extern VL PVL;
 extern R ONER;
 extern Q ONE;
+extern Q TWO;
 extern MQ ONEM;
 extern LM ONELM;
 extern N ONEN;
@@ -970,6 +1057,7 @@ void square_rem_tab_up_gf2n(UP,UP *,UP *);
 void powertabup_gf2n(UP,UP,UP *);
 void find_root_gf2n(UP,GF2N *);
 
+int cmpdl_composite(int,DL,DL);
 int cmpdl_matrix(int,DL,DL);
 int cmpdl_order_pair(int,DL,DL);
 int cmpdl_elim(int,DL,DL);
@@ -998,6 +1086,12 @@ void dtop(VL,VL,DP,P *);
 void ptod(VL,VL,P,DP *);
 void initd(struct order_spec *);
 
+void adddv(VL,DPV,DPV,DPV *);
+void subdv(VL,DPV,DPV,DPV *);
+void muldv(VL,DP,DPV,DPV *);
+void chsgndv(DPV,DPV *);
+int compdv(VL,DPV,DPV);
+
 void _printdp(DP);
 void _dp_sp_mod(DP,DP,int,DP *);
 void _dp_mod(DP,int,NODE,DP *);
@@ -1427,6 +1521,7 @@ void dtestroot(int,int,P,LUM,struct oDUM *,DCP *);
 void dtestroot1(int,int,P,LUM,P *);
 void dtestsq(int,int,P,LUM,P *);
 void dtestsql(P,ML,struct oDUM *,DCP *);
+void ediffp(VL,P,V,P *);
 void estimatelc(VL,Q,DCP,VN,P *);
 void eucum(register int,UM,UM,UM,UM);
 void exthp(VL,P,int,P *);