Refactoring
This commit is contained in:
parent
63410e11f4
commit
5d8d76e0c1
22
src/main.cpp
22
src/main.cpp
|
@ -44,8 +44,8 @@ int main(int argc, char *argv[]) {
|
||||||
ReducedPatternOptimization::xRange beamI2{"I2", 0.001, 1000};
|
ReducedPatternOptimization::xRange beamI2{"I2", 0.001, 1000};
|
||||||
ReducedPatternOptimization::xRange beamI3{"I3", 0.001, 1000};
|
ReducedPatternOptimization::xRange beamI3{"I3", 0.001, 1000};
|
||||||
ReducedPatternOptimization::xRange beamJ{"J", 0.001, 1000};
|
ReducedPatternOptimization::xRange beamJ{"J", 0.001, 1000};
|
||||||
ReducedPatternOptimization::xRange innerHexagonSize{"HexSize", 0.05, 0.95};
|
ReducedPatternOptimization::xRange innerHexagonSize{"R", 0.05, 0.95};
|
||||||
ReducedPatternOptimization::xRange innerHexagonAngle{"HexAngle", -30.0, 30.0};
|
ReducedPatternOptimization::xRange innerHexagonAngle{"Theta", -30.0, 30.0};
|
||||||
ReducedPatternOptimization::Settings settings_optimization;
|
ReducedPatternOptimization::Settings settings_optimization;
|
||||||
settings_optimization.xRanges
|
settings_optimization.xRanges
|
||||||
= {/*beamE,*/ beamA, beamI2, beamI3, beamJ, innerHexagonSize, innerHexagonAngle};
|
= {/*beamE,*/ beamA, beamI2, beamI3, beamJ, innerHexagonSize, innerHexagonAngle};
|
||||||
|
@ -56,12 +56,12 @@ int main(int argc, char *argv[]) {
|
||||||
settings_optimization.normalizationStrategy
|
settings_optimization.normalizationStrategy
|
||||||
= ReducedPatternOptimization::Settings::NormalizationStrategy::Epsilon;
|
= ReducedPatternOptimization::Settings::NormalizationStrategy::Epsilon;
|
||||||
settings_optimization.splitGeometryMaterialOptimization = false;
|
settings_optimization.splitGeometryMaterialOptimization = false;
|
||||||
settings_optimization.translationNormalizationParameter = 1e-3;
|
settings_optimization.translationNormalizationParameter = 3e-4;
|
||||||
settings_optimization.rotationNormalizationParameter = vcg::math::ToRad(3.0);
|
settings_optimization.rotationNormalizationParameter = vcg::math::ToRad(3.0);
|
||||||
// settings_optimization.translationNormalizationParameter = 1e-15;
|
// settings_optimization.translationNormalizationParameter = 1e-15;
|
||||||
// settings_optimization.rotationNormalizationParameter = vcg::math::ToRad(1e-15);
|
// settings_optimization.rotationNormalizationParameter = vcg::math::ToRad(1e-15);
|
||||||
// settings_optimization.solverAccuracy = 1e-3;
|
settings_optimization.solverAccuracy = 1e-3;
|
||||||
settings_optimization.solverAccuracy = 1e-1;
|
// settings_optimization.solverAccuracy = 1e-1;
|
||||||
settings_optimization.objectiveWeights.translational = std::atof(argv[4]);
|
settings_optimization.objectiveWeights.translational = std::atof(argv[4]);
|
||||||
settings_optimization.objectiveWeights.rotational = 2 - std::atof(argv[4]);
|
settings_optimization.objectiveWeights.rotational = 2 - std::atof(argv[4]);
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
|
||||||
xConcatNames.pop_back();
|
xConcatNames.pop_back();
|
||||||
|
|
||||||
// Optimize pairthere
|
// Optimize pairthere
|
||||||
const std::string pairName = fullPattern.getLabel() + "@" + reducedPattern.getLabel();
|
const std::string pairName = fullPattern.getLabel(); // + "@" + reducedPattern.getLabel();
|
||||||
const std::string optimizationName = pairName + "("
|
const std::string optimizationName = pairName + "("
|
||||||
+ std::to_string(settings_optimization.numberOfFunctionCalls)
|
+ std::to_string(settings_optimization.numberOfFunctionCalls)
|
||||||
+ "_"
|
+ "_"
|
||||||
|
@ -128,17 +128,21 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
if (optimizationResults.wasSuccessful) {
|
if (optimizationResults.wasSuccessful) {
|
||||||
resultsOutputDir = convergedJobsDirPath.string();
|
resultsOutputDir = convergedJobsDirPath.string();
|
||||||
|
csvFile csv_resultsLocalFile(std::filesystem::path(resultsOutputDir).append("results.csv"),
|
||||||
|
true);
|
||||||
csvFile csv_results({}, false);
|
csvFile csv_results({}, false);
|
||||||
|
std::vector<csvFile *> csvVector{&csv_resultsLocalFile, &csv_results};
|
||||||
csv_results << "Name";
|
csv_results << "Name";
|
||||||
optimizationResults.writeHeaderTo(csv_results);
|
csv_resultsLocalFile << "Name";
|
||||||
|
optimizationResults.writeHeaderTo(csvVector);
|
||||||
settings_optimization.writeHeaderTo(csv_results);
|
settings_optimization.writeHeaderTo(csv_results);
|
||||||
csv_results << endrow;
|
csv_results << endrow;
|
||||||
csv_results << std::to_string(fullPattern.EN()) + "#" + pairName;
|
csv_results << std::to_string(fullPattern.EN()) + "#" + pairName;
|
||||||
optimizationResults.writeResultsTo(csv_results);
|
optimizationResults.writeResultsTo(csvVector);
|
||||||
settings_optimization.writeSettingsTo(csv_results);
|
settings_optimization.writeSettingsTo(csv_results);
|
||||||
csv_results << endrow;
|
csv_results << endrow;
|
||||||
} else {
|
} else {
|
||||||
resultsOutputDir = crashedJobsDirPath.string();
|
// resultsOutputDir = crashedJobsDirPath.string();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
optimizationResults.save(resultsOutputDir, true);
|
optimizationResults.save(resultsOutputDir, true);
|
||||||
|
|
Loading…
Reference in New Issue