Skip to content

Commit ed28db0

Browse files
committed
*** V2.7.1 ***
- Fixes to several functions including bmd, bmdMA, bmdBoot and many more - qplotBmd works for multiple curves - Added tests using testthat
1 parent 2993a29 commit ed28db0

46 files changed

Lines changed: 5988 additions & 1490 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

DESCRIPTION

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
Package: bmd
22
Type: Package
33
Title: Benchmark dose estimation for dose-response data
4-
Version: 2.6.7
5-
Date: 2024-12-11
4+
Version: 2.7.1
5+
Date: 2025-03-24
66
Author: Signe M.Jensen, Christian Ritz and Jens Riis Baalkilde
77
Maintainer: Signe M. Jensen <smj@plen.ku.dk>
88
Description: Benchmark dose analysis for continuous, quantal, count and ordinal dose-response data
99
Imports: drc, ggplot2, dplyr
1010
Suggests:
11+
sandwich,
1112
CVXR,
1213
multcomp,
1314
gridExtra,
15+
isotone,
16+
reshape2,
17+
dplyr,
18+
car,
19+
Matrix,
20+
RLRsim,
21+
scales,
1422
testthat (>= 3.0.0)
1523
License: GPL
1624
Encoding: UTF-8

NAMESPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import(drc, ggplot2, dplyr)
22
export(bmd, bmdBoot, bmdIso, bmdIsoBoot, PAV, bmdMA, bootDataGen, bmdMACurve, BCa, invBmd, expandBinomial,
3-
getStackingWeights, drmOrdinal, bmdOrdinal, bmdOrdinalMA, expandOrdinal, bootDataGenOrdinal,
3+
getStackingWeights, drmOrdinal, bmdOrdinal, bmdOrdinalMA,
4+
expandOrdinal, bootDataGenOrdinal,
45
qplotDrc, qplotBmd, MACurve, monotonicityTest, trendTest, bmdHetVar, drmHetVar)
56

67
## S3 methods
78
S3method(logLik, drcOrdinal)
89
S3method(AIC, drcOrdinal)
10+
S3method(BIC, drcOrdinal)
911
S3method(plot, drcOrdinal)
1012
S3method(print, drcOrdinal)
1113
S3method(print, bmdOrdinal)

R/BIC.drcOrdinal.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
BIC.drcOrdinal <- function(object, epsilon = 10^(-16)){
2+
n.parameters <- sum(sapply(object$drmList, function(mod) length(mod$coefficients)))
3+
n.obs <- sum(object$data[[object$weights]])
4+
n.parameters * log(n.obs) - 2 * logLik(object, epsilon)
5+
}

0 commit comments

Comments
 (0)