streamline scalars in src

Author: kingaa

src/logmeanexp.c

@@ -5,11 +5,9 @@
 // Compute log(mean(exp(X))) accurately,
 // optionally with one element dropped
 SEXP logmeanexp (const SEXP X, const SEXP Drop) {
-  SEXP ans;
-  PROTECT(ans = NEW_NUMERIC(1));
   int j, n = LENGTH(X);
   int k = *INTEGER(Drop)-1;	// zero-based index
-  double *x = REAL(X), *a = REAL(ans);
+  double *x = REAL(X);
   long double m = R_NegInf;
   long double s = 0;
   for (j = 0; j < n; j++) {
@@ -21,7 +19,5 @@ SEXP logmeanexp (const SEXP X, const SEXP Drop) {
       s += expl((long double) x[j] - m);
   }
   if (k >= 0 && k < n) n--;
-  *a = m + log(s/n);
-  UNPROTECT(1);
-  return ans;
+  return ScalarReal(m + log(s/n));
 }

src/pomp_internal.h

@@ -14,20 +14,4 @@
 #define err(...) errorcall(R_NilValue,__VA_ARGS__)
 #define warn(...) warningcall(R_NilValue,__VA_ARGS__)
 
-static R_INLINE SEXP trueSEXP (void) {
-  SEXP x;
-  PROTECT(x = NEW_LOGICAL(1));
-  *LOGICAL(x) = 1;
-  UNPROTECT(1);
-  return x;
-}
-
-static R_INLINE SEXP falseSEXP (void) {
-  SEXP x;
-  PROTECT(x = NEW_LOGICAL(1));
-  *LOGICAL(x) = 0;
-  UNPROTECT(1);
-  return x;
-}
-
 #endif

src/rinit.c

@@ -258,7 +258,7 @@ static SEXP pomp_default_rinit (SEXP params, SEXP Pnames,
 
   // extract names of IVPs using 'grep'
   PROTECT(pat = mkString("[\\_\\.]0$"));
-  PROTECT(fcall = LCONS(trueSEXP(),R_NilValue));
+  PROTECT(fcall = LCONS(ScalarLogical(1),R_NilValue));
   SET_TAG(fcall,install("value"));
   PROTECT(fcall = LCONS(Pnames,fcall));
   SET_TAG(fcall,install("x"));

src/wpfilter.c

@@ -55,8 +55,7 @@ SEXP wpfilter (SEXP X, SEXP Params, SEXP Weights, SEXP W, SEXP Trigger, SEXP Tar
 
     if (ISNAN(*xW) || *xW == R_PosInf) { // check the weights
       SEXP rv;
-      PROTECT(rv = NEW_INTEGER(1)); nprotect++;
-      *INTEGER(rv) = k+1; // return the index of the peccant particle
+      PROTECT(rv = ScalarInteger(k+1)); nprotect++;
       UNPROTECT(nprotect);
       return rv;
     }