From 4f134eda5667166997423c4caf7932fb676033b3 Mon Sep 17 00:00:00 2001 From: perrydv Date: Sun, 23 Jun 2024 15:10:25 -0700 Subject: [PATCH] more fixed tests --- tests/testthat/test-Nmixture.R | 14 ++++++------- tests/testthat/test-NmixtureADnoDerivs.R | 26 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/testthat/test-Nmixture.R b/tests/testthat/test-Nmixture.R index 17b7ddb..32f1e81 100644 --- a/tests/testthat/test-Nmixture.R +++ b/tests/testthat/test-Nmixture.R @@ -716,7 +716,7 @@ test_that("dNmixture_BBP_v works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -859,8 +859,8 @@ test_that("dNmixture_BBP_s works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, - shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, + alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -1002,7 +1002,7 @@ test_that("dNmixture_BBP_oneObs works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom_One(x, N, alpha, beta)) + prod(dBetaBinom_s(x, N, alpha, beta)) } expect_equal(probX, correctProbX) @@ -1146,7 +1146,7 @@ test_that("dNmixture_BBNB_v works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -1289,7 +1289,7 @@ test_that("dNmixture_BBNB_s works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -1431,7 +1431,7 @@ test_that("dNmixture_BBNB_oneObs works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom_One(x, N, alpha, beta)) + prod(dBetaBinom_s(x, N, alpha, beta)) } expect_equal(probX, correctProbX) diff --git a/tests/testthat/test-NmixtureADnoDerivs.R b/tests/testthat/test-NmixtureADnoDerivs.R index 8b520c0..67fe741 100644 --- a/tests/testthat/test-NmixtureADnoDerivs.R +++ b/tests/testthat/test-NmixtureADnoDerivs.R @@ -768,7 +768,7 @@ test_that("dNmixtureAD_BBP_v works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -785,7 +785,7 @@ test_that("dNmixtureAD_BBP_v works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(dynProbX, dynCorrectProbX) } @@ -935,8 +935,8 @@ test_that("dNmixtureAD_BBP_s works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, - shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, + shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -953,7 +953,7 @@ test_that("dNmixtureAD_BBP_s works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dpois(N, lambda) * - prod(dBetaBinom(x, N, shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(dynProbX, dynCorrectProbX) } @@ -1107,7 +1107,7 @@ test_that("dNmixtureAD_BBP_oneObs works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dpois(N, lambda) * - prod(dBetaBinom_One(x, N, alpha, beta)) + prod(dBetaBinom_s(x, N, alpha, beta)) } expect_equal(probX, correctProbX) @@ -1124,7 +1124,7 @@ test_that("dNmixtureAD_BBP_oneObs works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dpois(N, lambda) * - prod(dBetaBinom_One(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_s(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(dynProbX, dynCorrectProbX) } @@ -1280,7 +1280,7 @@ test_that("dNmixtureAD_BBNB_v works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -1297,7 +1297,7 @@ test_that("dNmixtureAD_BBNB_v works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = alpha, shape2 = beta)) + prod(dBetaBinom_v(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(dynProbX, dynCorrectProbX) } @@ -1452,7 +1452,7 @@ test_that("dNmixtureAD_BBNB_s works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(probX, correctProbX) @@ -1468,7 +1468,7 @@ test_that("dNmixtureAD_BBNB_s works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom(x, N, shape1 = rep(alpha, len), shape2 = rep(beta, len))) + prod(dBetaBinom_s(x, N, shape1 = alpha, shape2 = beta)) } expect_equal(dynProbX, dynCorrectProbX) } @@ -1621,7 +1621,7 @@ test_that("dNmixtureAD_BBNB_oneObs works", correctProbX <- 0 for (N in Nmin:Nmax) { correctProbX <- correctProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom_One(x, N, alpha, beta)) + prod(dBetaBinom_s(x, N, alpha, beta)) } expect_equal(probX, correctProbX) @@ -1638,7 +1638,7 @@ test_that("dNmixtureAD_BBNB_oneObs works", dynCorrectProbX <- 0 for (N in Nmin:Nmax) { dynCorrectProbX <- dynCorrectProbX + dnbinom(N, size = r, prob = pNB) * - prod(dBetaBinom_One(x, N, alpha, beta)) + prod(dBetaBinom_s(x, N, alpha, beta)) } expect_equal(dynProbX, dynCorrectProbX) }