===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.29
retrieving revision 1.33
diff -u -p -r1.29 -r1.33
--- OpenXM/src/ox_toolkit/ox.c	2003/09/18 20:30:00	1.29
+++ OpenXM/src/ox_toolkit/ox.c	2005/03/03 07:25:17	1.33
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.28 2003/09/18 12:46:08 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.32 2005/03/03 06:38:15 ohara Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -35,6 +35,7 @@ static cmo_ring_by_name* receive_cmo_ring_by_name(OXFI
 static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp);
 static cmo_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp);
 static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(OXFILE *oxfp);
+static cmo_double*       receive_cmo_double(OXFILE *oxfp);
 static cmo_error2*       receive_cmo_error2(OXFILE *oxfp);
 
 static int          send_cmo_null(OXFILE *oxfp, cmo_null* c);
@@ -43,6 +44,7 @@ static int          send_cmo_string(OXFILE *oxfp, cmo_
 static int          send_cmo_mathcap(OXFILE *oxfp, cmo_mathcap* c);
 static int          send_cmo_list(OXFILE *oxfp, cmo_list* c);
 static int          send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c);
+static int          send_cmo_double(OXFILE *oxfp, cmo_double* c);
 static int          send_cmo_error2(OXFILE *oxfp, cmo_error2* c);
 static int          send_cmo_distributed_polynomial(OXFILE *oxfp, cmo_distributed_polynomial* c);
 static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c);
@@ -116,6 +118,18 @@ int receive_int32(OXFILE *oxfp)
     return oxfp->receive_int32(oxfp);
 }
 
+/* sending an object of int32 type. (not equal to cmo_int32 type)  */
+int send_double(OXFILE *oxfp, double d)
+{
+    return oxfp->send_double(oxfp, d);
+}
+
+/* receiving an object of int32 type. (not equal to cmo_int32 type)  */
+double receive_double(OXFILE *oxfp)
+{
+    return oxfp->receive_double(oxfp);
+}
+
 /* receiving an (OX_tag, serial number)  */
 int receive_ox_tag(OXFILE *oxfp)
 {
@@ -194,6 +208,14 @@ static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
     return c;
 }
 
+static cmo_qq* receive_cmo_qq(OXFILE *oxfp)
+{
+    cmo_qq* c = new_cmo_qq_noinit();
+    c->num = receive_cmo(oxfp);
+    c->den = receive_cmo(oxfp);
+    return c;
+}
+
 static cmo_zero* receive_cmo_zero(OXFILE *oxfp)
 {
     return new_cmo_zero();
@@ -250,6 +272,12 @@ static cmo_polynomial_in_one_variable* receive_cmo_pol
     return c;
 }
 
+static cmo_double* receive_cmo_double(OXFILE *oxfp)
+{
+	double d = receive_double(oxfp);
+	return new_cmo_double(d);
+}
+
 static cmo_indeterminate* receive_cmo_indeterminate(OXFILE *oxfp)
 {
     cmo* ob = receive_cmo(oxfp);
@@ -309,6 +337,9 @@ cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
     case CMO_ZZ:
         m = (cmo *)receive_cmo_zz(oxfp);
         break;
+    case CMO_QQ:
+        m = (cmo *)receive_cmo_qq(oxfp);
+        break;
     case CMO_ZERO:
         m = (cmo *)receive_cmo_zero(oxfp);
         break;
@@ -327,6 +358,10 @@ cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
     case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
         m = (cmo *)receive_cmo_polynomial_in_one_variable(oxfp);
         break;
+	case CMO_64BIT_MACHINE_DOUBLE:
+	case CMO_IEEE_DOUBLE_FLOAT:
+        m = (cmo *)receive_cmo_double(oxfp);
+        break;
     case CMO_INDETERMINATE:
         m = (cmo *)receive_cmo_indeterminate(oxfp);
         break;
@@ -340,7 +375,6 @@ cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
         m = (cmo *)receive_cmo_error2(oxfp);
         break;
     case CMO_DATUM:
-    case CMO_QQ:
     default:
         m = NULL;
         ox_printf("the CMO (%d) is not implemented.\n", tag);
@@ -546,6 +580,11 @@ static int send_cmo_polynomial_in_one_variable(OXFILE 
     return 0;
 }
 
+static int send_cmo_double(OXFILE *oxfp, cmo_double* c)
+{
+    return send_double(oxfp, c->d);
+}
+
 static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c)
 {
     int i;
@@ -564,6 +603,13 @@ static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
     return 0;
 }
 
+static int send_cmo_qq(OXFILE *oxfp, cmo_qq* c)
+{
+    send_cmo(oxfp, c->num);
+    send_cmo(oxfp, c->den);
+    return 0;
+}
+
 static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c)
 {
 	send_cmo(oxfp, (cmo *)c->ringdef);
@@ -627,6 +673,9 @@ void send_cmo(OXFILE *oxfp, cmo* c)
     case CMO_ZZ:
         send_cmo_zz(oxfp, (cmo_zz *)c);
         break;
+    case CMO_QQ:
+        send_cmo_qq(oxfp, (cmo_qq *)c);
+        break;
     case CMO_DISTRIBUTED_POLYNOMIAL:
         send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c);
         break;
@@ -636,6 +685,10 @@ void send_cmo(OXFILE *oxfp, cmo* c)
     case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
         send_cmo_polynomial_in_one_variable(oxfp, (cmo_polynomial_in_one_variable *)c);
         break;
+	case CMO_64BIT_MACHINE_DOUBLE:
+	case CMO_IEEE_DOUBLE_FLOAT:
+		send_cmo_double(oxfp, (cmo_double *)c);
+		break;
     case CMO_TREE:
         send_cmo_tree(oxfp, (cmo_tree *)c);
         break;