Scipy: implemented method NCalls

Author: omazapa

math/scipy/inc/Math/ScipyMinimizer.h

@@ -76,7 +76,7 @@ class ScipyMinimizer : public BasicMinimizer {
    PyObject *fBoundsMod;
    GenAlgoOptions fExtraOpts;
    std::function<bool(const std::vector<double> &, double *)> fHessianFunc;
-
+   unsigned int fCalls;
 protected:
    PyObject *fGlobalNS;
    PyObject *fLocalNS;
@@ -115,6 +115,10 @@ class ScipyMinimizer : public BasicMinimizer {
     */
    void PyRunString(TString code, TString errorMessage = "Failed to run python code", int start = Py_single_input);
 
+   /*
+      Number of function calls
+    */
+   virtual unsigned int NCalls() const  override;
 private:
    // usually copying is non trivial, so we make this unaccessible
 

math/scipy/src/ScipyMinimizer.cxx

@@ -71,6 +71,7 @@ PyObject *hessian_function(PyObject * /*self*/, PyObject *args)
 //_______________________________________________________________________
 ScipyMinimizer::ScipyMinimizer() : BasicMinimizer()
 {
+   fCalls = 0;
    fOptions.SetMinimizerType("Scipy");
    fOptions.SetMinimizerAlgorithm("L-BFGS-B");
    PyInitialize();
@@ -82,6 +83,7 @@ ScipyMinimizer::ScipyMinimizer() : BasicMinimizer()
 //_______________________________________________________________________
 ScipyMinimizer::ScipyMinimizer(const char *type)
 {
+   fCalls = 0;
    fOptions.SetMinimizerType("Scipy");
    fOptions.SetMinimizerAlgorithm(type);
    PyInitialize();
@@ -288,6 +290,7 @@ bool ScipyMinimizer::Minimize()
    SetFinalValues(x);
    auto obj_value = (*gFunction)(x);
    SetMinValue(obj_value);
+   fCalls = nfev; //number of function evaluations
 
    std::cout << "=== Status: " << status << std::endl;
    std::cout << "=== Message: " << message << std::endl;
@@ -312,3 +315,9 @@ void ScipyMinimizer::SetHessianFunction(std::function<bool(const std::vector<dou
 {
    fHessianFunc = func;
 }
+
+//_______________________________________________________________________
+unsigned int ScipyMinimizer::NCalls() const
+{
+   return fCalls;
+}