===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- OpenXM_contrib2/asir2000/include/ca.h	2001/09/03 01:04:27	1.20
+++ OpenXM_contrib2/asir2000/include/ca.h	2001/09/11 01:30:32	1.24
@@ -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.19 2001/08/20 09:03:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.23 2001/09/07 08:54:58 noro Exp $ 
 */
 #include <stdio.h>
 
@@ -121,7 +121,7 @@ typedef void * pointer;
 #define N_GF2N 7
 #define N_GFPN 8
 #define N_GFS 9
-#define N_GFSPN 10
+#define N_GFSN 10
 
 #define ORD_REVGRADLEX 0
 #define ORD_GRADLEX 1
@@ -247,12 +247,12 @@ typedef struct oGFS {
 	int cont;
 } *GFS;
 
-typedef struct oGFSPN {
+typedef struct oGFSN {
 	short id;
 	char nid;
 	char pad;
 	struct oUM *body;
-} *GFSPN;
+} *GFSN;
 
 typedef struct oP {
 	short id;
@@ -367,6 +367,20 @@ typedef struct oDL {
 	int d[1];
 } *DL;
 
+/* 
+ * compressed DP
+ */
+
+typedef struct oCDP {
+	int len;
+	struct oCM *body;
+} *CDP;
+
+typedef struct oCM {
+	int index;
+	int c;
+} *CM;
+
 typedef struct oVL {
 	V v;
 	struct oVL *next;
@@ -458,7 +472,7 @@ struct oEGT {
 #define FF_GF2N 2
 #define FF_GFPN 3
 #define FF_GFS 4
-#define FF_GFSPN 5
+#define FF_GFSN 5
 
 /* include interval.h */
 #include "interval.h"
@@ -574,7 +588,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWQ(q) ((q)=(Q)MALLOC(sizeof(struct oQ)),OID(q)=O_N,NID(q)=N_Q)
 #define NEWMQ(q) ((q)=(MQ)MALLOC_ATOMIC(sizeof(struct oMQ)),OID(q)=O_N,NID(q)=N_M)
 #define NEWGFS(q) ((q)=(GFS)MALLOC_ATOMIC(sizeof(struct oGFS)),OID(q)=O_N,NID(q)=N_GFS)
-#define NEWGFSPN(q) ((q)=(GFSPN)MALLOC(sizeof(struct oGFSPN)),OID(q)=O_N,NID(q)=N_GFSPN)
+#define NEWGFSN(q) ((q)=(GFSN)MALLOC(sizeof(struct oGFSN)),OID(q)=O_N,NID(q)=N_GFSN)
 #define NEWP(p) ((p)=(P)MALLOC(sizeof(struct oP)),OID(p)=O_P)
 #define NEWR(r) ((r)=(R)MALLOC(sizeof(struct oR)),OID(r)=O_R,(r)->reduced=0)
 #define NEWLIST(l) ((l)=(LIST)MALLOC(sizeof(struct oLIST)),OID(l)=O_LIST)
@@ -664,8 +678,8 @@ PL(NM(q))=1,BD(NM(q))[0]=ABS(n),DN(q)=0,(q)))
 ((a)?(NEWMQ(b),CONT(b)=(unsigned int)(a),(b)):((b)=0))
 #define MKGFS(a,b) \
 ((NEWGFS(b),CONT(b)=(a),(b)))
-#define MKGFSPN(a,b) \
-((NEWGFSPN(b),BDY(b)=(a),(b)))
+#define MKGFSN(a,b) \
+((DEG(a)>=0)?(NEWGFSN(b),BDY(b)=(a),(b)):((b)=0))
 #define STOMQ(a,b) \
 ((a)?(NEWMQ(b),CONT(b)=(a),(b)):((b)=0))
 #define UTON(u,n) \
@@ -693,8 +707,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)
@@ -1227,13 +1241,13 @@ void chsgngfs(GFS,GFS *);
 void pwrgfs(GFS,Q, GFS *);
 int cmpgfs(GFS,GFS);
 
-void addgfspn(GFSPN,GFSPN,GFSPN *);
-void subgfspn(GFSPN,GFSPN,GFSPN *);
-void mulgfspn(GFSPN,GFSPN,GFSPN *);
-void divgfspn(GFSPN,GFSPN,GFSPN *);
-void chsgngfspn(GFSPN,GFSPN *);
-void pwrgfspn(GFSPN,Q, GFSPN *);
-int cmpgfspn(GFSPN,GFSPN);
+void addgfsn(GFSN,GFSN,GFSN *);
+void subgfsn(GFSN,GFSN,GFSN *);
+void mulgfsn(GFSN,GFSN,GFSN *);
+void divgfsn(GFSN,GFSN,GFSN *);
+void chsgngfsn(GFSN,GFSN *);
+void pwrgfsn(GFSN,Q, GFSN *);
+int cmpgfsn(GFSN,GFSN);
 
 void addalg(Num,Num,Num *);
 void addbf(Num,Num,Num *);