Skip to content
Open
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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mitml
Type: Package
Title: Tools for Multiple Imputation in Multilevel Modeling
Version: 0.3-5.7
Version: 0.3-5.8
Date: 2018-02-08
Author: Simon Grund [aut,cre], Alexander Robitzsch [aut], Oliver Luedtke [aut]
Maintainer: Simon Grund <grund@ipn.uni-kiel.de>
Expand Down
7 changes: 6 additions & 1 deletion R/testConstraints.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ testConstraints <- function(model, qhat, uhat, constraints, method=c("D1","D2"),
method <- match.arg(method)

cons <- gsub("\\(Intercept\\)","Intercept",constraints)

cons <- gsub(":","_.x._", cons)

# warnings for ignored arguments
if(!is.null(df.com) & method=="D2") warning("Setting complete-data degrees of freedom is only available for 'D1' and will be ignored with 'D2'.")

Expand Down Expand Up @@ -100,6 +101,7 @@ testConstraints <- function(model, qhat, uhat, constraints, method=c("D1","D2"),
theta <- Qhat[,ii]
Sigma <- Uhat[,,ii]
names(theta) <- gsub("\\(Intercept\\)","Intercept",names(theta))
names(theta) <- gsub(":","_.x._",names(theta))

g <- parse(text=cons)
env.g <- new.env()
Expand Down Expand Up @@ -169,6 +171,9 @@ testConstraints <- function(model, qhat, uhat, constraints, method=c("D1","D2"),
out <- matrix(c(val,k,v,p,r),ncol=5)
colnames(out) <- c("F.value","df1","df2","P(>F)","RIV") # new label for p-value, SiG 2017-02-09

## return interaction labels to their original form (":")
cons <- gsub("_.x._",":", cons)

out <- list(
call=match.call(),
constraints=cons,
Expand Down