From dd0bedcc8f4dd5de10576014e440ba8ac8755d23 Mon Sep 17 00:00:00 2001
From: iasonmanolas <iasonmanolasece@gmail.com>
Date: Tue, 4 Jan 2022 22:50:01 +0200
Subject: [PATCH] Refactoring

---
 src/main.cpp                  |  6 +++---
 src/reducedmodeloptimizer.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 58d11d3..57ccb2d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,10 +58,10 @@ int main(int argc, char *argv[])
     // Optimize pairthere
     const std::string pairName = std::to_string(fullPattern.EN()) + "#"
                                  + fullPattern.getLabel(); // + "@" + reducedPattern.getLabel();
-    const std::string optimizationName = pairName + "("
+    const std::string optimizationName = pairName          /* + "_"
                                          + std::to_string(
-                                             settings_optimization.numberOfFunctionCalls)
-                                         + ")";
+                                             settings_optimization.numberOfFunctionCalls)*/
+        ;
     const std::string optimizationResultsDirectory = argv[4];
     std::string resultsOutputDir;
     bool optimizationResultFolderExists = false;
diff --git a/src/reducedmodeloptimizer.cpp b/src/reducedmodeloptimizer.cpp
index afa7dd2..3a6706e 100644
--- a/src/reducedmodeloptimizer.cpp
+++ b/src/reducedmodeloptimizer.cpp
@@ -11,7 +11,7 @@
 #include <functional>
 #include <parallel/parallel.h>
 
-#define USE_SCENARIO_WEIGHTS
+//#define USE_SCENARIO_WEIGHTS
 
 using namespace ReducedPatternOptimization;
 
@@ -569,6 +569,12 @@ void ReducedModelOptimizer::initializePatterns(
     initializeOptimizationParameters(m_pFullPatternSimulationMesh, optimizationParameters);
 }
 
+void ReducedModelOptimizer::setIntermediateResultsDirectoryPath(
+    const std::filesystem::path &newIntermediateResultsDirectoryPath)
+{
+    intermediateResultsDirectoryPath = newIntermediateResultsDirectoryPath;
+}
+
 void ReducedModelOptimizer::initializeUpdateReducedPatternFunctions()
 {
     global.functions_updateReducedPatternParameter[R] =
@@ -1824,12 +1830,6 @@ void ReducedModelOptimizer::computeObjectiveValueNormalizationFactors()
     }
 }
 
-void ReducedModelOptimizer::setIntermediateResultsDirectoryPath(
-    const std::filesystem::path &newIntermediateResultsDirectoryPath)
-{
-    intermediateResultsDirectoryPath = newIntermediateResultsDirectoryPath;
-}
-
 void ReducedModelOptimizer::optimize(
     const Settings &optimizationSettings,
     ReducedPatternOptimization::Results &results,