===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.39
retrieving revision 1.46
diff -u -p -r1.39 -r1.46
--- OpenXM_contrib2/asir2000/include/ca.h	2003/11/08 01:12:03	1.39
+++ OpenXM_contrib2/asir2000/include/ca.h	2004/03/03 09:25:30	1.46
@@ -45,7 +45,7 @@
  * 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.38 2003/10/20 07:18:42 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.45 2004/02/09 08:23:29 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -119,6 +119,9 @@ typedef void * pointer;
 #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_VOID -1
 
 #define N_Q 0
@@ -361,6 +364,26 @@ typedef struct oOPTLIST {
 	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;
@@ -491,6 +514,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;
@@ -505,6 +548,10 @@ struct order_spec {
 			int row;
 			int **matrix;
 		} matrix;
+		struct {
+			int length;
+			struct weight_or_block *w_or_b;
+		} composite;
 	} ord;
 };
 
@@ -590,7 +637,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)
@@ -669,6 +716,9 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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)))
@@ -989,6 +1039,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);
@@ -1446,6 +1497,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 *);