fix interim outputs not being created; don't output if INTERIM_OUTPUT_INTERVAL = 0

Author: jordan-evens

settings.ini

@@ -28,8 +28,8 @@ DEFAULT_PERCENT_CONIFER = 50
 DEFAULT_PERCENT_DEAD_FIR = 30
 # maximum amount of time to take for simulation (seconds) (0 is unlimited)
 MAXIMUM_TIME = 0
-# amount of time between generating interim outputs (seconds)
-INTERIM_OUTPUT_INTERVAL = 240
+# amount of time between generating interim outputs (seconds) (0 is no interim outputs)
+INTERIM_OUTPUT_INTERVAL = 0
 # maximum number of simulations to do (0 is exactly 1 simulation per scenario)
 MAXIMUM_SIMULATIONS = 10000
 # maximum percent change in statistics between runs before results are consider stable [0 - 1]

src/cpp/fs/Model.cpp

@@ -803,10 +803,15 @@ map<DurationSize, shared_ptr<ProbabilityMap>> Model::runIterations(
     constexpr auto CHECK_INTERVAL = std::chrono::seconds(1);
     bool keep_checking{true};
     const bool is_limited = 0 != Settings::maximumTimeSeconds();
+    const bool with_interim = 0 != interim_save_interval_.count();
     if (!is_limited)
     {
       logging::note("No time limit being enforced since MAXIMUM_TIME = 0");
     }
+    if (!with_interim)
+    {
+      logging::note("No interim outputs being generated since INTERIM_OUTPUT_INTERVAL = 0");
+    }
     while (keep_checking)
     {
       this->last_checked_ = Clock::now();
@@ -815,6 +820,12 @@ map<DurationSize, shared_ptr<ProbabilityMap>> Model::runIterations(
       std::this_thread::sleep_for(CHECK_INTERVAL);
       // set bool so other things don't need to check clock
       is_out_of_time_ = is_limited && runTime().count() >= timeLimit().count();
+      should_output_interim_ =
+        with_interim && timeSinceLastSave().count() >= interimTimeLimit().count();
+      if (should_output_interim_ && interim_changed_)
+      {
+        saveProbabilities(all_probabilities[0], start_day, true);
+      }
       logging::verbose("Checking clock [%ld of %ld]", runTime(), timeLimit());
       keep_checking = (runs_left > 0 && !shouldStop());
     }