diff --git a/DESCRIPTION b/DESCRIPTION index abe75581..15021328 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: pomp Type: Package Title: Statistical Inference for Partially Observed Markov Processes -Version: 5.4.3.2 -Date: 2023-11-30 +Version: 5.4.3.3 +Date: 2023-12-01 Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),email="kingaa@umich.edu",comment=c(ORCID="0000-0001-6159-3207")), person(given=c("Edward","L."),family="Ionides",role="aut",comment=c(ORCID="0000-0002-4190-0174")) , person(given="Carles",family="Bretó",role="aut",comment=c(ORCID="0000-0003-4695-4902")), diff --git a/R/templates.R b/R/templates.R index c5a791c0..f3d27663 100644 --- a/R/templates.R +++ b/R/templates.R @@ -19,33 +19,19 @@ pomp_templates <- list( ), utilities=list( bspline_basis=list( - trigger=r"{(?0, the deriv-order derivative is given. // 'knots' must point to an array of length nbasis+degree+1 // The results are stored in y. -void bspline_basis_eval (double x, double *knots, int degree, - int nbasis, double *y) { - bspline_basis_eval_deriv(x,knots,degree,nbasis,0,y); -} - void bspline_basis_eval_deriv (double x, double *knots, int degree, int nbasis, int deriv, double *y) { for (int i = 0; i < nbasis; i++) { @@ -121,11 +118,6 @@ void bspline_basis_eval_deriv (double x, double *knots, int degree, } } -void periodic_bspline_basis_eval (double x, double period, int degree, - int nbasis, double *y) { - periodic_bspline_basis_eval_deriv(x,period,degree,nbasis,0,y); -} - void periodic_bspline_basis_eval_deriv (double x, double period, int degree, int nbasis, int deriv, double *y) { diff --git a/src/decls.h b/src/decls.h index 287c689b..1b2a3f9c 100644 --- a/src/decls.h +++ b/src/decls.h @@ -2,9 +2,7 @@ extern void bspline_eval(double *y, const double *x, int nx, int i, int degree, int deriv, const double *knots); extern SEXP bspline_basis(SEXP range, SEXP x, SEXP nbasis, SEXP degree, SEXP deriv); extern SEXP periodic_bspline_basis(SEXP x, SEXP nbasis, SEXP degree, SEXP period, SEXP deriv); -extern void bspline_basis_eval(double x, double *knots, int degree, int nbasis, double *y); extern void bspline_basis_eval_deriv(double x, double *knots, int degree, int nbasis, int deriv, double *y); -extern void periodic_bspline_basis_eval(double x, double period, int degree, int nbasis, double *y); extern void periodic_bspline_basis_eval_deriv(double x, double period, int degree, int nbasis, int deriv, double *y); /* src/dinit.c */ extern SEXP do_dinit(SEXP object, SEXP t0, SEXP x, SEXP params, SEXP log, SEXP gnsi); diff --git a/src/init.c b/src/init.c index a5ba02c1..07f7edf8 100644 --- a/src/init.c +++ b/src/init.c @@ -52,9 +52,7 @@ static const R_CallMethodDef callMethods[] = { void R_init_pomp (DllInfo *info) { // C functions provided for users - R_RegisterCCallable("pomp","bspline_basis_eval",(DL_FUNC) &bspline_basis_eval); R_RegisterCCallable("pomp","bspline_basis_eval_deriv",(DL_FUNC) &bspline_basis_eval_deriv); - R_RegisterCCallable("pomp","periodic_bspline_basis_eval",(DL_FUNC) &periodic_bspline_basis_eval); R_RegisterCCallable("pomp","periodic_bspline_basis_eval_deriv",(DL_FUNC) &periodic_bspline_basis_eval_deriv); R_RegisterCCallable("pomp","bspline_eval",(DL_FUNC) &bspline_eval); /* DEPRECATED */ R_RegisterCCallable("pomp","get_userdata",(DL_FUNC) &get_userdata); diff --git a/src/pomp.h b/src/pomp.h index ea86fe02..d3347d90 100644 --- a/src/pomp.h +++ b/src/pomp.h @@ -21,20 +21,11 @@ #define err(...) errorcall(R_NilValue,__VA_ARGS__) #define warn(...) warningcall(R_NilValue,__VA_ARGS__) -typedef -void bspline_basis_eval_t -(double x, double *knots, int degree, int nbasis, double *y); - typedef void bspline_basis_eval_deriv_t (double x, double *knots, int degree, int nbasis, int deriv, double *y); -typedef -void periodic_bspline_basis_eval_t -(double x, double period, int degree, - int nbasis, double *y); - typedef void periodic_bspline_basis_eval_deriv_t (double x, double period, int degree,