===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/PU.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM_contrib2/asir2000/engine/PU.c	1999/12/27 04:16:31	1.2
+++ OpenXM_contrib2/asir2000/engine/PU.c	2001/10/01 01:58:03	1.7
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/engine/PU.c,v 1.1.1.1 1999/11/10 08:12:26 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/engine/PU.c,v 1.6 2001/06/07 04:54:40 noro Exp $ 
+*/
 #include "ca.h"
 
 void reorderp(nvl,ovl,p,pr)
@@ -112,6 +160,64 @@ P *dp;
 		*dp = d;
 }
 
+void invmatp(vl,rmat,n,imatp,dnp)
+VL vl;
+P **rmat;
+int n;
+P ***imatp;
+P *dnp;
+{
+	int i,j,k,l,n2;
+	P mjj,mij,t,s,u,d;
+	P **mat,**imat;
+	P *mi,*mj,*w;
+	
+	n2 = n<<1;
+	mat = (P **)almat_pointer(n,n2);
+	for ( i = 0; i < n; i++ ) {
+		for ( j = 0; j < n; j++ )
+			mat[i][j] = rmat[i][j];
+		mat[i][i+n] = (P)ONE;
+	}
+	for ( j = 0, d = (P)ONE; j < n; j++ ) {
+		for ( i = j; (i < n) && !mat[i][j]; i++ );
+		if ( i == n ) {
+			error("invmatp : input is singular");
+		}
+		for ( k = i; k < n; k++ )
+			if ( mat[k][j] && (nmonop(mat[k][j]) < nmonop(mat[i][j]) ) )
+				i = k;
+		if ( j != i ) {
+			mj = mat[j]; mat[j] = mat[i]; mat[i] = mj;
+		}
+		for ( i = j + 1, mj = mat[j], mjj = mj[j]; i < n; i++ )
+			for ( k = j + 1, mi = mat[i], mij = mi[j]; k < n2; k++ ) {
+				mulp(vl,mi[k],mjj,&t); mulp(vl,mj[k],mij,&s);
+				subp(vl,t,s,&u); divsp(vl,u,d,&mi[k]);
+			}
+		d = mjj;
+	}
+	/* backward substitution */
+	w = (P *)ALLOCA(n2*sizeof(P));
+	for ( i = n-2; i >= 0; i-- ) {
+		bzero(w,n2*sizeof(P));
+		for ( k = i+1; k < n; k++ )
+			for ( l = k, u = mat[i][l]; l < n2; l++ ) {
+				mulp(vl,mat[k][l],u,&t); addp(vl,w[l],t,&s); w[l] = s;
+			}
+		for ( j = i, u = mat[i][j]; j < n2; j++ ) {
+			mulp(vl,mat[i][j],d,&t); subp(vl,t,w[j],&s);
+			divsp(vl,s,u,&mat[i][j]);
+		}
+	}
+	imat = (P **)almat_pointer(n,n);
+	for ( i = 0; i < n; i++ )
+		for ( j = 0; j < n; j++ )
+			imat[i][j] = mat[i][j+n];
+	*imatp = imat;
+	*dnp = d;
+}
+
 void reordvar(vl,v,nvlp)
 VL vl;
 V v;
@@ -452,9 +558,7 @@ P p1,p2,*pr;
 	factorial(QTOS(n)+QTOS(m),&t);
 	mulq(u,t,&s); addq(s,s,&f);
 	for ( index = 0, q = ONE, c = 0; cmpq(f,q) >= 0; ) {
-		mod = lprime[index++];
-		if ( !mod )
-			error("sqfrum : lprime[] exhausted.");
+		mod = get_lprime(index++);
 		ptomp(mod,LC(q1),&tg);
 		if ( !tg ) 
 			continue;
@@ -501,9 +605,7 @@ P p1,p2,*pr;
 	factorial(QTOS(n)+QTOS(m),&t);
 	mulq(u,t,&s); addq(s,s,&f);
 	for ( index = 0, q = ONE, c = 0; cmpq(f,q) >= 0; ) {
-		mod = lprime[index++];
-		if ( !mod )
-			error("sqfrum : lprime[] exhausted.");
+		mod = get_lprime(index++);
 		ptomp(mod,LC(q1),&tg);
 		if ( !tg ) 
 			continue;
@@ -657,7 +759,10 @@ P *pr;
 {
 	Q c;
 
-	ptozp(p,1,&c,pr);
+	if ( qpcheck((Obj)p) )
+		ptozp(p,1,&c,pr);
+	else
+		*pr = p;
 }
 
 void mindegp(vl,p,mvlp,pr)