===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/fctr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.12
diff -u -p -r1.1.1.1 -r1.12
--- OpenXM_contrib2/asir2000/builtin/fctr.c	1999/12/03 07:39:07	1.1.1.1
+++ OpenXM_contrib2/asir2000/builtin/fctr.c	2002/01/13 07:11:46	1.12
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/builtin/fctr.c,v 1.1.1.1 1999/11/10 08:12:25 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.11 2002/01/09 07:45:40 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 
@@ -6,10 +54,13 @@ void Pfctr(), Pgcd(), Pgcdz(), Plcm(), Psqfr(), Pufctr
 void Pptozp(), Pcont();
 void Pafctr(), Pagcd();
 void Pmodsqfr(),Pmodfctr(),Pddd(),Pnewddd(),Pddd_tab();
+void Psfsqfr(),Psfbfctr(),Psfufctr(),Psfmintdeg();
 void Pirred_check(), Pnfctr_mod();
 
+void sfmintdeg(VL vl,P fx,int dy,int c,P *fr);
+
 struct ftab fctr_tab[] = {
-	{"fctr",Pfctr,1},
+	{"fctr",Pfctr,-2},
 	{"gcd",Pgcd,-3},
 	{"gcdz",Pgcdz,2},
 	{"lcm",Plcm,2},
@@ -21,6 +72,10 @@ struct ftab fctr_tab[] = {
 	{"agcd",Pagcd,3},
 	{"modsqfr",Pmodsqfr,2},
 	{"modfctr",Pmodfctr,2},
+	{"sfsqfr",Psfsqfr,1},
+	{"sfufctr",Psfufctr,1},
+	{"sfbfctr",Psfbfctr,-4},
+	{"sfmintdeg",Psfmintdeg,5},
 #if 0
 	{"ddd",Pddd,2},
 	{"newddd",Pnewddd,2},
@@ -38,7 +93,12 @@ LIST *rp;
 	DCP dc;
 
 	asir_assert(ARG0(arg),O_P,"fctr");
-	fctrp(CO,(P)ARG0(arg),&dc);
+	if ( argc(arg) == 1 )
+		fctrp(CO,(P)ARG0(arg),&dc);
+	else {
+		asir_assert(ARG1(arg),O_P,"fctr");
+		fctr_wrt_v_p(CO,(P)ARG0(arg),VR((P)ARG1(arg)),&dc);
+	}
 	dcptolist(dc,rp);
 }
 
@@ -58,7 +118,7 @@ P *rp;
 	else if ( !p2 )
 		*rp = p1;
 	else if ( !qpcheck((Obj)p1) || !qpcheck((Obj)p2) )
-		error("gcd : invalid argument");
+		gcdprsp(CO,p1,p2,rp);
 	else if ( argc(arg) == 2 )
 		ezgcdp(CO,p1,p2,rp);
 	else {
@@ -264,16 +324,85 @@ LIST *rp;
 	dcptolist(dc,rp);
 }
 
+void Psfsqfr(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	DCP dc;
+
+	sfsqfr(ARG0(arg),&dc);
+	dcptolist(dc,rp);
+}
+
+void Psfufctr(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	DCP dc;
+
+	fctrsf(ARG0(arg),&dc);
+	dcptolist(dc,rp);
+}
+
+void Psfbfctr(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	V x,y;
+	DCP dc,dct;
+	P t;
+	struct oVL vl1,vl2;
+	VL vl;
+	int degbound;
+
+	x = VR((P)ARG1(arg));
+	y = VR((P)ARG2(arg));
+	vl1.v = x; vl1.next = &vl2;
+	vl2.v = y; vl2.next = 0;
+	vl = &vl1;
+	if ( argc(arg) == 4 )
+		degbound = QTOS((Q)ARG3(arg));
+	else
+		degbound = -1;
+
+	sfbfctr((P)ARG0(arg),x,y,degbound,&dc);
+	for ( dct = dc; dct; dct = NEXT(dct) ) {
+		reorderp(CO,vl,COEF(dct),&t); COEF(dct) = t;
+	}
+	dcptolist(dc,rp);
+}
+
+void Psfmintdeg(arg,rp)
+NODE arg;
+P *rp;
+{
+	V x,y;
+	P r;
+	struct oVL vl1,vl2;
+	VL vl;
+	int dy,c;
+
+	x = VR((P)ARG1(arg));
+	y = VR((P)ARG2(arg));
+	vl1.v = x; vl1.next = &vl2;
+	vl2.v = y; vl2.next = 0;
+	vl = &vl1;
+	dy = QTOS((Q)ARG3(arg));
+	c = QTOS((Q)ARG4(arg));
+	sfmintdeg(vl,(P)ARG0(arg),dy,c,&r);
+	reorderp(CO,vl,r,rp);
+}
+
 void Pmodsqfr(arg,rp)
 NODE arg;
 LIST *rp;
 {
 	DCP dc;
 
-	if ( !dc ) {
+	if ( !ARG0(arg) ) {
 		NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
-	}
-	modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),SQFR,&dc);
+	} else
+		modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),SQFR,&dc);
 	dcptolist(dc,rp);
 }
 
@@ -283,10 +412,10 @@ LIST *rp;
 {
 	DCP dc;
 
-	if ( !dc ) {
+	if ( !ARG0(arg) ) {
 		NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
-	}
-	modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),DDD,&dc);
+	} else
+		modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),DDD,&dc);
 	dcptolist(dc,rp);
 }
 
@@ -294,12 +423,12 @@ void Pnewddd(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	DCP dc;
+	DCP dc=0;
 
-	if ( !dc ) {
+	if ( !ARG0(arg) ) {
 		NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
-	}
-	modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),NEWDDD,&dc);
+	} else 
+		modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),NEWDDD,&dc);
 	dcptolist(dc,rp);
 }