From aac24d7a5d0d8a4117eca2e44f78c65c3626b4b4 Mon Sep 17 00:00:00 2001
From: agdamsbo <agdamsbo@pm.me>
Date: Wed, 13 Nov 2019 10:18:18 +0100
Subject: [PATCH] u

---
 DESCRIPTION     |  2 +-
 R/strobe_pred.R | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 6f1f392..940bfaa 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: daDoctoR
 Type: Package
 Title: FUNCTIONS FOR HEALTH RESEARCH
-Version: 0.1.0.9026
+Version: 0.1.0.9027
 Author: c(person("Andreas", "Gammelgaard Damsbo", email = "agdamsbo@pm.me", role = c("cre", "aut")))
 Maintainer: Andreas Gammelgaard Damsbo <agdamsbo@pm.me>
 Description: I am a Danish medical doctor involved in neuropsychiatric research. 
diff --git a/R/strobe_pred.R b/R/strobe_pred.R
index 4004710..d77d8f6 100644
--- a/R/strobe_pred.R
+++ b/R/strobe_pred.R
@@ -138,12 +138,12 @@ strobe_pred<-function(meas,adj,data,dec=2,n.by.adj=FALSE,p.val=FALSE){
 
   rnames<-c()
 
-  for (i in 1:ncol(dat2)){
-    if (is.factor(dat2[,i])){
-      rnames<-c(rnames,names(dat2)[i],levels(dat2[,i]))
+  for (i in 1:length(ads)){
+    if (is.factor(ads[,i])){
+      rnames<-c(rnames,names(ads[i]),levels(ads[,i]))
     }
-    if (!is.factor(dat2[,i])){
-      rnames<-c(rnames,names(dat2[i]),"Per unit increase")
+    if (!is.factor(ads[,i])){
+      rnames<-c(rnames,names(ads[i]),"Per unit increase")
     }
   }
   res<-cbind(aor_ci,apv)
@@ -180,11 +180,6 @@ strobe_pred<-function(meas,adj,data,dec=2,n.by.adj=FALSE,p.val=FALSE){
 
   if(!is.factor(m)){
 
-    d<-dta
-    m<-d[,c(meas)]
-
-    ads<-d[,c(adj)]
-
     dfcr<-data.frame(matrix(NA,ncol = 3))
     names(dfcr)<-c("pred","dif_ci","pv")
     n.mn<-c()
@@ -302,12 +297,12 @@ strobe_pred<-function(meas,adj,data,dec=2,n.by.adj=FALSE,p.val=FALSE){
 
     rnames<-c()
 
-    for (i in 1:ncol(dat2)){
-      if (is.factor(dat2[,i])){
-        rnames<-c(rnames,names(dat2)[i],levels(dat2[,i]))
+    for (i in 1:length(ads)){
+      if (is.factor(ads[,i])){
+        rnames<-c(rnames,names(ads[i]),levels(ads[,i]))
       }
-      if (!is.factor(dat2[,i])){
-        rnames<-c(rnames,names(dat2[i]),"Per unit increase")
+      if (!is.factor(ads[,i])){
+        rnames<-c(rnames,names(ads[i]),"Per unit increase")
       }
     }
     res<-cbind(amean_ci,apv)