[BACK]Return to ox_gsl.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_gsl

Diff for /OpenXM/src/ox_gsl/ox_gsl.c between version 1.11 and 1.13

version 1.11, 2018/06/06 07:40:32 version 1.13, 2018/06/07 11:13:05
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.10 2018/06/04 06:39:26 ohara Exp $  /* $OpenXM: OpenXM/src/ox_gsl/ox_gsl.c,v 1.12 2018/06/07 01:53:33 takayama Exp $
 */  */
   
 #include <stdio.h>  #include <stdio.h>
Line 333  int sm_executeFunction()
Line 333  int sm_executeFunction()
     }else if (strcmp(func->s,"gsl_integration_qags")==0) {      }else if (strcmp(func->s,"gsl_integration_qags")==0) {
         call_gsl_integration_qags();          call_gsl_integration_qags();
     }else if (strcmp(func->s,"gsl_monte_plain_integrate")==0) {      }else if (strcmp(func->s,"gsl_monte_plain_integrate")==0) {
         call_gsl_monte_plain_integrate();          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 {      }else {
         push(make_error2("sm_executeFunction, unknown function",NULL,0,-1));          push(make_error2("sm_executeFunction, unknown function",NULL,0,-1));
         return -1;          return -1;
Line 468  int main()
Line 472  int main()
     receive();      receive();
   }    }
   return(0);    return(0);
   }
   
   cmo *element_of_at(cmo *list,int k) {
     int length;
     static cmo * saved_list = NULL;
     static cmo **dic;
     int i;
     cell *cellp;
     if (list == NULL) {
       ox_printf("element_of_at: list is NULL.\n");
       return( (cmo *)NULL);
     }
     if (list->tag != CMO_LIST) {
       ox_printf("element_of_at: list is not list.\n");
       return((cmo *)NULL);
     }
     length = list_length((cmo_list *)list);
     if ((k < 0) || (k >= length)) {
       ox_printf("element_of_at: out of bound length=%d, k=%d.\n",length,k);
       return((cmo *)NULL);
     }
     if (list == saved_list) return(dic[k]);
     saved_list = list;
     dic = (cmo **)GC_malloc(sizeof(cmo *)*(length+1));
     if (dic == NULL) return((cmo *)NULL); // no more memory.
     cellp = list_first((cmo_list *)list);
     for (i=0; i<length; i++) {
       dic[i] = cellp->cmo;
       cellp = list_next(cellp);
     }
     return(dic[k]);
 }  }

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.13

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>