From 992f821c0b6b20953a10f55fe35e763ae01d7809 Mon Sep 17 00:00:00 2001 From: iasonmanolas Date: Wed, 19 Jan 2022 12:09:20 +0200 Subject: [PATCH] Removed optimization settings as compulsory argument --- src/main.cpp | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 544ca53..8175465 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,28 +23,27 @@ int main(int argc, char *argv[]) { #ifdef POLYSCOPE_DEFINED - ReducedModelOptimization::Results optResults; - // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" - // "singlePattern_dlib_firstSubmission/12@single_reduced(100000_1.20)"); - // optResults.load("/home/iason/Coding/Projects/Approximating shapes with flat " - // "patterns/ReducedModelOptimization/Results/OptimizationResults/" - // "objectiveFunction/ConvergedJobs/testSet/7#12"); - // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" - // "singlePattern_dlib_23_12/12@single_reduced(100000_1.20)"); - // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" - // "singlePattern_ensmallen_AllVars_optParameters/7#12"); - optResults.load("/home/iason/Desktop/finding_submissionCode/" - "build-ReducedModelOptimization-Clang-RelWithDebInfo/OptimizationResults/" - "ConvergedJobs/12@single_reduced(100000_1.20)"); - ReducedModelEvaluator::evaluateReducedModel(optResults); +// ReducedModelOptimization::Results optResults; +// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" +// "singlePattern_dlib_firstSubmission/12@single_reduced(100000_1.20)"); +// optResults.load("/home/iason/Coding/Projects/Approximating shapes with flat " +// "patterns/ReducedModelOptimization/Results/OptimizationResults/" +// "objectiveFunction/ConvergedJobs/testSet/7#12"); +// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" +// "singlePattern_dlib_23_12/12@single_reduced(100000_1.20)"); +// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" +// "singlePattern_ensmallen_AllVars_optParameters/7#12"); +// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/dlib_firstSubmission/" +// "ConvergedJobs/72@single_reduced(100000_1.20)"); +// ReducedModelEvaluator::evaluateReducedModel(optResults); #endif - if (argc <= 5) { + if (argc < 3) { std::cerr << "Wrong number of input parameters. Expects at least 4 input parameters." "Usage:\n" "1)full pattern file path\n" "2)reduced pattern file path\n" - "3)Optimization settings json file path\n" - "4)Optimization results directory path\n" + "3)Optimization results directory path\n" + "4)[optional]Optimization settings json file path\n" "5)[optional]Intermediate results directory path\n" "Exiting.." << std::endl; @@ -66,25 +65,27 @@ int main(int argc, char *argv[]) reducedPattern.scale(0.03, interfaceNodeIndex); // Set the optization settings - const std::filesystem::path optimizationSettingsFilePath = argv[3]; - if (!std::filesystem::exists(optimizationSettingsFilePath)) { - std::cerr << "Input optimization settings file does not exist:" - << optimizationSettingsFilePath << std::endl; - } ReducedModelOptimization::Settings settings_optimization; + if (argc > 3) { + const std::filesystem::path optimizationSettingsFilePath = argv[4]; + if (!std::filesystem::exists(optimizationSettingsFilePath)) { + std::cerr << "Input optimization settings file does not exist:" + << optimizationSettingsFilePath << std::endl; + } #ifdef POLYSCOPE_DEFINED // settings_optimization.save(optimizationSettingsFilePath.parent_path()); // std::cout << "Save settings to:" << optimizationSettingsFilePath << std::endl; #else settings_optimization.load(optimizationSettingsFilePath); #endif + } // settings_optimization.setDefault(); // settings_optimization.rotationNormalizationEpsilon = 0; // Optimize pairthere const std::string optimizationName = std::to_string(fullPattern.EN()) + "#" + fullPattern.getLabel(); - const std::string optimizationResultsDirectory = argv[4]; + const std::string optimizationResultsDirectory = argv[3]; std::string resultsOutputDir; bool optimizationResultFolderExists = false; const std::filesystem::path crashedJobsDirPath(