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

Added simulation model used in the optimization results struct

This commit is contained in:
iasonmanolas 2022-07-20 10:49:09 +03:00
parent 7a0124155c
commit d8a6fadab7
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
reducedmodelevaluator.cpp
View File

@ -420,20 +420,11 @@ ReducedModelEvaluator::Results ReducedModelEvaluator::evaluateReducedModel(
drmSimulationSettings.shouldCreatePlots = true; drmSimulationSettings.shouldCreatePlots = true;
#endif #endif
constexpr bool shouldRerunFullPatternSimulation = false; constexpr bool shouldRerunFullPatternSimulation = false;
enum PatternSimulationModelTag { DRM, Chronos }; const std::string &simulationModelLabel = optimizationResult.settings.simulationModelLabel;
const PatternSimulationModelTag simulationModelTag{Chronos};
const std::string simulationModelLabel = [&]() {
switch (simulationModelTag) {
case DRM:
return DRMSimulationModel::label;
case Chronos:
return ChronosEulerSimulationModel::label;
}
}();
// for (int jobIndex = 0; jobIndex < scenariosTestSetLabels.size(); jobIndex++) { // for (int jobIndex = 0; jobIndex < scenariosTestSetLabels.size(); jobIndex++) {
std::for_each( std::for_each(
//#ifndef POLYSCOPE_DEFINED //#ifndef POLYSCOPE_DEFINED
// std::execution::par_unseq, std::execution::par_unseq,
//#endif //#endif
scenariosTestSetLabels.begin(), scenariosTestSetLabels.begin(),
scenariosTestSetLabels.end(), scenariosTestSetLabels.end(),
@ -540,20 +531,20 @@ ReducedModelEvaluator::Results ReducedModelEvaluator::evaluateReducedModel(
<< tilledPatternResultsFolderPath << std::endl; << tilledPatternResultsFolderPath << std::endl;
//Full //Full
std::cout << "Executing:" << jobLabel << std::endl; std::cout << "Executing:" << jobLabel << std::endl;
switch (simulationModelTag) { if (simulationModelLabel == DRMSimulationModel::label) {
case DRM: {
DRMSimulationModel drmSimulationModel; DRMSimulationModel drmSimulationModel;
simulationResults_tilledPattern = drmSimulationModel simulationResults_tilledPattern = drmSimulationModel
.executeSimulation(pJob_tiledFullPattern, .executeSimulation(pJob_tiledFullPattern,
drmSimulationSettings); drmSimulationSettings);
break; } else if (simulationModelLabel == ChronosEulerSimulationModel::label) {
}
case Chronos: {
ChronosEulerSimulationModel chronosSimulationModel; ChronosEulerSimulationModel chronosSimulationModel;
simulationResults_tilledPattern = chronosSimulationModel.executeSimulation( simulationResults_tilledPattern = chronosSimulationModel.executeSimulation(
pJob_tiledFullPattern); pJob_tiledFullPattern);
break; } else {
} std::cerr << "Simulation model used for computing the optimization results was "
"not recognized"
<< std::endl;
std::terminate();
} }
} }
if (!simulationResults_tilledPattern.converged) { if (!simulationResults_tilledPattern.converged) {

7
reducedmodeloptimizer_structs.hpp
View File

@ -208,6 +208,7 @@ struct Settings
xRange{"J", 1e-3, 1e3}, xRange{"J", 1e-3, 1e3},
xRange{"R", 0.05, 0.95}, xRange{"R", 0.05, 0.95},
xRange{"Theta", -30, 30}}; xRange{"Theta", -30, 30}};
std::string simulationModelLabel{DRMSimulationModel::label};
struct SettingsPSO struct SettingsPSO
{ {
int numberOfParticles{200}; int numberOfParticles{200};
@ -307,6 +308,7 @@ struct Settings
json[GET_VARIABLE_NAME(angularDistanceEpsilon)] = vcg::math::ToDeg(angularDistanceEpsilon); json[GET_VARIABLE_NAME(angularDistanceEpsilon)] = vcg::math::ToDeg(angularDistanceEpsilon);
json[GET_VARIABLE_NAME(targetBaseTriangleSize)] = targetBaseTriangleSize; json[GET_VARIABLE_NAME(targetBaseTriangleSize)] = targetBaseTriangleSize;
json[GET_VARIABLE_NAME(baseScenarioMaxMagnitudes)] = baseScenarioMaxMagnitudes; json[GET_VARIABLE_NAME(baseScenarioMaxMagnitudes)] = baseScenarioMaxMagnitudes;
json[GET_VARIABLE_NAME(simulationModelLabel)] = simulationModelLabel;
nlohmann::json json_dimensions; nlohmann::json json_dimensions;
patternBeamDimensions.to_json(json_dimensions, patternBeamDimensions); patternBeamDimensions.to_json(json_dimensions, patternBeamDimensions);
json.update(json_dimensions); json.update(json_dimensions);
@ -412,6 +414,11 @@ struct Settings
pso.numberOfParticles = static_cast<int>(json[GET_VARIABLE_NAME(pso.numberOfParticles)]); pso.numberOfParticles = static_cast<int>(json[GET_VARIABLE_NAME(pso.numberOfParticles)]);
} }
if (json.contains(GET_VARIABLE_NAME(simulationModelLabel))) {
simulationModelLabel = static_cast<std::string>(
json[GET_VARIABLE_NAME(simulationModelLabel)]);
}
patternBeamDimensions.from_json(json, patternBeamDimensions); patternBeamDimensions.from_json(json, patternBeamDimensions);
// perBaseScenarioObjectiveWeights = json.at(JsonKeys::ObjectiveWeights); // perBaseScenarioObjectiveWeights = json.at(JsonKeys::ObjectiveWeights);