manolas
/
ReducedModelOptimization
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed optimization settings as compulsory argument

This commit is contained in:
iasonmanolas 2022-01-19 12:09:20 +02:00
parent 9f1a13d30c
commit 992f821c0b
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main.cpp
View File

@ -23,28 +23,27 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef POLYSCOPE_DEFINED #ifdef POLYSCOPE_DEFINED
ReducedModelOptimization::Results optResults; // ReducedModelOptimization::Results optResults;
// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/"
// "singlePattern_dlib_firstSubmission/12@single_reduced(100000_1.20)"); // "singlePattern_dlib_firstSubmission/12@single_reduced(100000_1.20)");
// optResults.load("/home/iason/Coding/Projects/Approximating shapes with flat " // optResults.load("/home/iason/Coding/Projects/Approximating shapes with flat "
// "patterns/ReducedModelOptimization/Results/OptimizationResults/" // "patterns/ReducedModelOptimization/Results/OptimizationResults/"
// "objectiveFunction/ConvergedJobs/testSet/7#12"); // "objectiveFunction/ConvergedJobs/testSet/7#12");
// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/"
// "singlePattern_dlib_23_12/12@single_reduced(100000_1.20)"); // "singlePattern_dlib_23_12/12@single_reduced(100000_1.20)");
// optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/" // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/"
// "singlePattern_ensmallen_AllVars_optParameters/7#12"); // "singlePattern_ensmallen_AllVars_optParameters/7#12");
optResults.load("/home/iason/Desktop/finding_submissionCode/" // optResults.load("/home/iason/Desktop/dlib_ensmallen_comparison/TestSets/dlib_firstSubmission/"
"build-ReducedModelOptimization-Clang-RelWithDebInfo/OptimizationResults/" // "ConvergedJobs/72@single_reduced(100000_1.20)");
"ConvergedJobs/12@single_reduced(100000_1.20)"); // ReducedModelEvaluator::evaluateReducedModel(optResults);
ReducedModelEvaluator::evaluateReducedModel(optResults);
#endif #endif
if (argc <= 5) { if (argc < 3) {
std::cerr << "Wrong number of input parameters. Expects at least 4 input parameters." std::cerr << "Wrong number of input parameters. Expects at least 4 input parameters."
"Usage:\n" "Usage:\n"
"1)full pattern file path\n" "1)full pattern file path\n"
"2)reduced pattern file path\n" "2)reduced pattern file path\n"
"3)Optimization settings json file path\n" "3)Optimization results directory path\n"
"4)Optimization results directory path\n" "4)[optional]Optimization settings json file path\n"
"5)[optional]Intermediate results directory path\n" "5)[optional]Intermediate results directory path\n"
"Exiting.." "Exiting.."
<< std::endl; << std::endl;
@ -66,25 +65,27 @@ int main(int argc, char *argv[])
reducedPattern.scale(0.03, interfaceNodeIndex); reducedPattern.scale(0.03, interfaceNodeIndex);
// Set the optization settings // 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; 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 #ifdef POLYSCOPE_DEFINED
// settings_optimization.save(optimizationSettingsFilePath.parent_path()); // settings_optimization.save(optimizationSettingsFilePath.parent_path());
// std::cout << "Save settings to:" << optimizationSettingsFilePath << std::endl; // std::cout << "Save settings to:" << optimizationSettingsFilePath << std::endl;
#else #else
settings_optimization.load(optimizationSettingsFilePath); settings_optimization.load(optimizationSettingsFilePath);
#endif #endif
}
// settings_optimization.setDefault(); // settings_optimization.setDefault();
// settings_optimization.rotationNormalizationEpsilon = 0; // settings_optimization.rotationNormalizationEpsilon = 0;
// Optimize pairthere // Optimize pairthere
const std::string optimizationName = std::to_string(fullPattern.EN()) + "#" const std::string optimizationName = std::to_string(fullPattern.EN()) + "#"
+ fullPattern.getLabel(); + fullPattern.getLabel();
const std::string optimizationResultsDirectory = argv[4]; const std::string optimizationResultsDirectory = argv[3];
std::string resultsOutputDir; std::string resultsOutputDir;
bool optimizationResultFolderExists = false; bool optimizationResultFolderExists = false;
const std::filesystem::path crashedJobsDirPath( const std::filesystem::path crashedJobsDirPath(