===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/M.c,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- OpenXM_contrib2/asir2000/engine/M.c	2000/08/22 05:04:04	1.3
+++ OpenXM_contrib2/asir2000/engine/M.c	2001/06/25 04:11:42	1.7
@@ -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/engine/M.c,v 1.2 2000/08/21 08:31:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/M.c,v 1.6 2001/06/25 01:35:21 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -224,9 +224,7 @@ ML *pl;
 	mgcd = W_UMALLOC(n);
 
 	for ( j = 0, d = n; j < count && d; ) {
-		m = lprime[index++];
-		if ( !m )
-			error("sqfrum : lprime[] exhausted.");
+		m = get_lprime(index++);
 		if ( rem(NM((Q)COEF(DC(f))),m) == 0 ) continue;
 
 		ptoum(m,f,wf);
@@ -351,6 +349,14 @@ UM p1,p2;
 		c2[i] = c1[i];
 }
 
+void clearum(p,n)
+UM p;
+int n;
+{
+	DEG(p) = -1;
+	bzero(COEF(p),(n+1)*sizeof(int));
+}
+
 void degum(f,n)
 UM f;
 int n;
@@ -394,6 +400,25 @@ int n,bound;
 	return p;
 }
 
+/* n = deg in x, bound = deg in y, c[i] <-> the coef of y^i (poly in x) */
+
+BM BMALLOC(n,bound)
+int n,bound;
+{
+	BM p;
+	UM *c;
+	int i;
+
+	p = (BM)MALLOC(TRUESIZE(oBM,bound,UM));
+	DEG(p) = bound;
+	for ( i = 0, c = (UM *)COEF(p); i < bound; i++ ) {
+		c[i] = UMALLOC(n);
+		DEG(c[i]) = -1;
+		bzero((char *)COEF(c[i]),(n+1)*sizeof(int));
+	}
+	return p;
+}
+
 void mullum(mod,n,f1,f2,fr)
 int mod,n;
 LUM f1,f2,fr;
@@ -436,6 +461,31 @@ LUM p,r;
 			ppr[i][j] = pp[i][j];
 }
 
+int isequalum(f1,f2)
+UM f1,f2;
+{
+	int i;
+
+	if ( DEG(f1) < 0 )
+		if ( DEG(f2) < 0 )
+			return 1;
+		else
+			return 0;
+	else if ( DEG(f2) < 0 )
+		return 0;
+	else {
+		if ( DEG(f1) != DEG(f2) )
+			return 0;
+		for ( i = 0; i <= DEG(f1); i++ )
+			if ( COEF(f1)[i] != COEF(f2)[i] )
+				break;
+		if ( i < DEG(f1) )
+			return 0;
+		else
+			return 1;
+	}
+}
+
 void pwrlum(mod,bound,p,n,r)
 int mod,bound,n;
 LUM p,r;
@@ -546,7 +596,7 @@ register int **c;
 	return (-1);
 }
 
-#if defined(__GNUC__) || defined(THINK_C)
+#if defined(__GNUC__)
 const
 #endif
 int sprime[] = {
@@ -701,5 +751,3 @@ int sprime[] = {
 	16273,16301,16319,16333,16339,16349,16361,16363,16369,16381,
 	0
 };
-
-#include "prime.h"