fix edge prior enum and small tweak to progress bar

Author: vandenman

src/common_helpers.h

@@ -41,7 +41,7 @@ inline UpdateMethod update_method_from_string(const std::string& update_method)
   throw std::invalid_argument("Invalid update_method: " + update_method);
 }
 
-enum EdgePrior { Stochastic_Block, Beta_Bernoulli, Bernoulli };
+enum EdgePrior { Stochastic_Block, Beta_Bernoulli, Bernoulli, Not_Applicable };
 
 inline EdgePrior edge_prior_from_string(const std::string& edge_prior) {
   if (edge_prior == "stochastic-block")
@@ -53,5 +53,8 @@ inline EdgePrior edge_prior_from_string(const std::string& edge_prior) {
   if (edge_prior == "Bernoulli")
     return Bernoulli;
 
+  if (edge_prior == "Not Applicable")
+    return Not_Applicable;
+
   throw std::invalid_argument("Invalid edge_prior: " + edge_prior);
 }

src/progress_manager.cpp

@@ -77,7 +77,7 @@ void ProgressManager::update(size_t chainId) {
 
 void ProgressManager::finish() {
 
-  if (progress_type == 0) return; // No progress display
+  if (progress_type == 0 || needsToExit) return; // No progress display or user interrupt
 
   // Mark all chains as complete and print one final time
   for (size_t i = 0; i < nChains; i++)