===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.51
retrieving revision 1.54
diff -u -p -r1.51 -r1.54
--- OpenXM_contrib2/asir2000/include/ca.h	2004/08/18 00:17:02	1.51
+++ OpenXM_contrib2/asir2000/include/ca.h	2004/12/10 07:36:34	1.54
@@ -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.50 2004/07/13 07:59:53 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.53 2004/12/02 13:48:43 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -137,6 +137,7 @@ 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
@@ -164,6 +165,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];
@@ -246,6 +252,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;
@@ -583,6 +598,18 @@ struct modorder_spec {
 	int *degree_shift;
 };
 
+typedef struct oNumberField {
+	int n;
+	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 {
@@ -763,6 +790,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWGFMMAT(l) ((l)=(GFMMAT)MALLOC(sizeof(struct oGF2MAT)),OID(l)=O_GFMMAT)
 #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)
@@ -855,7 +883,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
@@ -1439,6 +1474,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 *);
@@ -1760,6 +1803,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);
@@ -1785,6 +1829,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 *);
@@ -2486,6 +2531,27 @@ 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();
+
+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);