Reset to previous version
This commit is contained in:
parent
0863db658d
commit
408d1e8c38
|
@ -1002,7 +1002,7 @@ double fullPatternMaxSimulationForceRotationalObjective(const double &forceMagni
|
||||||
// settings.totalResidualForcesNormThreshold = 1e-3;
|
// settings.totalResidualForcesNormThreshold = 1e-3;
|
||||||
// settings.totalTranslationalKineticEnergyThreshold = 1e-6;
|
// settings.totalTranslationalKineticEnergyThreshold = 1e-6;
|
||||||
// settings.shouldUseTranslationalKineticEnergyThreshold = true;
|
// settings.shouldUseTranslationalKineticEnergyThreshold = true;
|
||||||
settings.shouldDraw = true;
|
// settings.shouldDraw = true;
|
||||||
// settings.isDebugMode = true;
|
// settings.isDebugMode = true;
|
||||||
// settings.drawingStep = 500;
|
// settings.drawingStep = 500;
|
||||||
// settings.beVerbose = true;
|
// settings.beVerbose = true;
|
||||||
|
@ -1132,21 +1132,21 @@ double ReducedModelOptimizer::getFullPatternMaxSimulationForce(
|
||||||
wasSuccessful = minimumError < translationalOptimizationEpsilon;
|
wasSuccessful = minimumError < translationalOptimizationEpsilon;
|
||||||
break;
|
break;
|
||||||
case Dome:
|
case Dome:
|
||||||
global.desiredMaxRotationAngle = vcg::math::ToRad(25.0);
|
global.desiredMaxRotationAngle = vcg::math::ToRad(35.0);
|
||||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructDomeSimulationScenario;
|
global.constructScenarioFunction = &ReducedModelOptimizer::constructDomeSimulationScenario;
|
||||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
||||||
// minimumError
|
minimumError
|
||||||
// = dlib::find_min_single_variable(&fullPatternMaxSimulationForceRotationalObjective,
|
= dlib::find_min_single_variable(&fullPatternMaxSimulationForceRotationalObjective,
|
||||||
// forceMagnitude,
|
forceMagnitude,
|
||||||
// 1e-2,
|
1e-2,
|
||||||
// 1e2,
|
1e2,
|
||||||
// forceMagnitudeEpsilon);
|
forceMagnitudeEpsilon);
|
||||||
// wasSuccessful = minimumError < vcg::math::ToRad(3.0);
|
wasSuccessful = minimumError < vcg::math::ToRad(3.0);
|
||||||
result = dlib::find_min_global(&fullPatternMaxSimulationForceRotationalObjective,
|
// result = dlib::find_min_global(&fullPatternMaxSimulationForceRotationalObjective,
|
||||||
1e-2,
|
// 1e-2,
|
||||||
1,
|
// 1,
|
||||||
dlib::max_function_calls(50));
|
// dlib::max_function_calls(50));
|
||||||
wasSuccessful = result.y < vcg::math::ToRad(3.0);
|
// wasSuccessful = result.y < vcg::math::ToRad(3.0);
|
||||||
break;
|
break;
|
||||||
case Saddle:
|
case Saddle:
|
||||||
global.desiredMaxDisplacementValue = 0.1
|
global.desiredMaxDisplacementValue = 0.1
|
||||||
|
|
Loading…
Reference in New Issue