===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.49
retrieving revision 1.60
diff -u -p -r1.49 -r1.60
--- OpenXM_contrib2/asir2000/include/ca.h	2004/05/14 06:02:54	1.49
+++ OpenXM_contrib2/asir2000/include/ca.h	2005/11/12 08:10:56	1.60
@@ -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.48 2004/03/10 02:41:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.59 2005/11/06 01:27:28 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -123,7 +123,11 @@ typedef void * pointer;
 #define O_RANGE 20
 #define O_TB 21
 #define O_DPV 22
+#define O_QUOTEARG 23
 #define O_VOID -1
+/* IMAT */
+#define O_IMAT 24
+/* IMAT */
 
 #define N_Q 0
 #define N_R 1
@@ -136,11 +140,16 @@ typedef void * pointer;
 #define N_GFPN 8
 #define N_GFS 9
 #define N_GFSN 10
+#define N_DA 11
 
 #define ORD_REVGRADLEX 0
 #define ORD_GRADLEX 1
 #define ORD_LEX 2
 
+typedef enum {
+	A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func
+} farg_type;
+
 #if defined(LONG_IS_32BIT)
 #if defined(VISUAL)
 typedef _int64 L;
@@ -159,6 +168,11 @@ typedef struct oN {
 	unsigned int b[1];
 } *N;
 
+typedef struct oZ {
+	int p;
+	unsigned int b[1];
+} *Z;
+
 typedef struct oUP2 {
 	int w;
 	unsigned int b[1];
@@ -241,6 +255,15 @@ typedef struct oGFPN {
 	struct oUP *body;
 } *GFPN;
 
+typedef struct oDAlg {
+	short id;
+	char nid;
+	char pad;
+	struct oDP *nm;
+	struct oQ *dn;
+} *DAlg;
+
+
 typedef struct oNum {
 	short id;
 	char nid;
@@ -303,6 +326,28 @@ typedef struct oGF2MAT {
 	unsigned int **body;
 } *GF2MAT, *GFMMAT;
 
+/* IMAT */
+#define IMATCH 64
+
+typedef struct oIENT {
+	int cr;
+	int row, col;
+	pointer *body;
+} IENT;
+
+typedef struct oIMATC {
+	pointer *fore;
+	pointer *next;
+	IENT ient[IMATCH];
+} *IMATC;
+
+typedef struct oIMAT {
+	short id;
+	int row, col, clen;
+	pointer *root;
+	pointer *toor;
+} *IMAT;
+/* IMAT */
 typedef struct oLIST {
 	short id;
 	short pad;
@@ -366,6 +411,13 @@ typedef struct oQUOTE {
 	pointer body;
 } *QUOTE;
 
+typedef struct oQUOTEARG {
+	short id;
+	short pad;
+	farg_type type;
+	pointer body;
+} *QUOTEARG;
+
 typedef struct oOPTLIST {
 	short id;
 	short pad;
@@ -571,6 +623,19 @@ struct modorder_spec {
 	int *degree_shift;
 };
 
+typedef struct oNumberField {
+	int n;
+	int psn;
+	int dim;
+	VL vl;
+	P *defpoly;
+	DP *mb;
+	DP *ps;
+	struct oDAlg *one;
+	NODE ind;
+	struct order_spec *spec;
+} *NumberField;
+
 /* structure for cputime */
 
 struct oEGT {
@@ -732,6 +797,7 @@ 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 NEWQUOTEARG(e) ((e)=(QUOTEARG)MALLOC(sizeof(struct oQUOTEARG)),OID(e)=O_QUOTEARG)
 #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)
@@ -748,8 +814,13 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #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)
 #define NEWGFMMAT(l) ((l)=(GFMMAT)MALLOC(sizeof(struct oGF2MAT)),OID(l)=O_GFMMAT)
+/* IMAT */
+#define NEWIMAT(l) ((l)=(IMAT)MALLOC(sizeof(struct oIMAT)),OID(l)=O_IMAT,l->clen=0,l->root=0,l->toor=0)
+#define NEWIENT(l) ((l)=(IMATC)MALLOC(sizeof(struct oIMATC)),l->fore=0,l->next=0)
+/* IMAT */
 #define NEWReal(q) ((q)=(Real)MALLOC_ATOMIC(sizeof(struct oReal)),OID(q)=O_N,NID(q)=N_R)
 #define NEWAlg(r) ((r)=(Alg)MALLOC(sizeof(struct oAlg)),OID(r)=O_N,NID(r)=N_A)
+#define NEWDAlg(r) ((r)=(DAlg)MALLOC(sizeof(struct oDAlg)),OID(r)=O_N,NID(r)=N_DA)
 #define NEWBF(q,l) ((q)=(BF)MALLOC_ATOMIC(TRUESIZE(oBF,(l)-1,long)),OID(q)=O_N,NID(q)=N_B)
 #define NEWC(r) ((r)=(C)MALLOC(sizeof(struct oC)),OID(r)=O_N,NID(r)=N_C)
 #define NEWLM(r) ((r)=(LM)MALLOC(sizeof(struct oLM)),OID(r)=O_N,NID(r)=N_LM)
@@ -761,7 +832,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 ((d)=(DL)MALLOC_ATOMIC(TRUESIZE(oDL,(n)-1,int)))
 
 #define MKP(v,dc,p) \
-(!DEG(dc)?((p)=COEF(dc)):(NEWP(p),VR(p)=(v),DC(p)=(dc),(p)))
+((!DEG(dc)&&!NEXT(dc))?((p)=COEF(dc)):(NEWP(p),VR(p)=(v),DC(p)=(dc),(p)))
 #define MKV(v,p) \
 (NEWP(p),VR(p)=(v),NEWDC(DC(p)),\
 DEG(DC(p))=ONE,COEF(DC(p))=(P)ONE,NEXT(DC(p))=0)
@@ -791,6 +862,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKBYTEARRAY(m,l) \
 (NEWBYTEARRAY(m),(m)->len=(l),(m)->body=(char *)MALLOC_ATOMIC((l)),bzero((m)->body,(l)))
 #define MKQUOTE(q,b) (NEWQUOTE(q),(q)->body=(pointer)(b))
+#define MKQUOTEARG(q,t,b) (NEWQUOTEARG(q),(q)->type=(t),(q)->body=(pointer)(b))
 
 #define NEXTDC(r,c) \
 if(!(r)){NEWDC(r);(c)=(r);}else{NEWDC(NEXT(c));(c)=NEXT(c);}
@@ -841,7 +913,14 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define MKReal(a,b) (!(a)?((b)=0):(NEWReal(b),BDY(b)=(a),(b)))
 #define MKAlg(b,r) \
 (!(b)?((r)=0):NUM(b)?((r)=(Alg)(b)):(NEWAlg(r),BDY(r)=(Obj)(b),(r)))
+#define MKDAlg(dp,den,r) (NEWDAlg(r),(r)->nm = (dp),(r)->dn=(den))
 
+#define IMM_MAX 1073741823
+#define IMM_MIN -1073741823
+
+#define SL(n) ((n)->p)
+#define ZALLOC(d) ((Z)MALLOC_ATOMIC(TRUESIZE(oZ,(d)-1,int)))
+
 #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
@@ -944,9 +1023,6 @@ extern const int sprime[];
 extern int sprime[];
 #endif
 
-extern int lprime_size;
-extern int *lprime;
-
 extern void (*addnumt[])();
 extern void (*subnumt[])();
 extern void (*mulnumt[])();
@@ -1217,7 +1293,7 @@ void copyn(N,int,int *);
 void kmulnmain(N,N,N *);
 int qcoefp(Obj);
 int qcoefr(Obj);
-int get_allocwords(void);
+long get_allocwords(void);
 double get_clock(void);
 void get_eg(struct oEGT *);
 void printtime(struct oEGT *,struct oEGT *,double);
@@ -1425,6 +1501,14 @@ void chsgngfsn(GFSN,GFSN *);
 void pwrgfsn(GFSN,Q, GFSN *);
 int cmpgfsn(GFSN,GFSN);
 
+void adddalg(DAlg,DAlg,DAlg *);
+void subdalg(DAlg,DAlg,DAlg *);
+void muldalg(DAlg,DAlg,DAlg *);
+void divdalg(DAlg,DAlg,DAlg *);
+void chsgndalg(DAlg,DAlg *);
+void pwrdalg(DAlg,Q, DAlg *);
+int cmpdalg(DAlg,DAlg);
+
 void addalg(Num,Num,Num *);
 void addbf(Num,Num,Num *);
 void addcplx(Num,Num,Num *);
@@ -1746,6 +1830,7 @@ void savep(FILE *,P);
 void savegf2n(FILE *,GF2N);
 void savegfpn(FILE *,GFPN);
 void savegfs(FILE *,GFS);
+void savedalg(FILE *,DAlg);
 void savelm(FILE *,LM);
 void savemi(FILE *,MQ);
 void savecplx(FILE *,C);
@@ -1771,6 +1856,7 @@ void loadgf2n(FILE *,GF2N *);
 void loadgfpn(FILE *,GFPN *);
 void loadgfs(FILE *,GFS *);
 void loadgfsn(FILE *,GFSN *);
+void loaddalg(FILE *,DAlg *);
 void loadlm(FILE *,LM *);
 void loadmi(FILE *,MQ *);
 void loadcplx(FILE *,C *);
@@ -2472,6 +2558,49 @@ void afctrmain(VL vl,P p0,P p,int init,DCP *dcp);
 int divtmp(VL vl,int mod,P p1,P p2,P *q);
 int divtdcmp(VL vl,int mod,P p1,P p2,P *q);
 void GC_gcollect();
+
+/* IMAT */
+void Pnewimat(NODE, IMAT *);
+void PChsgnI(NODE, IMAT *);
+void Pm2Im(NODE, IMAT *);
+void PIm2m(NODE, MAT *);
+
+void AddMatI(VL, IMAT, IMAT, IMAT *);
+void MulMatI(VL, IMAT, IMAT, IMAT *);
+void MulMatG(VL, Obj, Obj, Obj *);
+void MulrMatI(VL, Obj, Obj, Obj *);
+void MulMatS(VL, IMAT, IMAT, IMAT *);
+void PutIent(IMAT, int, int, Obj);
+void GetIent(IMAT, int, int, Obj);
+void GetIbody(IMAT, int, int, Obj *);
+void ChsgnI(IMAT, IMAT *c);
+void AppendIent(IMAT, int, int, Obj);
+void MEnt(int, int, int, Obj, IENT *);
+void GetForeIent(IMATC *, IENT *, int *);
+void GetNextIent(IMATC *, IENT *, int *);
+void SubMatI(VL, IMAT, IMAT, IMAT *);
+/* IMAT */
+
+Z stoz(int c);
+Z utoz(unsigned int c);
+Z qtoz(Q n);
+Q ztoq(Z n);
+Z chsgnz(Z n);
+Z simpz(Z n);
+Z dupz(Z n);
+Z absz(Z n);
+Z addz(Z n1,Z n2);
+Z subz(Z n1,Z n2);
+Z mulz(Z n1,Z n2);
+Z divsz(Z n1,Z n2);
+Z divz(Z n1,Z n2,Z *rem);
+Z gcdz(Z n1,Z n2);
+Z gcdz_cofactor(Z n1,Z n2,Z *c1,Z *c2);
+Z estimate_array_gcdz(Z *a,int n);
+Z array_gcdz(Z *a,int n);
+void mkwcz(int k,int l,Z *t);
+int remzi(Z n,int m);
+
 
 #if 0 && !defined(VISUAL)
 void bzero(const void *,int);