Modified intervals such that if the same time interval is added more …

…than once subsequent additions will update the parameters of the interval.
john-harrold · Nov 26, 2023 · 077b48c · 077b48c
1 parent 3e514a8
commit 077b48c
Show file tree

Hide file tree

Showing 43 changed files with 171 additions and 87 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,9 @@
 # ruminate 0.2.0 
 - Added MB (model builder) module with
   - Support for rxode2 and NONMEM models
-- Fixed bug in NCA module where column details didn't update properly when switching between analyses 
+- Fixed bug in NCA module where column details didn't update properly when switching between analyses. 
+- Fixed bug where detecting dosing from rows left the dosing records in the data frame for subsequent NCA.
+- Fixed bug where the same parameter(s) were added over the same interval resulting in [[numeric]] in the reported values. Now if the same time interval is added more than once subsequent additions will update the parameters of the interval.
 
 # ruminate 0.1.1
 - Initial release
diff --git a/R/NCA_Server.R b/R/NCA_Server.R
@@ -4970,17 +4970,38 @@ NCA_add_int = function(state, interval_start, interval_stop, nca_parameters){
   current_ana = NCA_fetch_current_ana(state)
 
 
-  # This adds the row
-  current_ana[["intervals"]] =
-  rbind( current_ana[["intervals"]],
-    data.frame("start"        = interval_start,
-               "stop"         = interval_stop,
-               "np_actual"    = params_string,
-               "np_text"      = names_string,
-               "delete"       = FALSE))
-  # Saving the current analysis with the interval added
-  state = NCA_set_current_ana(state, current_ana)
 
+  # This determines if the new interval already exists:
+  int_exists = FALSE
+  if(!is.null(current_ana[["intervals"]])){
+    if(any((current_ana[["intervals"]][["start"]] == interval_start) &
+           (current_ana[["intervals"]][["stop"]]  == interval_stop))){
+     int_exists = TRUE
+    }
+  }
+
+  # This adds a new interval:
+  if(int_exists){
+    # If the interval exists we replace the values
+    int_ridx = which(c((current_ana[["intervals"]][["start"]] == interval_start) & (current_ana[["intervals"]][["stop"]]  == interval_stop)))
+    # Now we update just the parameters:
+    current_ana[["intervals"]][int_ridx, "np_actual"] = params_string
+    current_ana[["intervals"]][int_ridx, "np_text" ]  = names_string
+    formods::FM_le(state, "NCA_add_int: update")
+  } else {
+    # If the interval does not exist we add a new one:
+    current_ana[["intervals"]] =
+    rbind( current_ana[["intervals"]],
+      data.frame("start"        = interval_start,
+                 "stop"         = interval_stop,
+                 "np_actual"    = params_string,
+                 "np_text"      = names_string,
+                 "delete"       = FALSE))
+    formods::FM_le(state, "NCA_add_int: append")
+  }
+
+  # Saving the current analysis with the interval added/updated
+  state = NCA_set_current_ana(state, current_ana)
 
 state}
 

diff --git a/docs/articles/noncompartmental_analysis.html b/docs/articles/noncompartmental_analysis.html
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-26T05:29Z
+last_built: 2023-11-26T22:20Z
 
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