From 3cd5bcf13ded63d1e65b1c2faa3ac05f49e39178 Mon Sep 17 00:00:00 2001
From: iasonmanolas <iasonmanolasece@gmail.com>
Date: Mon, 3 May 2021 19:13:52 +0300
Subject: [PATCH] Windows refactoring

---
 CMakeLists.txt                |  8 +++++++-
 src/main.cpp                  |  2 +-
 src/reducedmodeloptimizer.cpp | 16 ++++++++--------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f94c9a..da082e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,13 @@ else()
     set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1")
 endif()
 
-set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies")
+
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+set(EXTERNAL_DEPS_DIR "C:/Users/iason/Downloads/ReducedModelOptimization/build/externalDependencies/")
+else()
+set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies/")
+endif()
 ##Create directory for the external libraries
 file(MAKE_DIRECTORY ${EXTERNAL_DEPS_DIR})
 
diff --git a/src/main.cpp b/src/main.cpp
index 81e9dde..d55c0c6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
   const std::string optimizationResultsDirectory = input_resultDirectoryDefined
                                                        ? argv[5]
                                                        : std::filesystem::current_path().append(
-                                                           "OptimizationResults");
+                                                           "OptimizationResults").string();
   std::string resultsOutputDir;
   bool optimizationResultFolderExists = false;
   const std::filesystem::path crashedJobsDirPath(std::filesystem::path(optimizationResultsDirectory)
diff --git a/src/reducedmodeloptimizer.cpp b/src/reducedmodeloptimizer.cpp
index 720978d..cc18059 100644
--- a/src/reducedmodeloptimizer.cpp
+++ b/src/reducedmodeloptimizer.cpp
@@ -1055,10 +1055,10 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
                                                          (global.baseTriangle.cP(1)
                                                           + global.baseTriangle.cP(2))
                                                              / 2);
-    const double optimizationEpsilon = 1e-2;
+    const double optimizationEpsilon = 1e-1;
     switch (scenario) {
     case Axial:
-        global.desiredMaxDisplacementValue = 0.042
+        global.desiredMaxDisplacementValue = 0.04
                                              * vcg::Distance(global.baseTriangle.cP(0),
                                                              (global.baseTriangle.cP(1)
                                                               + global.baseTriangle.cP(2))
@@ -1072,7 +1072,7 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
                                        optimizationEpsilon);
         break;
     case Shear:
-        global.desiredMaxDisplacementValue = 0.1
+        global.desiredMaxDisplacementValue = 0.04
                                              * vcg::Distance(global.baseTriangle.cP(0),
                                                              (global.baseTriangle.cP(1)
                                                               + global.baseTriangle.cP(2))
@@ -1086,7 +1086,7 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
                                        optimizationEpsilon);
         break;
     case Bending:
-        global.desiredMaxDisplacementValue = 0.2
+        global.desiredMaxDisplacementValue = 0.05
                                              * vcg::Distance(global.baseTriangle.cP(0),
                                                              (global.baseTriangle.cP(1)
                                                               + global.baseTriangle.cP(2))
@@ -1101,7 +1101,7 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
                                        200);
         break;
     case Dome:
-        global.desiredMaxRotationAngle = vcg::math::ToRad(40.0);
+        global.desiredMaxRotationAngle = vcg::math::ToRad(20.0);
         global.constructScenarioFunction = &ReducedModelOptimizer::constructDomeSimulationScenario;
         global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
         dlib::find_min_single_variable(
@@ -1109,14 +1109,14 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
             forceMagnitude,
             1e-8,
             1e8,
-            vcg::math::ToRad(0.1),
+            vcg::math::ToRad(1.0),
             //                                                   global.desiredMaxRotationAngle * 0.5,
             //            optimizationEpsilon,
             500);
         break;
     case Saddle:
         //        global.desiredMaxDisplacementValue *= 2;
-        global.desiredMaxDisplacementValue = 0.2
+        global.desiredMaxDisplacementValue = 0.05
                                              * vcg::Distance(global.baseTriangle.cP(0),
                                                              (global.baseTriangle.cP(1)
                                                               + global.baseTriangle.cP(2))
@@ -1128,7 +1128,7 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulat
                                        forceMagnitude,
                                        1e-8,
                                        1e8,
-                                       optimizationEpsilon,
+                                       1e-2,
                                        150);
         break;
     }