=================================================================== RCS file: /home/cvs/OpenXM/src/ox_gsl/ox_gsl.c,v retrieving revision 1.8 retrieving revision 1.12 diff -u -p -r1.8 -r1.12 --- OpenXM/src/ox_gsl/ox_gsl.c 2018/04/17 00:56:38 1.8 +++ OpenXM/src/ox_gsl/ox_gsl.c 2018/06/07 01:53:33 1.12 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.7 2018/04/06 01:56:49 takayama Exp $ +/* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.11 2018/06/06 07:40:32 takayama Exp $ */ #include @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "ox_gsl.h" #include "call_gsl.h" // need only when you bind call_gsl functions. @@ -314,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(); @@ -330,6 +332,12 @@ int sm_executeFunction() 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_miser_vegas_integrate(0); + }else if (strcmp(func->s,"gsl_monte_miser_integrate")==0) { + call_gsl_monte_plain_miser_vegas_integrate(1); + }else if (strcmp(func->s,"gsl_monte_vegas_integrate")==0) { + call_gsl_monte_plain_miser_vegas_integrate(2); }else { push(make_error2("sm_executeFunction, unknown function",NULL,0,-1)); return -1; @@ -453,7 +461,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();