===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/poly.c,v
retrieving revision 1.6
retrieving revision 1.14
diff -u -p -r1.6 -r1.14
--- OpenXM_contrib2/asir2000/builtin/poly.c	2001/03/13 01:10:24	1.6
+++ OpenXM_contrib2/asir2000/builtin/poly.c	2001/09/03 01:04:25	1.14
@@ -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/builtin/poly.c,v 1.5 2000/08/22 05:03:59 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/poly.c,v 1.13 2001/07/13 08:25:21 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -63,7 +63,8 @@ void Pp_mag(),Pmaxblen();
 void Pmergelist(), Pch_mv(), Pre_mv(), Pdeglist();
 void Pptomp(),Pmptop();
 void Pptolmp(),Plmptop();
-void Psfptop();
+void Pptosfp(),Psfptop(),Psf_galois_action(),Psf_embed(),Psf_find_root();
+void Psf_minipoly(),Psf_log();
 void Pptogf2n(),Pgf2ntop(),Pgf2ntovect();
 void Pptogfpn(),Pgfpntop();
 void Pfind_root_gf2n();
@@ -100,6 +101,9 @@ void Pis_irred_gf2();
 void Pis_irred_ddd_gf2();
 void Pget_next_fft_prime();
 void Puadj_coef();
+void Preorder();
+void Phomogeneous_part();
+void Phomogeneous_deg();
 void simp_ff(Obj,Obj *);
 void ranp(int,UP *);
 void field_order_ff(N *);
@@ -111,6 +115,9 @@ extern int lm_lazy;
 int current_ff;
 
 struct ftab poly_tab[] = {
+	{"homogeneous_deg",Phomogeneous_deg,-2},
+	{"homogeneous_part",Phomogeneous_part,-3},
+	{"reorder",Preorder,3},
 	{"uadj_coef",Puadj_coef,3},
 	{"ranp",Pranp,2},
 	{"p_mag",Pp_mag,1},
@@ -144,8 +151,14 @@ struct ftab poly_tab[] = {
 	{"ptolmp",Pptolmp,1},
 	{"lmptop",Plmptop,1},
 
-	{"sfptop",Psfptop,1},
+	{"sf_galois_action",Psf_galois_action,2},
+	{"sf_find_root",Psf_find_root,1},
+	{"sf_minipoly",Psf_minipoly,2},
+	{"sf_embed",Psf_embed,3},
+	{"sf_log",Psf_log,1},
 
+	{"ptosfp",Pptosfp,1},
+	{"sfptop",Psfptop,1},
 	{"ptogf2n",Pptogf2n,1},
 	{"gf2ntop",Pgf2ntop,-2},
 	{"gf2ntovect",Pgf2ntovect,1},
@@ -215,6 +228,60 @@ struct ftab poly_tab[] = {
 
 extern V up_var;
 
+void Phomogeneous_part(arg,rp)
+NODE arg;
+P *rp;
+{
+	if ( argc(arg) == 2 )
+		exthp(CO,(P)ARG0(arg),QTOS((Q)ARG1(arg)),rp);
+	else
+		exthpc_generic(CO,(P)ARG0(arg),QTOS((Q)ARG2(arg)),
+			VR((P)ARG1(arg)),rp);
+}
+
+void Phomogeneous_deg(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int d;
+
+	if ( argc(arg) == 1 )
+		d = homdeg((P)ARG0(arg));
+	else
+		d = getchomdeg(VR((P)ARG1(arg)),(P)ARG0(arg));
+	STOQ(d,*rp);
+}
+
+/* 
+	p1 = reorder(p,ovl,nvl) => p1 is 'sorted accoding to nvl.
+*/
+
+void Preorder(arg,rp)
+NODE arg;
+P *rp;
+{
+	VL ovl,nvl,tvl;
+	NODE n;
+
+	for ( ovl = 0, n = BDY((LIST)ARG1(arg)); n; n = NEXT(n) ) {
+		if ( !ovl ) {
+			NEWVL(ovl); tvl = ovl;
+		} else {
+			NEWVL(NEXT(tvl)); tvl = NEXT(tvl);
+		}
+			VR(tvl) = VR((P)BDY(n));
+	}
+	for ( nvl = 0, n = BDY((LIST)ARG2(arg)); n; n = NEXT(n) ) {
+		if ( !nvl ) {
+			NEWVL(nvl); tvl = nvl;
+		} else {
+			NEWVL(NEXT(tvl)); tvl = NEXT(tvl);
+		}
+			VR(tvl) = VR((P)BDY(n));
+	}
+	reorderp(nvl,ovl,(P)ARG0(arg),rp);
+}
+
 /*
 	uadj_coef(F,M,M2)
 	if ( F is a non-negative integer )
@@ -666,7 +733,8 @@ Q *rp;
 	STOQ(ret,*rp);
 }
 
-extern int current_gfs_ext;
+extern P current_gfs_ext;
+extern int current_gfs_p;
 extern int current_gfs_q;
 extern int current_gfs_q1;
 extern int *current_gfs_plus1;
@@ -678,10 +746,12 @@ NODE arg;
 Obj *rp;
 {
 	int ac;
+	int d;
 	Obj mod,defpoly;
 	N n;
 	UP up;
 	UP2 up2;
+	UM dp;
 	Q q,r;
 	P p;
 	NODE n0,n1;
@@ -694,14 +764,8 @@ Obj *rp;
 			error("setmod_ff : invalid argument");
 		switch ( OID(mod) ) {
 			case O_N:
-				if ( SGN((Q)mod) < 0 ) {
-					/* small finite field; primitive root representation */
-					current_ff = FF_GFS;
-					setmod_sf(BD(NM((Q)mod))[0],1);
-				} else {
-					current_ff = FF_GFP;
-					setmod_lm(NM((Q)mod));
-				}
+				current_ff = FF_GFP;
+				setmod_lm(NM((Q)mod));
 				break;
 			case O_P:
 				current_ff = FF_GF2N;
@@ -710,10 +774,12 @@ Obj *rp;
 				error("setmod_ff : invalid argument");
 		}
 	} else if ( ac == 2 ) {
-		mod = (Obj)ARG1(arg);
-		if ( SGN((Q)mod) < 0 ) {
-			error("setmod_ff : not implemented yet");
+		if ( OID(ARG0(arg)) == O_N ) {
+			/* small finite field; primitive root representation */
+			current_ff = FF_GFS;
+			setmod_sf(QTOS((Q)ARG0(arg)),QTOS((Q)ARG1(arg)));
 		} else {
+			mod = (Obj)ARG1(arg);
 			current_ff = FF_GFPN;
 			defpoly = (Obj)ARG0(arg);
 			if ( !mod || !defpoly )
@@ -721,6 +787,14 @@ Obj *rp;
 			setmod_lm(NM((Q)mod));
 			setmod_gfpn((P)defpoly);
 		}
+	} else if ( ac == 3 ) {
+		/* finite extension of a small finite field */
+		current_ff = FF_GFS;
+		setmod_sf(QTOS((Q)ARG0(arg)),QTOS((Q)ARG1(arg)));
+		d = QTOS((Q)ARG2(arg));
+		generate_defpoly_sfum(d,&dp);
+		setmod_gfspn(dp);
+		current_ff = FF_GFSPN;
 	}
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -734,9 +808,18 @@ Obj *rp;
 			MKLIST(list,n0);
 			*rp = (Obj)list; break;
 		case FF_GFS:
-			STOQ(current_gfs_q,q);
-			STOQ(current_gfs_iton[1],r);
-			n0 = mknode(3,ONE,q,r);
+			STOQ(current_gfs_p,q);
+			if ( current_gfs_ext ) {
+				enc_to_p(current_gfs_p,current_gfs_iton[1],
+					VR(current_gfs_ext),&p);
+				n0 = mknode(3,q,current_gfs_ext,p);
+			} else {
+				if ( current_gfs_p == 2 )
+					r = ONE;
+				else
+					STOQ(current_gfs_iton[1],r);
+				n0 = mknode(3,q,current_gfs_ext,r);
+			}
 			MKLIST(list,n0);
 			*rp = (Obj)list; break;
 		default:
@@ -758,6 +841,12 @@ Q *rp;
 			getmod_gf2n(&up2); d = degup2(up2); STOQ(d,*rp); break;
 		case FF_GFPN:
 			getmod_gfpn(&up); STOQ(up->d,*rp); break;
+		case FF_GFS:
+			if ( !current_gfs_ext )
+				*rp = ONE;
+			else
+				*rp = DEG(DC(current_gfs_ext));
+			break;
 		default:
 			error("extdeg_ff : current_ff is not set");
 	}
@@ -774,6 +863,8 @@ Q *rp;
 			getmod_lm(&lm); NTOQ(lm,1,*rp); break;
 		case FF_GF2N:
 			STOQ(2,*rp); break;
+		case FF_GFS:
+			STOQ(current_gfs_p,*rp); break;
 		default:
 			error("characteristic_ff : current_ff is not set");
 	}
@@ -816,6 +907,8 @@ N *order;
 		case FF_GFPN:
 			getmod_lm(&m);
 			getmod_gfpn(&up); pwrn(m,up->d,order); break;
+		case FF_GFS:
+			STON(current_gfs_q,*order); break;
 		default:
 			error("field_order_ff : current_ff is not set");
 	}
@@ -827,6 +920,7 @@ Obj *rp;
 	LM l;
 	GF2N g;
 	GFPN p;
+	GFS s;
 
 	switch ( current_ff ) {
 		case FF_GFP:
@@ -835,6 +929,8 @@ Obj *rp;
 			randomgf2n(&g); *rp = (Obj)g; break;
 		case FF_GFPN:
 			randomgfpn(&p); *rp = (Obj)p; break;
+		case FF_GFS:
+			randomgfs(&s); *rp = (Obj)s; break;
 		default:
 			error("random_ff : current_ff is not set");
 	}
@@ -861,6 +957,7 @@ Obj *rp;
 	GF2N rg,sg;
 	GFPN rpn,spn;
 	GFS rs;
+	GFSPN rspn,sspn;
 	P t;
 	Obj obj;
 
@@ -879,13 +976,17 @@ Obj *rp;
 				ntogfpn((Obj)p,&rpn); simpgfpn((GFPN)rpn,&spn); *rp = (Obj)spn;
 				break;
 			case FF_GFS:
-				if ( current_gfs_ext > 1 ) {
-					error("simp_ff : not implemented yet");
-				} else {
-					ptomp(current_gfs_q,(P)p,&t); mqtogfs(t,&rs);
+				if ( NID((Num)p) == N_GFS )
+					*rp = p;
+				else {
+					ptomp(current_gfs_p,(P)p,&t); mqtogfs(t,&rs);
 					*rp = (Obj)rs;
-				}
+				} 
 				break;
+			case FF_GFSPN:
+				ntogfspn((Obj)p,&rspn); simpgfspn((GFSPN)rspn,&sspn);
+				*rp = (Obj)sspn;
+				break;
 			default:
 				*rp = (Obj)p;
 				break;
@@ -1099,6 +1200,90 @@ P *rp;
 	lmptop((P)ARG0(arg),rp);
 }
 
+void Psf_galois_action(arg,rp)
+NODE arg;
+P *rp;
+{
+	sf_galois_action(ARG0(arg),ARG1(arg),rp);
+}
+
+/*
+  sf_embed(F,B,PM)
+  F : an element of GF(pn)
+  B : the image of the primitive root of GF(pn)
+  PM : order of GF(pm)
+*/
+
+void Psf_embed(arg,rp)
+NODE arg;
+P *rp;
+{
+	int k,pm;
+
+	/* GF(pn)={0,1,a,a^2,...}->GF(pm)={0,1,b,b^2,...}; a->b^k */
+	k = CONT((GFS)ARG1(arg));
+	pm = QTOS((Q)ARG2(arg));
+	sf_embed((P)ARG0(arg),k,pm,rp);
+}
+
+void Psf_log(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int k;
+
+	if ( !ARG0(arg) )
+		error("sf_log : invalid armument");
+	k = CONT((GFS)ARG0(arg));
+	STOQ(k,*rp);
+}
+
+void Psf_find_root(arg,rp)
+NODE arg;
+GFS *rp;
+{
+	P p;
+	Obj t;
+	int d;
+	UM u;
+	int *root;
+
+	p = (P)ARG0(arg);
+	simp_ff((Obj)p,&t); p = (P)t;
+	d = getdeg(VR(p),p);
+	u = W_UMALLOC(d);
+	ptosfum(p,u);
+	root = (int *)ALLOCA(d*sizeof(int));
+	find_rootsf(u,root);
+	MKGFS(IFTOF(root[0]),*rp);
+}
+
+void Psf_minipoly(arg,rp)
+NODE arg;
+P *rp;
+{
+	Obj t;
+	P p1,p2;
+	int d1,d2;
+	UM up1,up2,m;
+
+	p1 = (P)ARG0(arg); simp_ff((Obj)p1,&t); p1 = (P)t;
+	p2 = (P)ARG1(arg); simp_ff((Obj)p2,&t); p2 = (P)t;
+	d1 = getdeg(VR(p1),p1); up1 = W_UMALLOC(d1); ptosfum(p1,up1);
+	d2 = getdeg(VR(p2),p2); up2 = W_UMALLOC(d2); ptosfum(p2,up2);
+	m = W_UMALLOC(d2);
+	minipolysf(up1,up2,m);
+	sfumtop(VR(p2),m,&p1);
+	sfptop(p1,rp);
+}
+
+void Pptosfp(arg,rp)
+NODE arg;
+P *rp;
+{
+	ptosfp(ARG0(arg),rp);
+}
+
 void Psfptop(arg,rp)
 NODE arg;
 P *rp;
@@ -1270,6 +1455,7 @@ P *rp;
 		case FF_GF2N:
 			powermodup_gf2n(p1,&p2); break;
 		case FF_GFPN:
+		case FF_GFS:
 			powermodup(p1,&p2); break;
 		default:
 			error("pwrmod_ff : current_ff is not set");
@@ -1291,6 +1477,7 @@ P *rp;
 		case FF_GF2N:
 			generic_powermodup_gf2n(g,f,(Q)ARG2(arg),&r); break;
 		case FF_GFPN:
+		case FF_GFS:
 			generic_powermodup(g,f,(Q)ARG2(arg),&r); break;
 		default:
 			error("generic_pwrmod_ff : current_ff is not set");
@@ -1318,6 +1505,7 @@ VECT *rp;
 		case FF_GF2N:
 			powertabup_gf2n(f,xp,tab); break;
 		case FF_GFPN:
+		case FF_GFS:
 			powertabup(f,xp,tab); break;
 		default:
 			error("pwrtab_ff : current_ff is not set");