Decreased the range of the E,A,I2,I3,J of optimization variables to [0.01,100]
This commit is contained in:
parent
c5150a2e14
commit
07d21cc575
|
@ -115,16 +115,17 @@ struct Settings
|
||||||
enum NormalizationStrategy { NonNormalized, Epsilon };
|
enum NormalizationStrategy { NonNormalized, Epsilon };
|
||||||
inline static std::vector<std::string> normalizationStrategyStrings{"NonNormalized", "Epsilon"};
|
inline static std::vector<std::string> normalizationStrategyStrings{"NonNormalized", "Epsilon"};
|
||||||
NormalizationStrategy normalizationStrategy{Epsilon};
|
NormalizationStrategy normalizationStrategy{Epsilon};
|
||||||
std::array<xRange, NumberOfOptimizationVariables> variablesRanges{xRange{"E", 0.001, 1000},
|
std::array<xRange, NumberOfOptimizationVariables> variablesRanges{xRange{"E", 0.01, 100},
|
||||||
xRange{"A", 0.001, 1000},
|
xRange{"A", 0.01, 100},
|
||||||
xRange{"I2", 0.001, 1000},
|
xRange{"I2", 0.01, 100},
|
||||||
xRange{"I3", 0.001, 1000},
|
xRange{"I3", 0.01, 100},
|
||||||
xRange{"J", 0.001, 1000},
|
xRange{"J", 0.01, 100},
|
||||||
xRange{"R", 0.05, 0.95},
|
xRange{"R", 0.05, 0.95},
|
||||||
xRange{"Theta", -30, 30}};
|
xRange{"Theta", -30, 30}};
|
||||||
int numberOfFunctionCalls{100000};
|
int numberOfFunctionCalls{100000};
|
||||||
double solverAccuracy{1e-3};
|
double solverAccuracy{1e-3};
|
||||||
double translationEpsilon{3e-3};
|
double translationEpsilon{3e-4};
|
||||||
|
// double translationEpsilon{0};
|
||||||
double angularDistanceEpsilon{vcg::math::ToRad(0.0)};
|
double angularDistanceEpsilon{vcg::math::ToRad(0.0)};
|
||||||
struct ObjectiveWeights
|
struct ObjectiveWeights
|
||||||
{
|
{
|
||||||
|
@ -603,6 +604,7 @@ struct Settings
|
||||||
std::filesystem::path jsonFilepath(
|
std::filesystem::path jsonFilepath(
|
||||||
std::filesystem::path(loadFromPath).append(JsonKeys::filename));
|
std::filesystem::path(loadFromPath).append(JsonKeys::filename));
|
||||||
if (!std::filesystem::exists(jsonFilepath)) {
|
if (!std::filesystem::exists(jsonFilepath)) {
|
||||||
|
std::cerr << "Input path does not exist:" << loadFromPath << std::endl;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//Load optimal X
|
//Load optimal X
|
||||||
|
|
Loading…
Reference in New Issue