0.6.8

jinseob2kim · Jan 16, 2019 · 5d327f1 · 5d327f1
1 parent 0ed57b4
commit 5d327f1
Show file tree

Hide file tree

Showing 49 changed files with 82 additions and 74 deletions.
diff --git a/R/regress.R b/R/regress.R
@@ -254,7 +254,8 @@ regressModule <- function(input, output, session, data, data_label, data_varStru
 
     ## Warning when multicollinearity
     warn <- NULL
-    zz <- tryCatch(solve(t(as.matrix(mf)) %*% as.matrix(mf)), error = function(e) e)
+    mm <- model.matrix(form, data.regress)
+    zz <- tryCatch(solve(t(as.matrix(mm)) %*% as.matrix(mm)), error = function(e) e)
     if ("error" %in% class(zz)) {
       warn <- "There are strongly correlated independent values. Please see correlation in `Plot- Scatter plot` tab"
     }
@@ -486,7 +487,8 @@ regressModule2 <- function(input, output, session, data, data_label, data_varStr
 
 
       ## Warning when multicollinearity
-      zz <- tryCatch(solve(t(as.matrix(mf)) %*% as.matrix(mf)), error = function(e) e)
+      mm <- model.matrix(form, data.regress)
+      zz <- tryCatch(solve(t(as.matrix(mm)) %*% as.matrix(mm)), error = function(e) e)
       if ("error" %in% class(zz)) {
         warn <- "There are strongly correlated independent values. Please see correlation in `Plot- Scatter plot` tab"
       } else{ warn <- NULL}
@@ -514,12 +516,6 @@ regressModule2 <- function(input, output, session, data, data_label, data_varStr
         need(sum(lgl.1level) == 0, paste(paste(names(lgl.1level)[lgl.1level], collapse =" ,"), "has(have) a unique value. Please remove that from independent variables"))
       )
 
-      ## Warning when multicollinearity
-      warn <- NULL
-      zz <- tryCatch(solve(t(as.matrix(mf)) %*% as.matrix(mf)), error = function(e) e)
-      if ("error" %in% class(zz)) {
-        warn <- "There are strongly correlated independent values. Please see correlation in `Plot- Scatter plot` tab"
-      }
 
       res.svyglm <- survey::svyglm(form, design = data.design)
       tb.svyglm <- jstable::svyregress.display(res.svyglm, decimal = input$decimal)

diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/FilePs.html b/docs/reference/FilePs.html
diff --git a/docs/reference/FilePsInput.html b/docs/reference/FilePsInput.html
diff --git a/docs/reference/FileRepeated.html b/docs/reference/FileRepeated.html
diff --git a/docs/reference/FileRepeatedInput.html b/docs/reference/FileRepeatedInput.html
diff --git a/docs/reference/FileSurvey.html b/docs/reference/FileSurvey.html
diff --git a/docs/reference/FileSurveyInput.html b/docs/reference/FileSurveyInput.html
diff --git a/docs/reference/GEEModuleLinear.html b/docs/reference/GEEModuleLinear.html
diff --git a/docs/reference/GEEModuleLogistic.html b/docs/reference/GEEModuleLogistic.html
diff --git a/docs/reference/GEEModuleUI.html b/docs/reference/GEEModuleUI.html
diff --git a/docs/reference/coxModule.html b/docs/reference/coxModule.html
diff --git a/docs/reference/coxUI.html b/docs/reference/coxUI.html
diff --git a/docs/reference/csvFile.html b/docs/reference/csvFile.html
diff --git a/docs/reference/csvFileInput.html b/docs/reference/csvFileInput.html
diff --git a/docs/reference/ggpairsModule.html b/docs/reference/ggpairsModule.html
diff --git a/docs/reference/ggpairsModule2.html b/docs/reference/ggpairsModule2.html
diff --git a/docs/reference/ggpairsModuleUI1.html b/docs/reference/ggpairsModuleUI1.html
diff --git a/docs/reference/ggpairsModuleUI2.html b/docs/reference/ggpairsModuleUI2.html
diff --git a/docs/reference/ggplotdownUI.html b/docs/reference/ggplotdownUI.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/jsBasicAddin.html b/docs/reference/jsBasicAddin.html
diff --git a/docs/reference/jsBasicGadget.html b/docs/reference/jsBasicGadget.html
diff --git a/docs/reference/jsPropensityAddin.html b/docs/reference/jsPropensityAddin.html