Merge pull request #87 from pythonhealthdatascience/dev

Dev

Author: amyheather

.gitignore

@@ -231,6 +231,3 @@ figure_*.html
 
 _site/
 **/*.quarto_ipynb
-
-_csv_data_dictionary.pdf
-_json_data_dictionary.pdf

.lintr

@@ -1,3 +1,3 @@
-linters: all_linters(packages = "lintr")
+linters: all_linters(packages = "lintr", undesirable_function_linter = NULL)
 encoding: "UTF-8"
 exclusions: list("renv")

DESCRIPTION

@@ -16,6 +16,7 @@ Imports:
     R6,
     rstudioapi,
     simEd,
+    simmer,
     styler,
     testthat,
     webexercises

environment.yaml

@@ -12,9 +12,10 @@ dependencies:
   - pytest=8.4.1
   - python=3.11
   - ruff=0.12.7
+  - simpy=4.1.1
   - pip:
     - ansi2html==1.9.2
     - distfit==1.8.8
     - jupytext==1.17.2
     - lintquarto==0.5.0
-    - sim-tools==0.7.0
+    - sim-tools==0.10.0

pages/inputs/input_data.qmd

@@ -247,7 +247,7 @@ The way you might set these up depends on whether you are allowed to share the r
 ## 🧪 Test yourself
 
 ```{r, echo = FALSE}
-library(webexercises) # nolint: undesirable_function_linter
+library(webexercises) # nolint: library_call_linter
 ```
 
 :::{.callout-note}
@@ -257,7 +257,10 @@ library(webexercises) # nolint: undesirable_function_linter
 ```{r, results="asis", echo = FALSE}
 cat(longmcq(c(
   "Do not share or describe anything.",
-  answer = "Describe the dataset, and if possible also share a data dictionary and a synthetic dataset."
+  answer = paste0(
+    "Describe the dataset, and if possible also share a data dictionary and a",
+    " synthetic dataset."
+  )
 )))
 ```
 
@@ -283,7 +286,10 @@ cat(longmcq(c(
 ```{r, results="asis", echo = FALSE}
 cat(longmcq(c(
   "Duplicate all simulation code across both repositories.",
-  answer = "Develop the simulation code as a package so it can be shared across repositories without code duplication."
+  answer = paste(
+    "Develop the simulation code as a package so it can be shared across ",
+    "repositories without code duplication."
+  )
 )))
 ```
 

pages/inputs/parameters_script.qmd

@@ -34,7 +34,7 @@ This page helps you meet reproducibility criteria from:
 :::{.r-content}
 ```{r}
 # Load required packages
-library(R6) # nolint: undesirable_function_linter
+library(R6)
 ```
 :::
 
@@ -1238,7 +1238,7 @@ Not applicable as the stroke example stores [parameters in a file](parameters_fi
 ## 🧪 Test yourself
 
 ```{r, echo = FALSE}
-library(webexercises) # nolint: undesirable_function_linter
+library(webexercises) # nolint: library_call_linter
 ```
 
 :::{.callout-note}
@@ -1261,7 +1261,10 @@ cat(longmcq(c(
 
 ```{r, results="asis", echo = FALSE}
 cat(longmcq(c(
-  answer = "It ensures that each scenario only uses the parameters intended for it, and avoids accidental reuse between runs.",
+  answer = paste0(
+    "It ensures that each scenario only uses the parameters intended for it, ",
+    "and avoids accidental reuse between runs."
+  ),
   "It always makes your code shorter.",
   "It allows you to skip documenting your parameters."
 )))

pages/inputs/parameters_validation.qmd

@@ -829,7 +829,7 @@ The prevention of new fields is thanks to the default `lock_objects = TRUE` sett
 #' @field transfer_prob Numeric. Transfer probability (0-1).
 
 ParamClass <- R6Class( # nolint: object_name_linter
-  lock_objects = FALSE, 
+  lock_objects = FALSE,
   public = list(
     transfer_prob = NULL,
 
@@ -851,7 +851,7 @@ params <- ParamClass$new()
 try({
   params$transfer_probs <- 0.4
 })
-params 
+params
 ```
 
 #### Setting parameters within a list
@@ -867,15 +867,15 @@ You may choose to store parameters in a list instead, to make it easier to acces
 
 ParamClass <- R6Class( # nolint: object_name_linter
   public = list(
-    parameters = NULL, 
+    parameters = NULL,
 
     #' @description
     #' Initialises the R6 object.
 
     initialize = function(transfer_prob = 0.3) {
-      self$parameters <- list( 
+      self$parameters <- list(
         transfer_prob = transfer_prob
-      ) 
+      )
     }
   )
 )
@@ -889,7 +889,7 @@ params <- ParamClass$new()
 try({
   params$parameters$transfer_probs <- 0.4
 })
-params$parameters 
+params$parameters
 ```
 
 <br>
@@ -912,20 +912,20 @@ ParamClass <- R6Class( # nolint: object_name_linter
       self$transfer_prob <- transfer_prob
     },
 
-    #' @description 
-    #' Returns parameters as a named list. 
-
-    get_params = function() { 
-      # Get all non-function fields 
-      all_names <- ls(self) 
-      is_not_function <- vapply( 
-        all_names, 
-        function(x) !is.function(self[[x]]), 
-        FUN.VALUE = logical(1L) 
-      ) 
-      param_names <- all_names[is_not_function] 
-      mget(param_names, envir = self) 
-    } 
+    #' @description
+    #' Returns parameters as a named list.
+
+    get_params = function() {
+      # Get all non-function fields
+      all_names <- ls(self)
+      is_not_function <- vapply(
+        all_names,
+        function(x) !is.function(self[[x]]),
+        FUN.VALUE = logical(1L)
+      )
+      param_names <- all_names[is_not_function]
+      mget(param_names, envir = self)
+    }
   )
 )
 ```
@@ -939,8 +939,8 @@ try({
   params$transfer_probs <- 0.4
 })
 
-# Get all parameters 
-params$get_params() 
+# Get all parameters
+params$get_params()
 ```
 
 ::::
@@ -1055,7 +1055,7 @@ model <- function(param) {
 
   # Simulation code...
 
-  print("The simulation has run!")
+  cat("The simulation has run!")
 }
 
 
@@ -1180,26 +1180,26 @@ ParamClass <- R6Class( # nolint: object_name_linter
       self$transfer_prob <- transfer_prob
     },
 
-    #' @description 
-    #' Check that transfer_prob is between 0 and 1. 
-    #' @return No return value; throws an error if invalid. 
-
-    validate_param = function() { 
-      if (self$transfer_prob < 0L || self$transfer_prob > 1L) { 
-        stop( 
-          "transfer_prob must be between 0 and 1, but is: ", 
-          self$transfer_prob, call. = FALSE 
-        ) 
-      } 
-    } 
+    #' @description
+    #' Check that transfer_prob is between 0 and 1.
+    #' @return No return value; throws an error if invalid.
+
+    validate_param = function() {
+      if (self$transfer_prob < 0L || self$transfer_prob > 1L) {
+        stop(
+          "transfer_prob must be between 0 and 1, but is: ",
+          self$transfer_prob, call. = FALSE
+        )
+      }
+    }
   )
 )
 ```
 
 ```{r}
 # Create instance with invalid transfer_prob and run method
 param <- ParamClass$new(transfer_prob = 1.4)
-try(param$validate_param()) 
+try(param$validate_param())
 ```
 
 :::
@@ -1287,4 +1287,4 @@ If you haven't already, now's the time to try out **parameter validation** in pr
 
 * Repeat this task, but with an **invalid value** for a parameter (e.g. outside the expected range).
 
-<br><br>
+<br><br>

pages/intro/foss.qmd

@@ -79,7 +79,7 @@ Both have extensive **documentation**, **active user communities**, and **proven
 ## 🧪 Test yourself
 
 ```{r, echo = FALSE}
-library(webexercises) # nolint: undesirable_function_linter
+library(webexercises)
 ```
 
 :::{.callout-note}

pages/intro/rap.qmd

@@ -86,7 +86,7 @@ This book does both! As detailed on the [guidelines](guidelines.qmd) page:
 ## 🧪 Test yourself
 
 ```{r, echo = FALSE}
-library(webexercises) # nolint: undesirable_function_linter
+library(webexercises)
 ```
 
 :::{.callout-note}