OptimizationResult: Drop deprecated getEvaluationNumber

mbaudin47 · May 4, 2024 · 8cab78b · 8cab78b
1 parent 3f98160
commit 8cab78b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -18,6 +18,7 @@
  * Removed deprecated Sample/CorrelationAnalysis.computePearsonCorrelation
  * Removed deprecated Cobyla/TNC.setIgnoreFailure method
  * Removed deprecated OptimizationAlgorithm.setMaximumEvaluationNumber method
+ * Removed deprecated OptimizationResult.getEvaluationNumber
 
 === Documentation ===
 

diff --git a/lib/src/Base/Optim/OptimizationResult.cxx b/lib/src/Base/Optim/OptimizationResult.cxx
@@ -116,18 +116,6 @@ void OptimizationResult::setCallsNumber(const UnsignedInteger callsNumber)
   callsNumber_ = callsNumber;
 }
 
-UnsignedInteger OptimizationResult::getEvaluationNumber() const
-{
-  LOGWARN("OptimizationResult.getEvaluationNumber is deprecated, use getCallsNumber");
-  return getCallsNumber();
-}
-
-void OptimizationResult::setEvaluationNumber(const UnsignedInteger evaluationNumber)
-{
-  LOGWARN("OptimizationResult.setEvaluationNumber is deprecated, use setCallsNumber");
-  setCallsNumber(evaluationNumber);
-}
-
 /* Iteration number accessor */
 UnsignedInteger OptimizationResult::getIterationNumber() const
 {

diff --git a/lib/src/Base/Optim/openturns/OptimizationResult.hxx b/lib/src/Base/Optim/openturns/OptimizationResult.hxx
@@ -72,9 +72,6 @@ public:
   /** Calls number accessor */
   void setCallsNumber(const UnsignedInteger callsNumber);
   UnsignedInteger getCallsNumber() const;
-  // @deprecated
-  void setEvaluationNumber(const UnsignedInteger evaluationNumber);
-  UnsignedInteger getEvaluationNumber() const;
 
   /** Iteration number accessor */
   void setIterationNumber(const UnsignedInteger iterationNumber);

diff --git a/...examples/reliability_sensitivity/reliability/plot_estimate_probability_form_oscillator.py b/...examples/reliability_sensitivity/reliability/plot_estimate_probability_form_oscillator.py
@@ -305,7 +305,7 @@
 )
 
 optim_res = resultSORM.getOptimizationResult()
-print("Simulation budget:", optim_res.getEvaluationNumber())
+print("Simulation budget:", optim_res.getCallsNumber())
 
 # %%
 # One can see that the probability estimate has been decreased by a factor 10 compared to the FORM estimate.