Renamed CwdChanger::reset to CwdChanger::restore and CwdChanger::release to CwdChanger::stay

Author: adamkewley

OpenSim/Common/IO.cpp

@@ -736,12 +736,12 @@ IO::CwdChanger& IO::CwdChanger::operator=(CwdChanger&& tmp) {
     return *this;
 }
 
-void IO::CwdChanger::reset() {
+void IO::CwdChanger::restore() {
     chDir(_existingDir);
     _existingDir.clear();
 }
 
-void IO::CwdChanger::release() noexcept {
+void IO::CwdChanger::stay() noexcept {
     _existingDir.clear();
 }
 

OpenSim/Common/IO.h

@@ -191,18 +191,18 @@ class OSIMCOMMON_API IO {
          * original location.
          *
          * This is functionally equivalent to prematurely destructing the
-         * CwdChanger. After calling CwdChanger::reset(), the now-reset
+         * CwdChanger. After calling CwdChanger::restore(), the now-restored
          * CwdChanger will become a noop instance that, when it destructs,
          * will not attempt to change back to the original directory.
          */
-        void reset();
+        void restore();
 
         /**
          * Release CwdChanger's control over the current working directory,
-         * such that the CwdChanger instance does not attempt to change
-         * directory on destruction.
+         * such that the CwdChanger instance does not attempt to change back
+         * to its original directory on destruction.
          */
-        void release() noexcept;
+        void stay() noexcept;
 
         /**
          * Destructs a CwdChanger instance.

OpenSim/Simulation/Model/ExternalLoads.cpp

@@ -166,9 +166,9 @@ void ExternalLoads::extendConnectToModel(Model& aModel)
                 log_error("Failed to read ExternalLoads data file '{}'.",
                         this->_dataFileName);
                 if (this->getDocument()) {
-                    cwd.reset();
+                    cwd.restore();
                 } else {
-                    cwd.release();
+                    cwd.stay();
                 }
                 throw(ex);
             }

OpenSim/Tools/AnalyzeTool.cpp

@@ -603,7 +603,7 @@ bool AnalyzeTool::run(bool plotting)
     if (completed && _printResultFiles)
         printResults(getName(),getResultsDir()); // this will create results directory if necessary
 
-    cwd.reset();
+    cwd.restore();
 
     removeExternalLoadsFromModel();
 

OpenSim/Tools/ForwardTool.cpp

@@ -309,18 +309,18 @@ bool ForwardTool::run()
     } catch(const std::exception& x) {
         log_error("ForwardTool::run() caught an exception: \n {}", x.what());
         completed = false;
-        cwd.reset();
+        cwd.restore();
     }
     catch (...) { // e.g. may get InterruptedException
         log_error("ForwardTool::run() caught an exception.");
         completed = false;
-        cwd.reset();
+        cwd.restore();
     }
     // PRINT RESULTS
     string fileName;
     if(_printResultFiles) printResultsInternal();
 
-    cwd.reset();
+    cwd.restore();
 
     removeAnalysisSetFromModel();
     return completed;

OpenSim/Tools/InverseDynamicsTool.cpp

@@ -407,7 +407,7 @@ bool InverseDynamicsTool::run()
 
         IO::makeDir(getResultsDir());
         Storage::printResult(&genForceResults, _outputGenForceFileName, getResultsDir(), -1, ".sto");
-        cwd.reset();
+        cwd.restore();
 
         // if body forces to be reported for specified joints
         if(nj >0){

OpenSim/Tools/RRATool.cpp

@@ -817,14 +817,14 @@ bool RRATool::run()
     catch(const Exception& x) {
         // TODO: eventually might want to allow writing of partial results
         log_error(x.what());
-        cwd.reset();
+        cwd.restore();
         // close open files if we die prematurely (e.g. Opt fail)
         manager.getStateStorage().print(getResultsDir() + "/" + getName() + "_states.sto");
         return false;
     }
     catch(...) {
         // TODO: eventually might want to allow writing of partial results
-        cwd.reset();
+        cwd.restore();
         // close open files if we die prematurely (e.g. Opt fail)
         manager.getStateStorage().print(getResultsDir() + "/" + getName() + "_states.sto");
         return false;