===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.33
retrieving revision 1.46
diff -u -p -r1.33 -r1.46
--- OpenXM_contrib2/asir2000/include/ca.h	2002/01/28 00:54:43	1.33
+++ OpenXM_contrib2/asir2000/include/ca.h	2004/03/03 09:25:30	1.46
@@ -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.32 2001/12/25 02:39:03 noro 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>
 
 #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,10 @@ 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_VOID -1
 
 #define N_Q 0
@@ -131,7 +140,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;
@@ -349,6 +358,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 +449,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 +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;
@@ -488,6 +548,10 @@ struct order_spec {
 			int row;
 			int **matrix;
 		} matrix;
+		struct {
+			int length;
+			struct weight_or_block *w_or_b;
+		} composite;
 	} ord;
 };
 
@@ -512,7 +576,7 @@ struct oEGT {
 
 #define INDEX 100
 
-#if USE_FLOAT
+#if defined(USE_FLOAT)
 typedef float ModNum;
 #define NPrimes 536
 #else
@@ -573,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)
@@ -651,6 +715,10 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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)))
@@ -756,7 +824,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 +913,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 +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);
@@ -1427,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 *);
@@ -1867,8 +1938,8 @@ int berlekampsf(UM p,int df,UM *tab,UM *r);
 void minipolysf(UM f,UM p,UM mp);
 int find_rootsf(UM p,int *root);
 void canzassf(UM f,int d,UM *r);
-void sfhensel(int count,P f,V x,int degbound,GFS *evp,P *sfp,ML *listp);
-int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp);
+void sfhensel(int count,P f,V x,V y,int degbound,GFS *evp,P *sfp,ML *listp);
+int sfberle(V x,V y,P f,int count,GFS *ev,DCP *dcp);
 void sfgcdgen(P f,ML blist,ML *clistp);
 void sfhenmain2(BM f,UM g0,UM h0,int dy,BM *gp);
 void ptosfbm(int dy,P f,BM fl);