===================================================================
RCS file: /home/cvs/OpenXM/src/ox_gsl/ox_gsl.c,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -p -r1.4 -r1.11
--- OpenXM/src/ox_gsl/ox_gsl.c	2018/03/30 08:48:23	1.4
+++ OpenXM/src/ox_gsl/ox_gsl.c	2018/06/06 07:40:32	1.11
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.3 2018/03/30 04:43:16 takayama Exp $
+/* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.10 2018/06/04 06:39:26 ohara Exp $
 */
 
 #include <stdio.h>
@@ -6,6 +6,7 @@
 #include <setjmp.h>
 #include <string.h>
 #include <unistd.h>
+#include <signal.h>
 #include <math.h>
 #include "ox_gsl.h"
 #include "call_gsl.h" // need only when you bind call_gsl functions.
@@ -40,6 +41,7 @@ void gc_free(void *p,size_t size)
 void init_gc()
 { GC_INIT();
   mp_set_memory_functions(GC_malloc,gc_realloc,gc_free);
+  init_dic();  // initialize ox_eval.c
 }
 
 void initialize_stack()
@@ -110,6 +112,7 @@ int sm_mathcap()
 //    CMO_DISTRIBUTED_POLYNOMIAL,
 //    CMO_RECURSIVE_POLYNOMIAL,
 //    CMO_POLYNOMIAL_IN_ONE_VARIABLE,
+    CMO_TREE,
     CMO_ERROR2,
     0};
   int available_sm_command[]={
@@ -291,6 +294,20 @@ char *get_string() {
   return(NULL);
 }
 
+void test_ox_eval() {
+  cmo *c;
+  double d=0;
+  pop();
+  c=pop();
+  if (Debug) {
+    ox_printf("cmo *c="); print_cmo(c); ox_printf("\n");
+  }
+  init_dic();
+  register_entry("x",1.25);
+  if (eval_cmo(c,&d) == 0) myhandler("eval_cmo failed",NULL,0,-1);
+  push((cmo *)new_cmo_double(d));
+}
+
 int sm_executeFunction()
 {
     cmo_string *func = (cmo_string *)pop();
@@ -298,6 +315,7 @@ int sm_executeFunction()
         push(make_error2("sm_executeFunction, not CMO_STRING",NULL,0,-1));
         return -1;
     }
+    init_dic();
     // Test functions
     if (strcmp(func->s, "add_int32") == 0) {
         my_add_int32();
@@ -307,9 +325,15 @@ int sm_executeFunction()
         show_double_list();
     }else if (strcmp(func->s,"restart")==0) {
         pop(); restart();
+    }else if (strcmp(func->s,"test_ox_eval")==0) {
+        test_ox_eval();
     // The following functions are defined in call_gsl.c
     }else if (strcmp(func->s,"gsl_sf_lngamma_complex_e")==0) {
         call_gsl_sf_lngamma_complex_e();
+    }else if (strcmp(func->s,"gsl_integration_qags")==0) {
+        call_gsl_integration_qags();
+    }else if (strcmp(func->s,"gsl_monte_plain_integrate")==0) {
+        call_gsl_monte_plain_integrate();
     }else {
         push(make_error2("sm_executeFunction, unknown function",NULL,0,-1));
         return -1;
@@ -433,7 +457,12 @@ int main()
     fd_rw = oxf_open(3);
     oxf_determine_byteorder_server(fd_rw);
   }
+#if defined(__CYGWIN__)
+  void *mysignal(int sig,void (*handler)(int m));
+  mysignal(SIGUSR1,usr1_handler);
+#else
   signal(SIGUSR1,usr1_handler);
+#endif
   
   while(1) {
     receive();