Merge pull request #22 from pitakakariki/dev

Dev
pitakakariki · Oct 11, 2015 · 6c19bad · 6c19bad
2 parents e0de062 + 0e05d37
commit 6c19bad
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 4 deletions.
diff --git a/R/getData.R b/R/getData.R
@@ -34,7 +34,14 @@ getData <- function(object) {
     if(!is.null(newData)) return(newData)
 
     #
-    # 2nd choice: Use the `data` argument
+    # 2nd choice: @frame for merMod, $model for lm.
+    #
+
+    if(is(object, "merMod")) return(object@frame)
+    if(is(object, "lm")) return(object$model)
+
+    #
+    # 3rd choice: Use the `data` argument
     #
 
     dataName <- as.character(getCall(object)$data)

diff --git a/R/maybe.R b/R/maybe.R
@@ -64,6 +64,65 @@ maybe <- function(f) {
     }
 }
 
+maybe2 <- function(f) {
+
+    cfw <- "(converted from warning)"
+
+    function(...) {
+
+        opts <- options(warn=2)
+        on.exit(options(opts))
+
+        returnValue <- NULL
+        warningValue <- NULL
+        warningTag <- NULL
+        errorValue <- NULL
+        errorTag <- NULL
+
+        returnValue <- tryCatch(
+
+            withCallingHandlers(eval.parent(f(...)),
+
+                error=function(e) {
+
+                    if(str_detect(e$message, cfw)) {
+
+                        # get rid of conversions junk
+                        msg <- e$message
+                        msg <- substring(msg, 24+str_locate(msg, cfw)[1,1])
+                        msg <- str_trim(msg)
+
+                        warningValue <<- append(warningValue, msg)
+                        wtag <- if(is.null(e$tag)) "" else e$tag
+                        warningTag <<- append(warningTag, wtag)
+                        message(msg)
+                        print(computeRestarts())
+                        invokeRestart("muffleWarning")
+
+                    } else {
+
+                        errorValue <<- e$message
+                        errorTag <<- if(is.null(e$tag)) "" else e$tag
+                        return(NULL)
+                    }
+                }
+            )
+        )
+
+        rval <- list()
+        class(rval) <- "Maybe"
+
+        rval["value"] <- list(returnValue) # nb returnValue might be NULL
+        rval["warning"] <- list(warningValue)
+        rval["warningtag"] <- list(warningTag)
+        rval["error"] <- list(errorValue)
+        rval["errortag"] <- list(errorTag)
+
+        return(rval)
+    }
+}
+
+
 list2maybe <- function(x) {
 
     rval <- list()

diff --git a/R/testLibrary.R b/R/testLibrary.R
@@ -102,7 +102,7 @@ fixeddesc <- function(text, xname) {
     function(fit, sim) {
 
         # test used
-        rval <- if(text=="default") defaultdesc(fit) else text
+        rval <- if(text=="default") defaultdesc(fit, xname) else text
 
         # effect size
         fe <- maybe(fixef)(sim)$value
@@ -122,6 +122,8 @@ fixeddesc <- function(text, xname) {
 # glmer - ztest
 defaulttest <- function(fit, xname) {
 
+    if(is.factor(getData(fit)[[xname]])) return(lrtest(fit, xname))
+
     switch(class(fit)[1],
 
         lm       = ttest(fit, xname),
@@ -132,7 +134,9 @@ defaulttest <- function(fit, xname) {
     )
 }
 
-defaultdesc <- function(fit) {
+defaultdesc <- function(fit, xname) {
+
+    if(is.factor(getData(fit)[[xname]])) return("Likelihood ratio")
 
     switch(class(fit)[1],
 

diff --git a/tests/testthat/helper_options.R → tests/testthat/test_aaa.R b/tests/testthat/helper_options.R → tests/testthat/test_aaa.R
@@ -11,4 +11,4 @@ helperopts <- simrOptions(nsim=test.nsim, progress=test.progress)
 # Useful to have an example model.
 #
 
-fm1 <- lmer(y ~ x + (1|g), data=example)
+fm1 <- lmer(y ~ x + (1|g), data=simdata)