===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/sp,v
retrieving revision 1.8
retrieving revision 1.17
diff -u -p -r1.8 -r1.17
--- OpenXM_contrib2/asir2000/lib/sp	2000/08/22 05:04:23	1.8
+++ OpenXM_contrib2/asir2000/lib/sp	2016/02/04 04:17:21	1.17
@@ -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.16 2010/07/14 04:48:14 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
 */
@@ -59,8 +60,23 @@
 #include "defs.h"
 
 extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$
-extern Ord$
+extern SpOrd$
+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;
@@ -195,6 +211,10 @@ def flatmf(L) {
 def af(P,AL)
 {
 	RESTIME=UFTIME=GCDTIME=SQTIME=0;
+    V = var(P);
+    LC = coef(P,deg(P,V),V);
+    if ( ntype(LC) != 1 )
+      P = simpalg(1/LC*P);
 	S = reverse(asq(P));
 	for ( L = []; S != []; S = cdr(S) ) {
 		FM = car(S); F = FM[0]; M = FM[1];
@@ -211,6 +231,10 @@ def af_sp(P,AL,HINT)
 {
 	if ( !P || type(P) == NUM )
 		return [P];
+    V = var(P);
+    LC = coef(P,deg(P,V),V);
+    if ( ntype(LC) != 1 )
+      P = simpalg(1/LC*P);
 	P1 = simpcoef(simpalg(P));
 	return af_spmain(P1,AL,1,HINT,P1,[]);
 }
@@ -592,6 +616,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]];
@@ -628,6 +667,15 @@ def ufctrhint2(P,HINT,PP,AL)
 		return [[P,1]];
 	if ( AL == [] )
 		return ufctrhint(P,HINT);
+	
+	/* if P != norm(PP) then call the generic ufctrhint() */
+	for ( T = AL, E = 1; T != []; T = cdr(T) ) {
+		D = defpoly(car(T)); E *= deg(D,var(D));
+	}
+	if ( E*deg(PP,var(PP)) != deg(P,var(P)) )
+		return ufctrhint(P,HINT);
+
+	/* P = norm(PP) */
 	L = resfctr(algptorat(PP),map(defpoly,AL),map(algtorat,AL),P);
 	for ( T = reverse(L[1]), DL = []; T != []; T = cdr(T) )
 		DL = cons(deg(car(car(T)),a_),DL);
@@ -772,8 +820,13 @@ def norm_ch_lag(V,VM,P,P0) {
 
 def cr_gcda(P1,P2)
 {
-	if ( !(V = var(P1)) || !var(P2) )
+	if ( !P1 )
+		return P2;
+	if ( !P2 )
+		return P1;
+	if ( !var(P1) || !var(P2) )
 		return 1;
+	V = var(P1);
 	EXT = union_sort(getalgtreep(P1),getalgtreep(P2));
 	if ( EXT == [] )
 		return gcd(P1,P2);
@@ -801,7 +854,7 @@ def cr_gcda(P1,P2)
 				break;
 		if ( J != length(DL) )
 			continue;
-		Ord = 2; NOSUGAR = 1;
+		SpOrd = 2; NOSUGAR = 1;
 		T = ag_mod(G1 % MOD,G2 % MOD,ML,VL,MOD);
 		if ( dp_gr_print() )
 			print(".");
@@ -1015,7 +1068,7 @@ def ag_mod(F1,F2,D,VL,MOD)
 	VL = cons(V,VL); B = append([F1,F2],D); N = length(VL);
     while ( 1 ) {
 		FLAGS = dp_gr_flags(); dp_gr_flags(["Reverse",1,"NoSugar",1]);
-		G = dp_gr_mod_main(B,VL,0,MOD,Ord);
+		G = dp_gr_mod_main(B,VL,0,MOD,SpOrd);
 		dp_gr_flags(FLAGS);
 		if ( length(G) == 1 )
 			return 1;
@@ -1249,9 +1302,9 @@ def ag_mod_single6(F1,F2,D,MOD)
 
 def inverse_by_gr_mod(C,D,MOD)
 {
-	Ord = 2;
+	SpOrd = 2;
 	dp_gr_flags(["NoSugar",1]);
-	G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,Ord);
+	G = dp_gr_mod_main(cons(x*C-1,D),cons(x,vars(D)),0,MOD,SpOrd);
 	dp_gr_flags(["NoSugar",0]);
 	if ( length(G) == 1 )
 		return 1;
@@ -1310,8 +1363,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++;
@@ -1335,7 +1392,7 @@ def resfctr_mod(F,L,M)
 		C = res(var(MP),B,MP) % M;
 		R = cons(flatten(cdr(modfctr(C,M))),R);
 	}
-	return R;
+	return reverse(R);
 }
 
 def flatten(L)