Skip to content

Commit

Permalink
more fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@perrydv
perrydv committed Jun 23, 2024
1 parent ec6be9e commit 4f134ed
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions tests/testthat/test-Nmixture.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions tests/testthat/test-NmixtureADnoDerivs.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
Expand Down

0 comments on commit 4f134ed

Please sign in to comment.