===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/sp,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM_contrib2/asir2000/lib/sp	2000/08/22 05:04:23	1.8
+++ OpenXM_contrib2/asir2000/lib/sp	2003/02/07 09:25:58	1.11
@@ -45,13 +45,14 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.7 2000/08/21 08:31:43 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.10 2002/06/21 00:34:21 noro Exp $ 
 */
 /* 
 	sp : functions related to algebraic number fields
 
 	Revision History:
 
+	2001/10/12    noro    if USE_PARI_FACTOR is nonzero, pari factor is called
 	2000/03/10    noro    fixed several bugs around gathering algebraic numbers
 	1999/08/24    noro    modified for 1999 release version
 */
@@ -60,7 +61,22 @@
 
 extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$
 extern Ord$
+extern USE_PARI_FACTOR$
 
+/* gen_sp can handle non-monic poly */
+
+def gen_sp(P)
+{
+	P = ptozp(P);
+	V = var(P);
+	D = deg(P,V);
+	LC = coef(P,D,V);
+	F = LC^(D-1)*subst(P,V,V/LC);
+	/* F must be monic */
+	L = sp(F);
+	return cons(map(subst,car(L),V,LC*V),cdr(L));
+}
+
 def sp(P)
 {
 	RESTIME=UFTIME=GCDTIME=SQTIME=0;
@@ -592,6 +608,21 @@ def simpcoef(P) {
 }
 
 def ufctrhint_heuristic(P,HINT,PP,SHIFT) {
+	if ( USE_PARI_FACTOR )
+		return pari_ufctr(P);
+	else
+		return asir_ufctrhint_heuristic(P,HINT,PP,SHIFT);
+}
+
+def pari_ufctr(P) {
+	F = pari(factor,P);
+	S = size(F);
+	for ( I = S[0]-1, R = []; I >= 0; I-- )
+		R = cons(vtol(F[I]),R);
+	return cons([1,1],R);
+}
+
+def asir_ufctrhint_heuristic(P,HINT,PP,SHIFT) {
 	V = var(P); D = deg(P,V);
 	if ( D == HINT )
 		return [[P,1]];
@@ -1310,8 +1341,12 @@ def resfctr(F,L,V,N)
 	N = ptozp(N);
 	V0 = var(N);
 	DN = diff(N,V0);
+	LC = coef(N,deg(N,V0),V0);
+	LCD = coef(DN,deg(DN,V0),V0);
 	for ( I = 0, J = 2, Len = deg(N,V0)+1; I < 5; J++ ) {
 		M = prime(J);
+		if ( !(LC%M) || !(LCD%M))
+			continue;
 		G = gcd(N,DN,M);
 		if ( !deg(G,V0) ) {            
 			I++;