Skip to content

Commit

Permalink
Calibration: Drop MultiStartSize keys
Browse files Browse the repository at this point in the history
  • Loading branch information
jschueller committed Nov 7, 2024
1 parent a056b55 commit ae136d3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
2 changes: 0 additions & 2 deletions lib/etc/openturns.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -1073,11 +1073,9 @@

<!-- OT::NonLinearLeastSquaresCalibration parameters -->
<NonLinearLeastSquaresCalibration-BootstrapSize value_int="100" />
<NonLinearLeastSquaresCalibration-MultiStartSize value_int="100" />

<!-- OT::GaussianNonLinearCalibration parameters -->
<GaussianNonLinearCalibration-BootstrapSize value_int="100" />
<GaussianNonLinearCalibration-MultiStartSize value_int="100" />

<!-- OT::CalibrationResults parameters -->
<CalibrationResult-xRangeMarginFactor value_float="0.2" />
Expand Down
2 changes: 0 additions & 2 deletions lib/src/Base/Common/ResourceMap.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1694,11 +1694,9 @@ void ResourceMap::loadDefaultConfiguration()

// NonLinearLeastSquaresCalibration parameters //
addAsUnsignedInteger("NonLinearLeastSquaresCalibration-BootstrapSize", 100);
addAsUnsignedInteger("NonLinearLeastSquaresCalibration-MultiStartSize", 100);

// GaussianNonLinearCalibration parameters //
addAsUnsignedInteger("GaussianNonLinearCalibration-BootstrapSize", 100);
addAsUnsignedInteger("GaussianNonLinearCalibration-MultiStartSize", 100);

// CalibrationResult parameters //
addAsScalar("CalibrationResult-xRangeMarginFactor", 0.2);
Expand Down
4 changes: 1 addition & 3 deletions python/src/NonLinearLeastSquaresCalibration_doc.i.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ computed from the residuals.

If least squares optimization algorithms are enabled, then the algorithm used is the
first found by `Build` of :class:`~openturns.OptimizationAlgorithm`.
Otherwise, the algorithm :class:`~openturns.TNC` is used combined with
a multistart algorithm which makes use of the `NonLinearLeastSquaresCalibration-MultiStartSize`
key in the :class:`~openturns.ResourceMap`.
Otherwise, the algorithm :class:`~openturns.TNC` is used.

Please read :ref:`code_calibration` for more details.

Expand Down

0 comments on commit ae136d3

Please sign in to comment.