diff --git a/src/reducedmodeloptimizer.cpp b/src/reducedmodeloptimizer.cpp index 8ee30e3..653f7bc 100644 --- a/src/reducedmodeloptimizer.cpp +++ b/src/reducedmodeloptimizer.cpp @@ -1002,7 +1002,7 @@ double fullPatternMaxSimulationForceRotationalObjective(const double &forceMagni // settings.totalResidualForcesNormThreshold = 1e-3; // settings.totalTranslationalKineticEnergyThreshold = 1e-6; // settings.shouldUseTranslationalKineticEnergyThreshold = true; - settings.shouldDraw = true; + // settings.shouldDraw = true; // settings.isDebugMode = true; // settings.drawingStep = 500; // settings.beVerbose = true; @@ -1132,21 +1132,21 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce( wasSuccessful = minimumError < translationalOptimizationEpsilon; break; case Dome: - global.desiredMaxRotationAngle = vcg::math::ToRad(25.0); + global.desiredMaxRotationAngle = vcg::math::ToRad(35.0); global.constructScenarioFunction = &ReducedModelOptimizer::constructDomeSimulationScenario; global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first; - // minimumError - // = dlib::find_min_single_variable(&fullPatternMaxSimulationForceRotationalObjective, - // forceMagnitude, - // 1e-2, - // 1e2, - // forceMagnitudeEpsilon); - // wasSuccessful = minimumError < vcg::math::ToRad(3.0); - result = dlib::find_min_global(&fullPatternMaxSimulationForceRotationalObjective, - 1e-2, - 1, - dlib::max_function_calls(50)); - wasSuccessful = result.y < vcg::math::ToRad(3.0); + minimumError + = dlib::find_min_single_variable(&fullPatternMaxSimulationForceRotationalObjective, + forceMagnitude, + 1e-2, + 1e2, + forceMagnitudeEpsilon); + wasSuccessful = minimumError < vcg::math::ToRad(3.0); + // result = dlib::find_min_global(&fullPatternMaxSimulationForceRotationalObjective, + // 1e-2, + // 1, + // dlib::max_function_calls(50)); + // wasSuccessful = result.y < vcg::math::ToRad(3.0); break; case Saddle: global.desiredMaxDisplacementValue = 0.1