Ready to submit

masiraji · Jan 8, 2024 · 212cf61 · 212cf61
1 parent 6b4c1cf
commit 212cf61
Show file tree

Hide file tree

Showing 34 changed files with 486 additions and 126 deletions.
diff --git a/R/bedtime.R b/R/bedtime.R
@@ -20,22 +20,17 @@
 #'Calculates time spent in bed in hours. Output class is numeric.
 
 #' @export
+bedTime <- function(x,y)
+{
+  bed <- x
+  wake <- y
+  wake <- paste(Sys.Date(), wake)
+  tmpbed <- paste(Sys.Date(), bed)
+  d <- apply(data.frame(tmpbed, wake), 1, function(x) difftime(x[2], x[1],
+                                                               units = "hours"))
+  adjust <- -(d < 0)
+  tmpbed <- paste(Sys.Date()+adjust, bed)
+  apply(data.frame(tmpbed, wake), 1, function(x) difftime(x[2], x[1], units = "hours"))
+}
+
 
-bedTime <- function(x, y) {
-  if (is.na(x) | is.na(y)) {
-    warning("Either bedtime or waking time was NA. Hours in bed returned as NA")
-    return(NA)
-  } else if (grepl("[0-9][0-9]:[0-9][0-9]", x) | grepl("[0-9][0-9]:[0-9][0-9]", y)) {
-    bed <- x
-    wake <- y
-    wake <- paste(Sys.Date(), wake)
-    tmpbed <- paste(Sys.Date(), bed)
-    d <- apply(data.frame(tmpbed, wake), 1, function(x) difftime(x[2], x[1], units = "hours"))
-    adjust <- -(d < 0)
-    tmpbed <- paste(Sys.Date()+adjust, bed)
-    bed_hours <- apply(data.frame(tmpbed, wake), 1, function(x) difftime(x[2], x[1], units = "hours"))
-    return(bed_hours)
-  } else {
-    warning("Either bedtime or waking time is not a string variable, or is not formatted as 'hh:mm'")
-    return(NA)}
-  }
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,3 +1,11 @@
+## Resubmission 05 on 8 Jan 2024
+This is the 5th resubmission. In this submission:
+* I have removed extra spaces in lavaan syntaxs used in cfa.tab.multi.R and cfa.tab.R files.
+R-CMD results indicated
+* 0 errors, 0 warnings, 0 notes.
+
+
+
 ## Resubmission 04 on 30 Sep 2022
 This is the 4th resubmission. In this submission:
 * I have removed the acronyms from description file.

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/THANKS.html b/docs/THANKS.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/pkgdown.yml b/docs/pkgdown.yml
@@ -1,6 +1,6 @@
-pandoc: '2.18'
-pkgdown: 2.0.6
+pandoc: 3.1.1
+pkgdown: 2.0.7
 pkgdown_sha: ~
 articles: {}
-last_built: 2022-10-04T12:49Z
+last_built: 2024-01-08T15:33Z
 
diff --git a/docs/reference/FFMQ.CFA.html b/docs/reference/FFMQ.CFA.html
diff --git a/docs/reference/FFMQ.Val.html b/docs/reference/FFMQ.Val.html
diff --git a/docs/reference/Gantt.html b/docs/reference/Gantt.html
diff --git a/docs/reference/Rotter.html b/docs/reference/Rotter.html
diff --git a/docs/reference/Spot.html b/docs/reference/Spot.html
diff --git a/docs/reference/bedTime.html b/docs/reference/bedTime.html
diff --git a/docs/reference/cfa.tab.html b/docs/reference/cfa.tab.html
diff --git a/docs/reference/cfa.tab.multi.html b/docs/reference/cfa.tab.multi.html
diff --git a/docs/reference/des.tab.html b/docs/reference/des.tab.html
diff --git a/docs/reference/fac.tab.html b/docs/reference/fac.tab.html
diff --git a/docs/reference/figures/irt2.png b/docs/reference/figures/irt2.png
diff --git a/docs/reference/ggicc.html b/docs/reference/ggicc.html
diff --git a/docs/reference/ggiteminfo.html b/docs/reference/ggiteminfo.html
diff --git a/docs/reference/ggreliability.html b/docs/reference/ggreliability.html
diff --git a/docs/reference/ggreliability_plotly.html b/docs/reference/ggreliability_plotly.html
diff --git a/docs/reference/ggtestinfo.html b/docs/reference/ggtestinfo.html