===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.21
retrieving revision 1.28
diff -u -p -r1.21 -r1.28
--- OpenXM_contrib2/asir2000/include/ca.h	2001/09/03 07:01:07	1.21
+++ OpenXM_contrib2/asir2000/include/ca.h	2001/09/17 10:32:41	1.28
@@ -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.20 2001/09/03 01:04:27 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.27 2001/09/17 08:37:31 noro Exp $ 
 */
 #include <stdio.h>
 
@@ -58,6 +58,10 @@
 #include <stdlib.h>
 #endif
 
+#if !defined(VISUAL)
+#include <sys/param.h>
+#endif
+
 #if defined(linux) || (defined(sun) && !defined(SYSV)) || defined(news5000) || (defined(mips) && defined(ultrix))
 #include <alloca.h>
 #endif
@@ -367,6 +371,29 @@ typedef struct oDL {
 	int d[1];
 } *DL;
 
+/* 
+ * compressed DP
+ */
+
+typedef struct oCDP {
+	int len;
+	int psindex;
+	unsigned int *body;
+} *CDP;
+
+typedef struct oCM {
+	int index;
+	int c;
+} *CM;
+
+/* bucket list for DL */
+
+typedef struct oDLBUCKET {
+	int td;
+	struct oNODE *body;
+	struct oDLBUCKET *next;
+} *DLBUCKET;
+
 typedef struct oVL {
 	V v;
 	struct oVL *next;
@@ -474,6 +501,12 @@ typedef unsigned int ModNum;
 #endif
 
 /* general macros */
+#if defined(MAX)
+#undef MAX
+#endif
+#if defined(MIN)
+#undef MIN
+#endif
 #define MAX(a,b) ((a) > (b) ? (a) : (b) )
 #define MIN(a,b) ((a) > (b) ? (b) : (a) )
 #ifdef ABS
@@ -593,6 +626,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWV(v) ((v)=(V)MALLOC(sizeof(struct oV)))
 #define NEWVL(vl) ((vl)=(VL)MALLOC(sizeof(struct oVL)))
 #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))
+#define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))
 
 #define NEWMAT(l) ((l)=(MAT)MALLOC(sizeof(struct oMAT)),OID(l)=O_MAT)
 #define NEWGF2MAT(l) ((l)=(GF2MAT)MALLOC(sizeof(struct oGF2MAT)),OID(l)=O_GF2MAT)
@@ -648,6 +682,8 @@ if(!(r)){NEWNODE(r);(c)=(r);}else{NEWNODE(NEXT(c));(c)
 if(!(r)){NEWMP(r);(c)=(r);}else{NEWMP(NEXT(c));(c)=NEXT(c);}
 #define NEXTMP2(r,c,s) \
 if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);}
+#define NEXTDLBUCKET(r,c) \
+if(!(r)){NEWDLBUCKET(r);(c)=(r);}else{NEWDLBUCKET(NEXT(c));(c)=NEXT(c);}
 
 /* convertors */
 #define NTOQ(n,s,q) \
@@ -693,8 +729,8 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 /* predicates */
 #define NUM(p) (OID(p)==O_N)
 #define RAT(p) (OID(p)==O_R)
-#define INT(q) (!DN((Q)q))
 #define RATN(a) (NID(a)==N_Q)
+#define INT(q) (!(q)||(NUM(q)&&RATN((Num)q)&&!DN((Q)q)))
 #define REAL(a) (NID(a)==N_R)
 #define BIGFLOAT(a) (NID(a)==N_B)
 #define SFF(a) (NID(a)==N_M)
@@ -709,8 +745,13 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 
 #define NV(p) ((p)->nv)
 #define C(p) ((p)->c)
+#if 0
 #define ITOS(p) (((unsigned int)(p))&0x7fffffff)
 #define STOI(i) ((P)((unsigned int)(i)|0x80000000))
+#else
+#define ITOS(p) (((unsigned int)(p)))
+#define STOI(i) ((P)((unsigned int)(i)))
+#endif
 
 /* immediate GFS representation */