Fixes bug when extracting dosing records form rows. This will remove …

…the dosing records before NCA is run. Before those were being sent into the NCA analysis.
john-harrold · Nov 25, 2023 · ad71d6f · ad71d6f
1 parent 1b6e5ab
commit ad71d6f
Show file tree

Hide file tree

Showing 40 changed files with 84 additions and 89 deletions.
diff --git a/R/NCA_Server.R b/R/NCA_Server.R
@@ -5418,20 +5418,6 @@ nca_builder = function(state){
         col_args,
         paste0(    '    dose_from = "', dose_from , '")[["dose_rec"]]' ))
 
-  # JMH dose_rec_fix delete
-  # # Creating dosing records
-  # cmd=c(cmd,
-  #   "",
-  #   "# Creating dosing records by reducing the dataset to one row for each unique:",
-  #   "# Subject, Dose number, Grouping (optional) combination",
-  #   paste0(nca_drec_object_name, " = "),
-  #   paste0("  dplyr::group_by(", nca_ds_object_name,",", paste0(plus_cols, collapse=","),") |> "),
-  #   "  dplyr::filter(dplyr::row_number() == 1) |> ",
-  #   "  dplyr::ungroup() |>",
-  #   paste0("  dplyr::select(",paste0(dose_select_cols, collapse=", "),") |> "),
-  #   paste0("  dplyr::mutate(", col_time, " = ", col_time,"-", col_ntime ,")  # Calculating the dose time from on the nominal offset")
-  #   )
-  #
     # Constructing dose_obj
     cmd=c(cmd,
       "",
@@ -5446,6 +5432,15 @@ nca_builder = function(state){
         )
       )
 
+    # If we dose from rows we need to strip those out
+    if(dose_from == "rows"){
+      cmd=c(cmd,
+        "",
+        "# Redusing the NCA dataset to just the observations",
+        paste0(nca_ds_object_name, " = dplyr::filter(", nca_ds_object_name, ", EVID == 0)")
+        )
+    }
+
     # Constructing conc_obj
     col_dur_component =  NULL
     if(col_dur != "N/A"){

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,5 +5,5 @@ articles:
   deployment: deployment.html
   model_builder: model_builder.html
   noncompartmental_analysis: noncompartmental_analysis.html
-last_built: 2023-11-24T19:16Z
+last_built: 2023-11-25T16:59Z
 
diff --git a/docs/reference/MB_build_code.html b/docs/reference/MB_build_code.html
diff --git a/docs/reference/MB_del_current_element.html b/docs/reference/MB_del_current_element.html
diff --git a/docs/reference/MB_fetch_catalog.html b/docs/reference/MB_fetch_catalog.html
diff --git a/docs/reference/MB_fetch_code.html b/docs/reference/MB_fetch_code.html
diff --git a/docs/reference/MB_fetch_component.html b/docs/reference/MB_fetch_component.html