More linting

Author: Michael McLeod

cpp/purify/yaml-parser.cc

@@ -119,13 +119,10 @@ void YamlParser::parseAndSetGeneralConfiguration(const YAML::Node& generalConfig
     this->source_ = purify::utilities::vis_source::measurements;
     this->measurements_ = get_vector<std::vector<std::string>>(
         generalConfigNode, {"InputOutput", "input", "measurements", "measurements_files"});
-    try
-    {
-      this->w_term_ = get<bool>(
-        generalConfigNode, {"InputOutput", "input", "measurements", "w_term"});
-    }
-    catch(...)
-    {
+    try {
+      this->w_term_ =
+          get<bool>(generalConfigNode, {"InputOutput", "input", "measurements", "w_term"});
+    } catch (...) {
       PURIFY_LOW_LOG("W-term flag not set for input measurements; defaulting to true.");
       this->w_term_ = true;
     }
@@ -210,8 +207,7 @@ void YamlParser::parseAndSetSARA(const YAML::Node& SARANode) {
 
 void YamlParser::parseAndSetAlgorithmOptions(const YAML::Node& algorithmOptionsNode) {
   this->algorithm_ = get<std::string>(algorithmOptionsNode, {"algorithm"});
-  if (this->algorithm_ == "padmm") 
-  {
+  if (this->algorithm_ == "padmm") {
     this->epsilonConvergenceScaling_ =
         get<t_real>(algorithmOptionsNode, {"padmm", "epsilonConvergenceScaling"});
     this->mpiAlgorithm_ = factory::algo_distribution_string.at(
@@ -223,9 +219,7 @@ void YamlParser::parseAndSetAlgorithmOptions(const YAML::Node& algorithmOptionsN
         get<t_real>(algorithmOptionsNode, {"padmm", "stepsize", "update_tolerance"});
     this->dualFBVarianceConvergence_ =
         get<t_real>(algorithmOptionsNode, {"padmm", "dualFBVarianceConvergence"});
-  } 
-  else if (this->algorithm_ == "fb" or this->algorithm_ == "fb_joint_map") 
-  {
+  } else if (this->algorithm_ == "fb" or this->algorithm_ == "fb_joint_map") {
     this->mpiAlgorithm_ = factory::algo_distribution_string.at(
         get<std::string>(algorithmOptionsNode, {"fb", "mpiAlgorithm"}));
     this->relVarianceConvergence_ =
@@ -238,17 +232,17 @@ void YamlParser::parseAndSetAlgorithmOptions(const YAML::Node& algorithmOptionsN
 
     this->nondiffFuncType_ = nondiff_type_string.at(
         get<std::string>(algorithmOptionsNode, {"fb", "nonDifferentiableFunctionType"}));
-    if(this->nondiffFuncType_ == nondiff_func_type::Denoiser)
-    {
+    if (this->nondiffFuncType_ == nondiff_func_type::Denoiser) {
       this->model_path_ = get<std::string>(algorithmOptionsNode, {"fb", "modelPath"});
     }
 
     this->diffFuncType_ = diff_type_string.at(
         get<std::string>(algorithmOptionsNode, {"fb", "differentiableFunctionType"}));
-    if(this->diffFuncType_ == diff_func_type::L2Norm_with_CRR)
-    {
-      this->CRR_function_model_path_ = get<std::string>(algorithmOptionsNode, {"fb", "CRR_function_model_path"});
-      this->CRR_gradient_model_path_ = get<std::string>(algorithmOptionsNode, {"fb", "CRR_gradient_model_path"});
+    if (this->diffFuncType_ == diff_func_type::L2Norm_with_CRR) {
+      this->CRR_function_model_path_ =
+          get<std::string>(algorithmOptionsNode, {"fb", "CRR_function_model_path"});
+      this->CRR_gradient_model_path_ =
+          get<std::string>(algorithmOptionsNode, {"fb", "CRR_gradient_model_path"});
       this->CRR_mu_ = get<t_real>(algorithmOptionsNode, {"fb", "CRR_mu"});
       this->CRR_lambda_ = get<t_real>(algorithmOptionsNode, {"fb", "CRR_lambda"});
     }
@@ -264,9 +258,7 @@ void YamlParser::parseAndSetAlgorithmOptions(const YAML::Node& algorithmOptionsN
           get<t_real>(algorithmOptionsNode, {"fb", "joint_map_estimation", "alpha"});
       this->jmap_beta_ = get<t_real>(algorithmOptionsNode, {"fb", "joint_map_estimation", "beta"});
     }
-  } 
-  else if (this->algorithm_ == "primaldual") 
-  {
+  } else if (this->algorithm_ == "primaldual") {
     this->epsilonConvergenceScaling_ =
         get<t_real>(algorithmOptionsNode, {"primaldual", "epsilonConvergenceScaling"});
     this->mpiAlgorithm_ = factory::algo_distribution_string.at(
@@ -279,9 +271,7 @@ void YamlParser::parseAndSetAlgorithmOptions(const YAML::Node& algorithmOptionsN
         get<t_real>(algorithmOptionsNode, {"primaldual", "stepsize", "update_tolerance"});
     this->precondition_iters_ =
         get<t_int>(algorithmOptionsNode, {"primaldual", "precondition_iters"});
-  } 
-  else
-  {
+  } else {
     throw std::runtime_error(
         "Only padmm algorithm configured for now. Please fill the appropriate block in the "
         "configuration file.");

cpp/purify/yaml-parser.h

@@ -149,10 +149,7 @@ class YamlParser {
   YAML_MACRO(t_real, CRR_mu, 20)
   YAML_MACRO(t_real, CRR_lambda, 5000)
 
-  std::string output_path() const
-  {
-    return out_path;
-  }
+  std::string output_path() const { return out_path; }
 
 #undef YAML_MACRO
  private: