===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/p-itv.c,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- OpenXM_contrib2/asir2000/engine/p-itv.c	2000/12/22 10:03:28	1.1
+++ OpenXM_contrib2/asir2000/engine/p-itv.c	2003/10/20 07:18:42	1.5
@@ -1,10 +1,10 @@
 /*
- * $OpenXM: $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/p-itv.c,v 1.4 2003/07/25 12:34:48 kondoh Exp $
 */
 #if defined(INTERVAL)
 #include "ca.h"
 #include "base.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
@@ -51,7 +51,7 @@ void istoitv(Num inf, Num sup, Itv *rp)
 		i = inf;
 	}
 	if ( type )
-		NEWItvF((ItvF)c);
+		NEWIntervalBigFloat((IntervalBigFloat)c);
 	else 
 		NEWItvP(c);
 
@@ -82,7 +82,7 @@ void additvp(Itv a, Itv b, Itv *c)
 		addnum(0,(Num)a,(Num)b,(Num *)c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		additvd((Num)a,(Num)b,(ItvD *)c);
+		additvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -105,7 +105,7 @@ void subitvp(Itv a, Itv b, Itv *c)
 		subnum(0,(Num)a,(Num)b,(Num *)c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		subitvd((Num)a,(Num)b,(ItvD *)c);
+		subitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -126,7 +126,7 @@ void mulitvp(Itv a, Itv b, Itv *c)
 		mulnum(0,(Num)a,(Num)b,(Num *)c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		mulitvd((Num)a,(Num)b,(ItvD *)c);
+		mulitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -208,7 +208,7 @@ void divitvp(Itv a, Itv b, Itv *c)
 		divnum(0,(Num)a,(Num)b,(Num *)c);
 	else if ( (NID(a) == N_IP) && (NID(b) == N_R ) 
 		||(NID(a) == N_R ) && (NID(b) == N_IP) )
-		divitvd((Num)a,(Num)b,(ItvD *)c);
+		divitvd((Num)a,(Num)b,(IntervalDouble *)c);
 	else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
@@ -259,7 +259,7 @@ void pwritvp(Itv a, Num e, Itv *c)
 	else if ( NID(a) <= N_B )
 		pwrnum(0,(Num)a,(Num)e,(Num *)c);
 	else if ( !INT(e) ) {
-#if PARI && 0
+#if defined(PARI) && 0
 		GEN pa,pe,z;
 		int ltop,lbot;
 
@@ -339,22 +339,31 @@ int cmpitvp(Itv a, Itv b)
 	int	s,t;
 
 	if ( !a ) {
-		if ( !b || (NID(b)<=N_B) )
+		if ( !b || (NID(b)<=N_B) ) {
 			return compnum(0,(Num)a,(Num)b);
-		else
-			return -1;
+		} else {
+			itvtois(b,&bi,&bs);
+			if ( compnum(0,(Num)a,bs) > 0 ) return 1;
+			else if ( compnum(0,bi,(Num)a) > 0 ) return -1;
+			else  return 0;
+		}
 	} else if ( !b ) {
-		if ( !a || (NID(a)<=N_B) )
+		if ( !a || (NID(a)<=N_B) ) {
 			return compnum(0,(Num)a,(Num)b);
-		else
-			return initvp((Num)b,a);
+		} else {
+			itvtois(a,&ai,&as);
+			if ( compnum(0,ai,(Num)b) > 0 ) return 1;
+			else if ( compnum(0,(Num)b,as) > 0 ) return -1;
+			else  return 0;
+		}
 	} else {
 		itvtois(a,&ai,&as);
 		itvtois(b,&bi,&bs);
-		s = compnum(0,ai,bi) ;
-		t = compnum(0,as,bs) ;
-		if ( !s && !t ) return 0;
-		else  return -1;
+		s = compnum(0,ai,bs) ;
+		t = compnum(0,bi,as) ;
+		if ( s > 0 ) return 1;
+		else if ( t > 0 ) return -1;
+		else  return 0;
 	}
 }
 
@@ -362,7 +371,6 @@ void miditvp(Itv a, Num *b)
 {
 	Num	ai,as;
 	Num	t;
-	Q	TWO;
 
 	if ( ! a ) *b = 0;
 	else if ( (NID(a) <= N_B) )