Merge pull request #398 from thanasibakis/master

Fix permutations argument in `crps.numeric` and `scrps.numeric`

Author: jgabry

NEWS.md

@@ -6,6 +6,8 @@ and moment matching in #395
 comparison-model minus reference-model by @florence-bockting in #391
 * Update user messages in `print()` by @ishaan-arora-1, @florence-bockting in 
 #328.
+* Fix `crps()` and `scrps()` ignoring the `permutations` argument for numeric
+input by @thanasibakis in #398
 
 # loo 2.10.1
 

R/crps.R

@@ -94,7 +94,7 @@ crps.matrix <- function(x, x2, y, ..., permutations = 1) {
 crps.numeric <- function(x, x2, y, ..., permutations = 1) {
   stopifnot(length(x) == length(x2),
             length(y) == 1)
-  crps.matrix(as.matrix(x), as.matrix(x2), y, permutations)
+  crps.matrix(as.matrix(x), as.matrix(x2), y, permutations = permutations)
 }
 
 
@@ -140,7 +140,7 @@ scrps.matrix <- function(x, x2, y, ..., permutations = 1) {
 scrps.numeric <- function(x, x2, y, ..., permutations = 1) {
   stopifnot(length(x) == length(x2),
             length(y) == 1)
-  scrps.matrix(as.matrix(x), as.matrix(x2), y, permutations)
+  scrps.matrix(as.matrix(x), as.matrix(x2), y, permutations = permutations)
 }
 
 

tests/testthat/test_crps.R

@@ -56,3 +56,12 @@ test_that("methods for single data point don't error", {
   expect_silent(crps(x1[,1], x2[,1], y[1]))
   expect_silent(scrps(x1[,1], x2[,1], y[1]))
 })
+
+test_that("methods for single data point pass permutations to matrix methods", {
+  set.seed(1); a <- crps(x1[,1], x2[,1], y[1], permutations = 5)
+  set.seed(1); b <- crps(x1[,1, drop = FALSE], x2[,1, drop = FALSE], y[1], permutations = 5)
+  expect_equal(a, b)
+  set.seed(1); a <- scrps(x1[,1], x2[,1], y[1], permutations = 5)
+  set.seed(1); b <- scrps(x1[,1, drop = FALSE], x2[,1, drop = FALSE], y[1], permutations = 5)
+  expect_equal(a, b)
+})