20240109 - fix to address frequency counts of zero

Author: Petersen

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: petersenlab
 Type: Package
 Title: Package of R Functions for the Petersen Lab
-Version: 0.1.2-9027
+Version: 0.1.2-9028
 Authors@R: person("Isaac T.", "Petersen",
   email = "isaac-t-petersen@uiowa.edu",
   role = c("aut", "cre"), 

R/recodeIntensity.R

@@ -9,16 +9,15 @@
 #' zero (i.e., if the behavior has not occurred).
 #'
 #' @param intensity The intensity of the behavior.
-#' @param not_in_the_past_year Whether or not the behavior did NOT occur in
-#' the past year. If \code{yes}, the behavior did not occur in the past year.
+#' @param did_not_occur Whether or not the behavior did NOT occur. If
+#' \code{yes}, the behavior did not occur (in the given timeframe).
 #' @param frequency The frequency of the behavior.
 #' @param item_names The names of the questionnaire items.
 #' @param data The data object.
 #' @param frequency_vars The name(s) of the variables corresponding to the
 #' number of occurrences (\code{num_occurrences}).
-#' @param not_in_past_year_vars The name(s) of the variables corresponding to
-#' whether the behavior did not occur in the past year
-#' (\code{not_occurred_past_year}).
+#' @param did_not_occur_vars The name(s) of the variables corresponding to
+#' whether the behavior did not occur in the past year (\code{did_not_occur}).
 #'
 #' @return
 #' The intensity of the behavior.
@@ -27,31 +26,41 @@
 
 #' @rdname recodeBehaviorIntensity
 #' @export
-recode_intensity <- function(intensity, not_in_the_past_year = NULL, frequency = NULL){
+recode_intensity <- function(intensity, did_not_occur = NULL, frequency = NULL){
   if(missing(frequency) | is.null(frequency)){
-    result <- ifelse(is.na(not_in_the_past_year), intensity, ifelse(not_in_the_past_year == 1, 0, intensity))
-  } else if(missing(not_in_the_past_year) | is.null(not_in_the_past_year)){
+    result <- ifelse(is.na(did_not_occur), intensity, ifelse(did_not_occur == 1, 0, intensity))
+  } else if(missing(did_not_occur) | is.null(did_not_occur)){
     result <- ifelse(is.na(frequency), intensity, ifelse(frequency == 0, 0, intensity))
-  }
+  } else(
+    result <- ifelse(did_not_occur == 1, 0, ifelse(frequency == 0, 0, intensity))
+  )
 
   return(result)
 }
 
 #' @rdname recodeBehaviorIntensity
 #' @export
-mark_intensity_as_zero <- function(item_names, data, not_in_past_year_vars = NULL, frequency_vars = NULL) {
+mark_intensity_as_zero <- function(item_names, data, did_not_occur_vars = NULL, frequency_vars = NULL) {
   if(missing(frequency_vars) | is.null(frequency_vars)){
 
     recoded <- Map(
       recode_intensity,
       intensity = data[, item_names],
-      not_in_the_past_year = data[, not_in_past_year_vars])
+      did_not_occur = data[, did_not_occur_vars])
+
+  } else if(missing(did_not_occur_vars) | is.null(did_not_occur_vars)){
+
+    recoded <- Map(
+      recode_intensity,
+      intensity = data[, item_names],
+      frequency = data[, frequency_vars])
 
-  } else if(missing(not_in_past_year_vars) | is.null(not_in_past_year_vars)){
+  } else {
 
     recoded <- Map(
       recode_intensity,
       intensity = data[, item_names],
+      did_not_occur = data[, did_not_occur_vars],
       frequency = data[, frequency_vars])
 
   }

README.md

@@ -14,7 +14,7 @@ remotes::install_github("DevPsyLab/petersenlab")
 
 To obtain the citation for the `petersenlab` package, run `citation("petersenlab")`; the citation is:
 
-Petersen, I. T. (2023). *petersenlab: Package of R functions for the Petersen Lab*. R package version 0.1.2-9027. https://github.com/DevPsyLab/petersenlab, https://doi.org/10.5281/zenodo.7602890
+Petersen, I. T. (2023). *petersenlab: Package of R functions for the Petersen Lab*. R package version 0.1.2-9028. https://github.com/DevPsyLab/petersenlab, https://doi.org/10.5281/zenodo.7602890
 
 A `BibTeX` entry for `LaTeX` users is:
 ```
@@ -23,7 +23,7 @@ A `BibTeX` entry for `LaTeX` users is:
   title = {{petersenlab}: Package of {R} functions for the {Petersen Lab}},
   url = {https://github.com/DevPsyLab/petersenlab},
   doi = {10.5281/zenodo.7602890},
-  version = {0.1.2-9027},
+  version = {0.1.2-9028},
   year = {2023}
 }
 ```

man/recodeBehaviorIntensity.Rd

@@ -112,14 +112,14 @@
     },
     "Rcpp": {
       "Package": "Rcpp",
-      "Version": "1.0.11",
+      "Version": "1.0.12",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "methods",
         "utils"
       ],
-      "Hash": "ae6cbbe1492f4de79c45fce06f967ce8"
+      "Hash": "5ea2700d21e038ace58269ecdbeb9ec0"
     },
     "backports": {
       "Package": "backports",