Merge pull request #984 from sys-bio/resetAll-on-set-init

Switch to resetAll when setting an init() value.
sys-bio · Apr 6, 2022 · 9d4e698 · 9d4e698
2 parents 3542ba0 + 0055eb3
commit 9d4e698
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/source/rrRoadRunner.cpp b/source/rrRoadRunner.cpp
@@ -4346,9 +4346,14 @@ namespace rr {
 
         SelectionRecord sel(sId);
 
-        if (sel.selectionType == SelectionRecord::INITIAL_AMOUNT ||
-            sel.selectionType == SelectionRecord::INITIAL_CONCENTRATION) {
-            reset();
+        if (sel.selectionType & SelectionRecord::INITIAL) {
+            reset(
+                SelectionRecord::TIME |
+                SelectionRecord::RATE |
+                SelectionRecord::FLOATING |
+                SelectionRecord::BOUNDARY |
+                SelectionRecord::COMPARTMENT |
+                SelectionRecord::GLOBAL_PARAMETER);
         }
     }
 

diff --git a/wrappers/C/rrc_api.h b/wrappers/C/rrc_api.h
@@ -3048,8 +3048,8 @@ C_DECL_SPEC RRCDataPtr rrcCallConv gillespieMeanSDOnGridEx(RRHandle handle, doub
 C_DECL_SPEC bool rrcCallConv reset(RRHandle handle);
 
 /*!
- \brief Resets all variables of the model to their current initial values,
- and resets all parameters to their original values.
+ \brief Resets all variables of all types in the model to their 
+ current initial values.
 
  \param[in] handle Handle to a RoadRunner instance
  \return Boolean indicating success