[Yuima-commits] r665 - pkg/yuima/src

[noreply at r-forge.r-project.org]

Author: lorenzo
Date: 2018-06-26 15:20:41 +0200 (Tue, 26 Jun 2018)
New Revision: 665

Modified:
   pkg/yuima/src/RcppExports.cpp
   pkg/yuima/src/yuima_init.c
Log:


Modified: pkg/yuima/src/RcppExports.cpp
===================================================================
--- pkg/yuima/src/RcppExports.cpp	2018-06-26 10:55:38 UTC (rev 664)
+++ pkg/yuima/src/RcppExports.cpp	2018-06-26 13:20:41 UTC (rev 665)
@@ -6,6 +6,26 @@
 
 using namespace Rcpp;
 
+// evalKernelCpp
+NumericVector evalKernelCpp(StringMatrix Integrand2, ExpressionVector Integrand2expr, Environment myenvd1, Environment myenvd2, LogicalVector ExistdN, LogicalVector ExistdX, NumericVector gridTime, IntegerVector dimCol, StringVector NameCol, StringVector JumpTimeName);
+RcppExport SEXP yuima_evalKernelCpp(SEXP Integrand2SEXP, SEXP Integrand2exprSEXP, SEXP myenvd1SEXP, SEXP myenvd2SEXP, SEXP ExistdNSEXP, SEXP ExistdXSEXP, SEXP gridTimeSEXP, SEXP dimColSEXP, SEXP NameColSEXP, SEXP JumpTimeNameSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< StringMatrix >::type Integrand2(Integrand2SEXP);
+    Rcpp::traits::input_parameter< ExpressionVector >::type Integrand2expr(Integrand2exprSEXP);
+    Rcpp::traits::input_parameter< Environment >::type myenvd1(myenvd1SEXP);
+    Rcpp::traits::input_parameter< Environment >::type myenvd2(myenvd2SEXP);
+    Rcpp::traits::input_parameter< LogicalVector >::type ExistdN(ExistdNSEXP);
+    Rcpp::traits::input_parameter< LogicalVector >::type ExistdX(ExistdXSEXP);
+    Rcpp::traits::input_parameter< NumericVector >::type gridTime(gridTimeSEXP);
+    Rcpp::traits::input_parameter< IntegerVector >::type dimCol(dimColSEXP);
+    Rcpp::traits::input_parameter< StringVector >::type NameCol(NameColSEXP);
+    Rcpp::traits::input_parameter< StringVector >::type JumpTimeName(JumpTimeNameSEXP);
+    rcpp_result_gen = Rcpp::wrap(evalKernelCpp(Integrand2, Integrand2expr, myenvd1, myenvd2, ExistdN, ExistdX, gridTime, dimCol, NameCol, JumpTimeName));
+    return rcpp_result_gen;
+END_RCPP
+}
 // W1
 double W1(NumericMatrix crossdx, NumericMatrix b, NumericMatrix A, double h);
 RcppExport SEXP yuima_W1(SEXP crossdxSEXP, SEXP bSEXP, SEXP ASEXP, SEXP hSEXP) {

Modified: pkg/yuima/src/yuima_init.c
===================================================================
--- pkg/yuima/src/yuima_init.c	2018-06-26 10:55:38 UTC (rev 664)
+++ pkg/yuima/src/yuima_init.c	2018-06-26 13:20:41 UTC (rev 665)
@@ -26,9 +26,6 @@
 extern void rpts(void *, void *, void *, void *, void *);
 
 /* .Call calls */
-extern SEXP Cycle_Carma(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
-extern SEXP euler(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
-extern SEXP pseudoLoglik_COGARCH1(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP yuima_detcpp(SEXP);
 extern SEXP yuima_evalKernelCpp(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP yuima_Irregular_PseudoLoglik_COG(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
@@ -40,6 +37,9 @@
 extern SEXP yuima_sub_f(SEXP, SEXP);
 extern SEXP yuima_W1(SEXP, SEXP, SEXP, SEXP);
 extern SEXP yuima_W2(SEXP, SEXP, SEXP);
+extern SEXP Cycle_Carma(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
+extern SEXP euler(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
+extern SEXP pseudoLoglik_COGARCH1(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 
 static const R_CMethodDef CEntries[] = {
   {"bibsynchro",         (DL_FUNC) &bibsynchro,          9},
@@ -62,9 +62,6 @@
 };
 
 static const R_CallMethodDef CallEntries[] = {
-  {"Cycle_Carma",                       (DL_FUNC) &Cycle_Carma,                       12},
-  {"euler",                             (DL_FUNC) &euler,                             11},
-  {"pseudoLoglik_COGARCH1",             (DL_FUNC) &pseudoLoglik_COGARCH1,             14},
   {"yuima_detcpp",                      (DL_FUNC) &yuima_detcpp,                      1},
   {"yuima_evalKernelCpp",               (DL_FUNC) &yuima_evalKernelCpp,              10},
   {"yuima_Irregular_PseudoLoglik_COG",  (DL_FUNC) &yuima_Irregular_PseudoLoglik_COG, 15},
@@ -76,6 +73,9 @@
   {"yuima_sub_f",                       (DL_FUNC) &yuima_sub_f,                       2},
   {"yuima_W1",                          (DL_FUNC) &yuima_W1,                          4},
   {"yuima_W2",                          (DL_FUNC) &yuima_W2,                          3},
+  {"Cycle_Carma",                       (DL_FUNC) &Cycle_Carma,                       12},
+  {"euler",                             (DL_FUNC) &euler,                             11},
+  {"pseudoLoglik_COGARCH1",             (DL_FUNC) &pseudoLoglik_COGARCH1,             14},
   {NULL, NULL, 0}
 };