check for boundary violations in cpp

R/kde1d-methods.R

@@ -32,25 +32,15 @@
 #' @export
 dkde1d <- function(x, obj) {
   x <- prep_eval_arg(x, obj)
-  sel <- is_below_support(x, obj) | is_above_support(x, obj)
-  x[sel] <- NA
-  d <- dkde1d_cpp(x, obj)
-  d[sel] <- 0
-  d
+  dkde1d_cpp(x, obj)
 }
 
 #' @param q vector of quantiles.
 #' @rdname dkde1d
 #' @export
 pkde1d <- function(q, obj) {
   q <- prep_eval_arg(q, obj)
-  below <- is_below_support(q, obj)
-  above <- is_above_support(q, obj)
-  q[below | above] <- NA
-  p <- pkde1d_cpp(q, obj)
-  p[below] <- 0
-  p[above] <- 1
-  p
+  pkde1d_cpp(q, obj)
 }
 
 #' @param p vector of probabilities.

R/tools.R

@@ -36,17 +36,3 @@ prep_eval_arg <- function(x, obj) {
     x <- ordered(x, levels(obj$x))
   as.numeric(x) - 1
 }
-
-#' boolean vector for observations below the distribution's support
-#' @noRd
-is_below_support <- function(x, obj) {
-  lower <- if (!is.nan(obj$xmin)) obj$xmin else -Inf
-  x < lower
-}
-
-#' boolean vector for observations above the distribution's support
-#' @noRd
-is_above_support <- function(x, obj) {
-  upper <- if (!is.nan(obj$xmax)) obj$xmax else Inf
-  x > upper
-}

inst/include/kde1d/kde1d.hpp

@@ -89,8 +89,7 @@ class Kde1d
   void check_xmin_xmax(const double& xmin, const double& xmax) const;
   void check_inputs(const Eigen::VectorXd& x,
                     const Eigen::VectorXd& weights = Eigen::VectorXd()) const;
-  void fit_internal(const Eigen::VectorXd& x,
-                    const Eigen::VectorXd& weights = Eigen::VectorXd());
+  void check_boundaries(const Eigen::VectorXd& x) const;
   Eigen::VectorXd pdf_continuous(const Eigen::VectorXd& x) const;
   Eigen::VectorXd cdf_continuous(const Eigen::VectorXd& x) const;
   Eigen::VectorXd quantile_continuous(const Eigen::VectorXd& x) const;
@@ -196,6 +195,7 @@ inline void
 Kde1d::fit(const Eigen::VectorXd& x, const Eigen::VectorXd& weights)
 {
   check_inputs(x, weights);
+  check_boundaries(x);
 
   // preprocessing for nans and jittering
   Eigen::VectorXd xx = x;
@@ -770,6 +770,14 @@ Kde1d::check_inputs(const Eigen::VectorXd& x,
     throw std::invalid_argument("x and weights must have the same size");
 }
 
+inline void
+Kde1d::check_boundaries(const Eigen::VectorXd& x) const
+{
+  if ((x.array() < xmin_).any() | (x.array() > xmax_).any()) {
+    throw std::invalid_argument("x must be contained in [xmin, xmax].");
+  }
+}
+
 void
 Kde1d::set_interpolation_grid(const interp::InterpolationGrid& grid)
 {