remove calls to pomp set/unset userdata

kidusasfaw · Aug 8, 2023 · 0b85f4f · 0b85f4f
1 parent f73aa0e
commit 0b85f4f
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,7 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 BugReports: https://github.com/kidusasfaw/spatPomp/issues/
-Depends: pomp (>= 4.5.2), R(>= 4.1), methods
+Depends: pomp (>= 5.4), R(>= 4.1), methods
 LinkingTo: pomp
 Suggests: testthat, doParallel (>= 1.0.11), parallel, doRNG
 Imports: foreach, dplyr, tidyr, stringr, abind, rlang, magrittr, ggplot2

diff --git a/inst/include/spatPomp_defines.h b/inst/include/spatPomp_defines.h
@@ -32,8 +32,6 @@ extern pomp_fun_handler_t *pfh;
 extern get_covariate_names_t *gcn;
 extern table_lookup_t *tl;
 extern make_covariate_table_t *mct;
-extern set_pomp_userdata_t *spu;
-extern unset_pomp_userdata_t *upu;
 extern pomp_onestep_sim *pos;
 extern SEXP(*randwalk_perturbation_pomp)(SEXP,SEXP);
 extern SEXP (*lookup_in_table_pomp)(SEXP,SEXP);

diff --git a/src/dunit_measure.c b/src/dunit_measure.c
@@ -106,8 +106,6 @@ SEXP do_dunit_measure (SEXP object, SEXP y, SEXP x, SEXP times, SEXP units, SEXP
     // address of native routine
     *((void **) (&ff)) = R_ExternalPtrAddr(fn);
 
-    (*spu)(args);
-
     for (k = 0; k < ntimes; k++, time++, yp += nobs) { // loop over times
 
       R_CheckUserInterrupt();	// check for user interrupt
@@ -124,8 +122,6 @@ SEXP do_dunit_measure (SEXP object, SEXP y, SEXP x, SEXP times, SEXP units, SEXP
       }
     }
 
-    (*upu)();
-
   }
 
     break;

diff --git a/src/eunit_measure.c b/src/eunit_measure.c
@@ -100,7 +100,6 @@ SEXP do_eunit_measure (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
     // address of native routine
     *((void **) (&ffthetatoe)) = R_ExternalPtrAddr(fnthetatoe);
 
-    (*spu)(args);
     for (k = 0; k < ntimes; k++, time++) { // loop over times
       // interpolate the covar functions for the covariates
       (*tl)(&covariate_table,*time,cov);
@@ -113,7 +112,6 @@ SEXP do_eunit_measure (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
         }
       }
     }
-    (*upu)();
   }
 
     break;

diff --git a/src/fcstsampvar.c b/src/fcstsampvar.c
@@ -102,7 +102,6 @@ SEXP do_fcst_samp_var (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
     // address of native routine
     *((void **) (&ff)) = R_ExternalPtrAddr(fn);
 
-    (*spu)(args);
     for (k = 0; k < ntimes; k++, time++) { // loop over times
       // interpolate the covar functions for the covariates
       (*tl)(&covariate_table,*time,cov);
@@ -117,8 +116,6 @@ SEXP do_fcst_samp_var (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
 
     }
 
-    (*upu)();
-
   }
 
     break;

diff --git a/src/init.c b/src/init.c
@@ -32,8 +32,6 @@ SEXP (*lsd)(SEXP);
 SEXP (*lsi)(SEXP);
 make_covariate_table_t * mct;
 SEXP (*pfh)(SEXP, SEXP, pompfunmode *, SEXP, SEXP, SEXP, SEXP);
-void (*spu)(SEXP);
-void (*upu)(void);
 void (*tl)(lookup_table_t *, double, double *);
 
 
@@ -49,6 +47,4 @@ void R_init_spatPomp (DllInfo *info) {
   gcn = (get_covariate_names_t *) R_GetCCallable("pomp", "get_covariate_names");
   tl = (table_lookup_t *) R_GetCCallable("pomp", "table_lookup");
   mct = (make_covariate_table_t *) R_GetCCallable("pomp", "make_covariate_table");
-  spu = (set_pomp_userdata_t *) R_GetCCallable("pomp", "set_pomp_userdata");
-  upu = (unset_pomp_userdata_t *) R_GetCCallable("pomp", "unset_pomp_userdata");
 }
diff --git a/src/munit_measure.c b/src/munit_measure.c
@@ -127,7 +127,6 @@ SEXP do_munit_measure(SEXP object, SEXP X, SEXP vc, SEXP Np, SEXP times, SEXP pa
     // address of native routine
     *((void **) (&ff)) = R_ExternalPtrAddr(fn);
 
-    (*spu)(args);
     for (k = 0; k < ntimes; k++, time++) { // loop over times
       // interpolate the covar functions for the covariates
       (*tl)(&covariate_table,*time,cov);
@@ -142,8 +141,6 @@ SEXP do_munit_measure(SEXP object, SEXP X, SEXP vc, SEXP Np, SEXP times, SEXP pa
 
     }
 
-    (*upu)();
-
   }
 
     break;

diff --git a/src/runit_measure.c b/src/runit_measure.c
@@ -107,7 +107,6 @@ SEXP do_runit_measure (SEXP object, SEXP x, SEXP times, SEXP units, SEXP params,
     PROTECT(Y = ret_array(nobs,nreps,ntimes,Onames)); nprotect++;
     yt = REAL(Y);
 
-    (*spu)(args);
     GetRNGstate();
 
     for (k = 0; k < ntimes; k++, time++) { // loop over times
@@ -128,7 +127,6 @@ SEXP do_runit_measure (SEXP object, SEXP x, SEXP times, SEXP units, SEXP params,
     }
 
     PutRNGstate();
-    (*upu)();
 
   }
 

diff --git a/src/spatPomp_defines.h b/src/spatPomp_defines.h
@@ -32,8 +32,6 @@ extern pomp_fun_handler_t *pfh;
 extern get_covariate_names_t *gcn;
 extern table_lookup_t *tl;
 extern make_covariate_table_t *mct;
-extern set_pomp_userdata_t *spu;
-extern unset_pomp_userdata_t *upu;
 extern pomp_onestep_sim *pos;
 extern SEXP(*randwalk_perturbation_pomp)(SEXP,SEXP);
 extern SEXP (*lookup_in_table_pomp)(SEXP,SEXP);

diff --git a/src/vunit_measure.c b/src/vunit_measure.c
@@ -93,7 +93,6 @@ SEXP do_vunit_measure (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
 
     // address of native routine
     *((void **) (&ffthetatov)) = R_ExternalPtrAddr(fnthetatov);
-    (*spu)(args);
     for (k = 0; k < ntimes; k++, time++) { // loop over times
       // interpolate the covar functions for the covariates
       (*tl)(&covariate_table,*time,cov);
@@ -106,7 +105,6 @@ SEXP do_vunit_measure (SEXP object, SEXP X, SEXP Np, SEXP times, SEXP params, SE
         }
       }
     }
-    (*upu)();
   }
 
     break;