Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
^.*\.Rproj$
^\.Rproj\.user$
cache/
README.Rmd
README.md
README_files/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.Rhistory
.RData
.Ruserdata
cache/
21 changes: 17 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
Package: bmd
Type: Package
Title: Benchmark dose estimation for dose-response data
Version: 2.6.5
Date: 2024-12-11
Version: 2.7.1
Date: 2025-03-24
Author: Signe M.Jensen, Christian Ritz and Jens Riis Baalkilde
Maintainer: Signe M. Jensen <smj@plen.ku.dk>
Description: Benchmark dose analysis for continuous, quantal, count and ordinal dose-response data
Imports: drc, ggplot2, dplyr
Suggests: CVXR, multcomp
Suggests:
sandwich,
CVXR,
multcomp,
gridExtra,
isotone,
reshape2,
dplyr,
car,
Matrix,
RLRsim,
scales,
testthat (>= 3.0.0)
License: GPL
Encoding: UTF-8
LazyData: true
LazyData: true
Config/testthat/edition: 3
9 changes: 6 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import(drc, ggplot2, dplyr)
export(bmd, bmdBoot, bmdIso, bmdIsoBoot, PAV, bmdMA, bootDataGen, bmdMACurve, BCa, invBmd, expandBinomial,
getStackingWeights, drmOrdinal, bmdOrdinal, bmdOrdinalMA, expandOrdinal, bootDataGenOrdinal,
qplotDrc, qplotBmd, MACurve)
getStackingWeights, drmOrdinal, bmdOrdinal, bmdOrdinalMA,
expandOrdinal, bootDataGenOrdinal,
qplotDrc, qplotBmd, MACurve, monotonicityTest, trendTest, bmdHetVar, drmHetVar)

## S3 methods
S3method(logLik, drcOrdinal)
S3method(AIC, drcOrdinal)
S3method(BIC, drcOrdinal)
S3method(plot, drcOrdinal)
S3method(print, drcOrdinal)
S3method(print, bmdOrdinal)
S3method(plot, bmd)
S3method(plot, bmd)
S3method(plot, drcHetVar)
5 changes: 5 additions & 0 deletions R/BIC.drcOrdinal.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BIC.drcOrdinal <- function(object, epsilon = 10^(-16)){
n.parameters <- sum(sapply(object$drmList, function(mod) length(mod$coefficients)))
n.obs <- sum(object$data[[object$weights]])
n.parameters * log(n.obs) - 2 * logLik(object, epsilon)
}
Loading
Loading