===================================================================
RCS file: /home/cvs/OpenXM/src/ox_gsl/ox_gsl.c,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -p -r1.6 -r1.11
--- OpenXM/src/ox_gsl/ox_gsl.c	2018/04/05 10:50:17	1.6
+++ 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.5 2018/04/04 01:03:59 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.
@@ -293,37 +294,17 @@ char *get_string() {
   return(NULL);
 }
 
-cmo_tree *get_tree() {
-  cmo *c;
-  c = pop();
-  if (c->tag == CMO_TREE) {
-    return ((cmo_tree *)c);
-  }
-  make_error2("cmo_tree is expected",NULL,0,-1);
-  return(NULL);
-}
-void print_tree(cmo_tree *c) {
-  if (c->tag != CMO_TREE) {
-    printf("Error: argument is not CMO_TREE\n");
-    return;
-  }
-  print_cmo((cmo *)c);
-/*
-  ox_printf("(name="); print_cmo((cmo *)(c->name)); ox_printf(",");
-  ox_printf("leaves="); print_cmo((cmo *)(c->leaves)); ox_printf(")");
-*/
-}  
 void test_ox_eval() {
-  cmo_tree *c;
+  cmo *c;
   double d=0;
   pop();
-  c = get_tree();
+  c=pop();
   if (Debug) {
-    ox_printf("cmo_tree *c="); print_tree(c); ox_printf("\n");
+    ox_printf("cmo *c="); print_cmo(c); ox_printf("\n");
   }
   init_dic();
   register_entry("x",1.25);
-  if (eval_cmo(c,&d) == 0) make_error2("eval_cmo failed",NULL,0,-1);
+  if (eval_cmo(c,&d) == 0) myhandler("eval_cmo failed",NULL,0,-1);
   push((cmo *)new_cmo_double(d));
 }
 
@@ -334,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();
@@ -348,6 +330,10 @@ int sm_executeFunction()
     // 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;
@@ -471,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();