===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/fctr.c,v
retrieving revision 1.16
retrieving revision 1.20
diff -u -p -r1.16 -r1.20
--- OpenXM_contrib2/asir2000/builtin/fctr.c	2002/10/31 03:59:50	1.16
+++ OpenXM_contrib2/asir2000/builtin/fctr.c	2004/05/13 12:12:43	1.20
@@ -45,13 +45,13 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/fctr.c,v 1.15 2002/10/23 07:54:57 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/fctr.c,v 1.19 2003/01/13 06:40:40 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 void Pfctr(), Pgcd(), Pgcdz(), Plcm(), Psqfr(), Pufctrhint();
-void Pptozp(), Pcont();
+void Pptozp(), Pcont(), Psfcont();
 void Pafctr(), Pagcd();
 void Pmodsqfr(),Pmodfctr(),Pddd(),Pnewddd(),Pddd_tab();
 void Psfsqfr(),Psffctr(),Psfbfctr(),Psfufctr(),Psfmintdeg(),Psfgcd();
@@ -70,6 +70,7 @@ struct ftab fctr_tab[] = {
 	{"ufctrhint",Pufctrhint,2},
 	{"ptozp",Pptozp,1},
 	{"cont",Pcont,-2},
+	{"sfcont",Psfcont,-2},
 	{"afctr",Pafctr,2},
 	{"agcd",Pagcd,3},
 	{"modsqfr",Pmodsqfr,2},
@@ -296,14 +297,86 @@ P *rp;
 	}
 }
 
+void Psfcont(arg,rp)
+NODE arg;
+P *rp;
+{
+	DCP dc;
+	MP mp;
+	int m;
+	Obj obj;
+	P p,p1;
+	P *l;
+	V v;
+
+	obj = (Obj)ARG0(arg);
+	if ( !obj || NUM(obj) )
+		*rp = (P)obj;
+	else if ( OID(obj) == O_P ) {
+		p = (P)obj;
+		if ( argc(arg) == 2 ) {
+			v = VR((P)ARG1(arg));
+			change_mvar(CO,p,v,&p1);
+			if ( VR(p1) != v ) {
+				*rp = p1; return;
+			} else
+				p = p1;
+		}
+		for ( m = 0, dc = DC(p); dc; dc = NEXT(dc), m++ );
+		l = (P *)ALLOCA(m*sizeof(P));
+		for ( m = 0, dc = DC(p); dc; dc = NEXT(dc), m++ )
+			l[m] = COEF(dc);
+		gcdsf(CO,l,m,rp);
+	} else if ( OID(obj) == O_DP ) {
+		for ( m = 0, mp = BDY((DP)obj); mp; mp = NEXT(mp), m++ );
+		l = (P *)ALLOCA(m*sizeof(P));
+		for ( m = 0, mp = BDY((DP)obj); mp; mp = NEXT(mp), m++)
+			l[m] = mp->c;
+		gcdsf(CO,l,m,rp);
+	}
+}
+
 void Pptozp(arg,rp)
 NODE arg;
 P *rp;
 {
 	Q t;
 
+    NODE opt,tt,p;
+    NODE n,n0;
+    char *key;
+    int get_factor=0;
+
 	asir_assert(ARG0(arg),O_P,"ptozp");
+
+    /* analyze the option */
+    if ( argc(arg) == 2 && OID(ARG1(arg)) == O_OPTLIST ) {
+      opt = BDY((OPTLIST)ARG1(arg));
+      for ( tt = opt; tt; tt = NEXT(tt) ) {
+        p = BDY((LIST)BDY(tt));
+        key = BDY((STRING)BDY(p));
+        /*  value = (Obj)BDY(NEXT(p)); */
+        if ( !strcmp(key,"factor") )  get_factor=1;
+        else {
+          error("ptozp: unknown option.");
+        }
+      }
+    }
+
 	ptozp((P)ARG0(arg),1,&t,rp);
+
+    /* printexpr(NULL,t); */
+	/* if the option factor is given, then it returns the answer
+       in the format [zpoly, num] where num*zpoly is equal to the argument.*/
+    if (get_factor) {
+      n0 = n0 = 0;
+      NEXTNODE(n0,n);
+      BDY(n) = (pointer) *rp;
+      NEXTNODE(n0,n);
+      BDY(n) = (pointer) t;
+      if (n0) NEXT(n) = 0;
+      MKLIST(*((LIST *)rp),n0);
+    }
 }
 
 void Pafctr(arg,rp)
@@ -345,17 +418,36 @@ int Divum();
 
 UM *resberle();
 
+void reduce_sfdc(DCP sfdc, DCP *dc);
+
 void Pmodfctr(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	DCP dc;
-	int mod;
+	DCP dc,dcu;
+	int mod,i,t;
+	P p;
+	Obj u;
+	VL vl;
 
 	mod = QTOS((Q)ARG1(arg));
 	if ( mod < 0 )
 		error("modfctr : invalid modulus");
-	modfctrp(ARG0(arg),mod,NEWDDD,&dc);
+	p = (P)ARG0(arg);
+	clctv(CO,p,&vl);
+	if ( !vl ) {
+		NEWDC(dc); COEF(dc) = p; DEG(dc) = ONE; NEXT(dc) = 0;
+	} else if ( !NEXT(vl) )
+		modfctrp(ARG0(arg),mod,NEWDDD,&dc);
+	else {
+		/* XXX 16384 should be replaced by a macro */
+		for ( i = 0, t = 1; t*mod < 16384; t *= mod, i++ );
+		current_ff = FF_GFS;
+		setmod_sf(mod,i);
+		simp_ff((Obj)p,&u);
+		mfctrsf(CO,(P)u,&dcu);
+		reduce_sfdc(dcu,&dc);
+	}
 	if ( !dc ) {
 		NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
 	}
@@ -571,4 +663,61 @@ VECT *rp;
 	for ( i = 0; i < n; i++ )
 		umtop(v,r[i],(P *)&BDY(result)[i]);
 	*rp = result;
+}
+
+void reduce_sfdc(DCP sfdc,DCP *dcr)
+{
+	P c,t,s,u,f;
+	DCP dc0,dc,tdc;
+	DCP *a;
+	int i,j,n;
+
+	if ( !current_gfs_ext ) {
+		/* we simply apply sfptop() */
+		for ( dc0 = 0; sfdc; sfdc = NEXT(sfdc) ) {
+			NEXTDC(dc0,dc);
+			DEG(dc) = DEG(sfdc);
+			sfptop(COEF(sfdc),&COEF(dc));
+		}
+		NEXT(dc) = 0;
+		*dcr = dc0;
+		return;
+	}
+
+	if ( NUM(COEF(sfdc)) ) {
+		sfptop(COEF(sfdc),&c);
+		sfdc = NEXT(sfdc);
+	} else
+		c = (P)ONE;
+
+	for ( n = 0, tdc = sfdc; tdc; tdc = NEXT(tdc), n++ );
+	a = (DCP *)ALLOCA(n*sizeof(DCP));
+	for ( i = 0, tdc = sfdc; i < n; tdc = NEXT(tdc), i++ )
+		a[i] = tdc;
+
+	dc0 = 0; NEXTDC(dc0,dc); DEG(dc) = ONE; COEF(dc) = c;
+	for ( i = 0; i < n; i++ ) {
+		if ( !a[i] )
+			continue;
+		t = COEF(a[i]);
+		f = t;
+		while ( 1 ) {
+			sf_galois_action(t,ONE,&s);
+			for ( j = i; j < n; j++ )
+				if ( a[j] && !compp(CO,s,COEF(a[j])) )
+					break;
+			if ( j == n )
+				error("reduce_sfdc : cannot happen");
+			if ( j == i ) {
+				NEXTDC(dc0,dc); DEG(dc) = DEG(a[i]);
+				sfptop(f,&COEF(dc));
+				break;
+			} else {
+				mulp(CO,f,s,&u); f = u;
+				t = s;
+				a[j] = 0;
+			}
+		}
+	}
+	*dcr = dc0;
 }