===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/sp,v
retrieving revision 1.16
retrieving revision 1.19
diff -u -p -r1.16 -r1.19
--- OpenXM_contrib2/asir2000/lib/sp	2010/07/14 04:48:14	1.16
+++ OpenXM_contrib2/asir2000/lib/sp	2018/04/09 04:07:27	1.19
@@ -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/lib/sp,v 1.15 2006/06/23 08:57:47 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.18 2018/04/06 07:40:44 noro Exp $ 
 */
 /* 
 	sp : functions related to algebraic number fields
@@ -211,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];
@@ -227,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,[]);
 }
@@ -615,7 +623,7 @@ def ufctrhint_heuristic(P,HINT,PP,SHIFT) {
 }
 
 def pari_ufctr(P) {
-	F = pari(factor,P);
+	F = pari(factpol,P);
 	S = size(F);
 	for ( I = S[0]-1, R = []; I >= 0; I-- )
 		R = cons(vtol(F[I]),R);
@@ -1357,20 +1365,25 @@ def resfctr(F,L,V,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++;
-			T = nfctr_mod(N,M);
-			if ( T < Len ) {
-				Len = T; M0 = M;
-			}
-		}
-	}
-	S = spm(L,V,M0);
+  J = 2;
+  while ( 1 ) {
+    Len = deg(N,V0)+1;
+	  for ( I = 0; I < 5; J++ ) {
+		  M = prime(J);
+		  if ( !(LC%M) || !(LCD%M))
+			  continue;
+		  G = gcd(N,DN,M);
+		  if ( !deg(G,V0) ) {            
+			  I++;
+			  T = nfctr_mod(N,M);
+			  if ( T < Len ) {
+				  Len = T; M0 = M;
+			  }
+		  }
+	  }
+	  S = spm(L,V,M0);
+    if ( S ) break;
+  }
 	T = resfctr_mod(F,S,M0);
 	return [T,S,M0];
 }
@@ -1400,11 +1413,13 @@ def spm(L,V,M)
 		U = modfctr(car(L),M);
 		for ( T = cdr(U), R = []; T != []; T = cdr(T) ) {
 			S = car(T);
+      if ( S[1] > 1 ) return 0;
 			R = cons([subst(S[0],var(S[0]),a_),[var(S[0]),a_]],R);
 		}
 		return R;
 	}
 	L1 = spm(cdr(L),cdr(V),M);
+  if ( !L1 ) return 0;
 	F0 = car(L); V0 = car(V); VR = cdr(V);
 	for ( T = L1, R = []; T != []; T = cdr(T) ) {
 		S = car(T);
@@ -1412,6 +1427,7 @@ def spm(L,V,M)
 		U = fctr_mod(F1,V0,S[0],M);
 		VS = var(S[0]);
 		for ( W = U; W != []; W = cdr(W) ) {
+      if ( car(W)[1] > 1 ) return 0;
 			A = car(car(W)); 
 			if ( deg(A,V0) == 1 ) {
 				A = monic_mod(A,V0,S[0],M);