Skip to content

Commit

Permalink
377: Fix compiler warning for new CRAN hotfix (#381)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielinteractive authored Dec 8, 2023
1 parent 4d481c2 commit 64b8c15
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 65 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: mmrm
Title: Mixed Models for Repeated Measures
Version: 0.3.6.9001
Version: 0.3.7
Authors@R: c(
person("Daniel", "Sabanes Bove", , "[email protected]", role = c("aut", "cre")),
person("Julia", "Dedic", , "[email protected]", role = "aut"),
Expand All @@ -27,7 +27,7 @@ Description: Mixed models for repeated measures (MMRM) are a popular
choice for analyzing longitudinal continuous outcomes in randomized
clinical trials and beyond; see Cnaan, Laird and Slasor (1997)
<doi:10.1002/(SICI)1097-0258(19971030)16:20%3C2349::AID-SIM667%3E3.0.CO;2-E>
for a tutorial and Mallinckrodt, Lane, Schnell et al. (2008)
for a tutorial and Mallinckrodt, Lane, Schnell, Peng and Mancuso (2008)
<doi:10.1177/009286150804200402> for a review. This package implements
MMRM based on the marginal linear model without random effects using
Template Model Builder ('TMB') which enables fast and robust model
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# mmrm 0.3.6.9001
# mmrm 0.3.7

### Miscellaneous

- In documentation of `mmrm_control()`, the allowed vcov definition is corrected to "Empirical-Jackknife" (CR3), and "Empirical-Bias-Reduced" (CR2).
- Fix a compiler warning related to missing format specification in error message function call.

# mmrm 0.3.6

Expand Down
97 changes: 37 additions & 60 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
@@ -1,126 +1,107 @@
adh
al
ansi
ar
ast
AstraZeneca
BCVA
Benchmarking
blockdiag
Boehringer
boldsymbol
Bolker
Bove
burnham
COPD
Cnaan
DF
DPD
DeclareMathOperator
Dohme
FEV
Gower
Hoffmann
Indexible
Ingelheim
Kenward
LDL
MMRMs
MacOS
Mallinckrodt
Mancuso
ORCID
Optimizers
Peng
Raphson
SAS's
SICI
Sabanes
Satterthwaite
Schnell
Slasor
TMB
Tidymodels
Toeplitz
WLS
adh
ansi
ar
ast
blockdiag
boldsymbol
cdots
cli
Cnaan
config
COPD
cov
cpp
csh
customizations
ddots
de
DeclareMathOperator
det
df
DF
differiention
Dohme
doi
dotsb
dotsc
DPD
eigen
emmeans
et
FEV
factorizations
frac
funder
galecki
github
gitignore
glmmTMB
gls
Gower
hj
Hoffmann
hurvich
ih
ihj
ij
ijk
ik
im
Indexible
indexible
infty
Ingelheim
init
intra
jh
ji
jj
Kenward
kr
LDL
ldots
leq
lintr
lmer
MacOS
Mallinckrodt
mathbb
mathcal
mathop
mathrm
mmrm
MMRM
MMRMs
na
nabla
ne
newcommand
nlminb
nonidentifiability
onLoad
Optimizers
optimizers
ORCID
parallelization
parametrized
pearson
pkgdown
plc
pmatrix
pre
Quartile
Raphson
rightarrow
Rmarkdown
Sabanes
SAS's
Satterthwaite
Schnell
se
SICI
simeq
Slasor
sp
src
subfolders
tabset
th
Tidymodels
tidymodels
TMB
tmb
toep
toeph
Toeplitz
unadjusted
unscaled
untracked
Expand All @@ -129,8 +110,4 @@ varepsilon
varphi
vcov
vdots
VIS
widehat
WLS
yaml
yml
4 changes: 2 additions & 2 deletions src/covariance.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ matrix<T> get_covariance_lower_chol(const vector<T>& theta, int n_visits, std::s
} else if (cov_type == "csh") {
result = get_compound_symmetry_heterogeneous<T>(theta, n_visits);
} else {
Rf_error(("Unknown covariance type '" + cov_type + "'.").c_str());
Rf_error("%s", ("Unknown covariance type '" + cov_type + "'.").c_str());
}

return result;
Expand All @@ -174,7 +174,7 @@ matrix<T> get_spatial_covariance_lower_chol(const vector<T>& theta, const matrix
if (cov_type == "sp_exp") {
result = get_spatial_exponential<T>(theta, distance);
} else {
Rf_error(("Unknown spatial covariance type '" + cov_type + "'.").c_str());
Rf_error("%s", ("Unknown spatial covariance type '" + cov_type + "'.").c_str());
}
return result;
}
Expand Down

0 comments on commit 64b8c15

Please sign in to comment.