Skip to content

[Minuit2] Revert recent changes to virtual function signature #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Minuit2] Revert recent changes to virtual function signature #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions math/minuit2/inc/Minuit2/FCNAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,12 @@ class FCNAdapter : public FCNBase {
public:
FCNAdapter(const Function &f, double up = 1.) : fFunc(f), fUp(up) {}

~FCNAdapter() override {}

double operator()(std::span<const double> v) const override { return fFunc.operator()(&v[0]); }
double operator()(std::vector<double> const& v) const override { return fFunc.operator()(&v[0]); }
double operator()(const double *v) const { return fFunc.operator()(v); }
double Up() const override { return fUp; }

void SetErrorDef(double up) override { fUp = up; }

// virtual std::vector<double> Gradient(const std::vector<double>&) const;

// forward interface
// virtual double operator()(int npar, double* params,int iflag = 4) const;

private:
const Function &fFunc;
double fUp;
Expand Down
10 changes: 5 additions & 5 deletions math/minuit2/inc/Minuit2/FCNBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class FCNBase : public GenericFunction {

*/

double operator()(std::span<const double> v) const override = 0;
double operator()(std::vector<double> const &v) const override = 0;

/**

Expand Down Expand Up @@ -112,8 +112,8 @@ class FCNBase : public GenericFunction {

virtual bool HasGradient() const { return false; }

virtual std::vector<double> Gradient(std::span<const double> ) const { return {}; }
virtual std::vector<double> GradientWithPrevResult(std::span<const double> parameters, double * /*previous_grad*/,
virtual std::vector<double> Gradient(std::vector<double> const&) const { return {}; }
virtual std::vector<double> GradientWithPrevResult(std::vector<double> const& parameters, double * /*previous_grad*/,
double * /*previous_g2*/, double * /*previous_gstep*/) const
{
return Gradient(parameters);
Expand All @@ -124,10 +124,10 @@ class FCNBase : public GenericFunction {
};

/// return second derivatives (diagonal of the Hessian matrix)
virtual std::vector<double> G2(std::span<const double> ) const { return {};}
virtual std::vector<double> G2(std::vector<double> const&) const { return {};}

/// return Hessian
virtual std::vector<double> Hessian(std::span<const double> ) const { return {};}
virtual std::vector<double> Hessian(std::vector<double> const&) const { return {};}

virtual bool HasHessian() const { return false; }

Expand Down
14 changes: 7 additions & 7 deletions math/minuit2/inc/Minuit2/FCNGradAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ class FCNGradAdapter : public FCNBase {

bool HasGradient() const override { return true; }

double operator()(std::span<const double> v) const override { return fFunc.operator()(&v[0]); }
double operator()(std::vector<double> const& v) const override { return fFunc.operator()(&v[0]); }
double operator()(const double *v) const { return fFunc.operator()(v); }

double Up() const override { return fUp; }

std::vector<double> Gradient(std::span<const double> v) const override
std::vector<double> Gradient(std::vector<double> const& v) const override
{
fFunc.Gradient(&v[0], &fGrad[0]);
return fGrad;
}
std::vector<double> GradientWithPrevResult(std::span<const double> v, double *previous_grad, double *previous_g2,
std::vector<double> GradientWithPrevResult(std::vector<double> const& v, double *previous_grad, double *previous_g2,
double *previous_gstep) const override
{
fFunc.GradientWithPrevResult(&v[0], &fGrad[0], previous_grad, previous_g2, previous_gstep);
Expand All @@ -67,7 +67,7 @@ class FCNGradAdapter : public FCNBase {
}

/// return second derivatives (diagonal of the Hessian matrix)
std::vector<double> G2(std::span<const double> x) const override {
std::vector<double> G2(std::vector<double> const& x) const override {
if (fG2Func)
return fG2Func(x);
if (fHessianFunc) {
Expand All @@ -88,7 +88,7 @@ class FCNGradAdapter : public FCNBase {
}

/// compute Hessian. Return Hessian as a std::vector of size(n*n)
std::vector<double> Hessian(std::span<const double> x ) const override {
std::vector<double> Hessian(std::vector<double> const& x ) const override {
unsigned int n = fFunc.NDim();
if (fHessianFunc) {
if (fHessian.empty() ) fHessian.resize(n * n);
Expand Down Expand Up @@ -126,8 +126,8 @@ class FCNGradAdapter : public FCNBase {
mutable std::vector<double> fHessian;
mutable std::vector<double> fG2Vec;

std::function<std::vector<double>(std::span<const double> )> fG2Func;
mutable std::function<bool(std::span<const double> , double *)> fHessianFunc;
std::function<std::vector<double>(std::vector<double> const& )> fG2Func;
mutable std::function<bool(std::vector<double> const& , double *)> fHessianFunc;
};

} // end namespace Minuit2
Expand Down
4 changes: 2 additions & 2 deletions math/minuit2/inc/Minuit2/FumiliChi2FCN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class FumiliChi2FCN : public FumiliFCNBase {

*/

virtual std::vector<double> Elements(std::span<const double> par) const = 0;
virtual std::vector<double> Elements(std::vector<double> const &par) const = 0;

/**

Expand Down Expand Up @@ -129,7 +129,7 @@ class FumiliChi2FCN : public FumiliFCNBase {

*/

double operator()(std::span<const double> par) const override
double operator()(std::vector<double> const &par) const override
{

double chiSquare = 0.0;
Expand Down
14 changes: 4 additions & 10 deletions math/minuit2/inc/Minuit2/FumiliFCNAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,32 @@ class FumiliFCNAdapter : public FumiliFCNBase {

FumiliFCNAdapter(const Function &f, unsigned int ndim, double up = 1.) : FumiliFCNBase(ndim), fFunc(f), fUp(up) {}

~FumiliFCNAdapter() override {}

double operator()(std::span<const double> v) const override { return fFunc.operator()(&v[0]); }
double operator()(std::vector<double> const &v) const override { return fFunc.operator()(&v[0]); }
double operator()(const double *v) const { return fFunc.operator()(v); }
double Up() const override { return fUp; }

void SetErrorDef(double up) override { fUp = up; }

// virtual std::vector<double> Gradient(std::span<const double> ) const;
// virtual std::vector<double> Gradient(std::vector<double> const &) const;

// forward interface
// virtual double operator()(int npar, double* params,int iflag = 4) const;

/**
evaluate gradient hessian and function value needed by fumili
*/
void EvaluateAll(std::span<const double> v) override;
void EvaluateAll(std::vector<double> const &v) override;

private:
// data member

const Function &fFunc;
double fUp;
};

template <class Function>
void FumiliFCNAdapter<Function>::EvaluateAll(std::span<const double> v)
void FumiliFCNAdapter<Function>::EvaluateAll(std::vector<double> const &v)
{
MnPrint print("FumiliFCNAdapter");

// typedef FumiliFCNAdapter::Function Function;

// evaluate all elements
unsigned int npar = Dimension();
if (npar != v.size())
Expand Down
6 changes: 3 additions & 3 deletions math/minuit2/inc/Minuit2/FumiliFCNBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class FumiliFCNBase : public FCNBase {

**/

virtual void EvaluateAll(std::span<const double> par) = 0;
virtual void EvaluateAll(std::vector<double> const& par) = 0;

/**
Return cached Value of objective function estimated previously using the FumiliFCNBase::EvaluateAll method
Expand All @@ -98,7 +98,7 @@ class FumiliFCNBase : public FCNBase {
**/

virtual const std::vector<double> &Gradient() const { return fGradient; }
std::vector<double> Gradient(std::span<const double>) const override { return fGradient;}
std::vector<double> Gradient(std::vector<double> const&) const override { return fGradient;}

/**
Return Value of the i-th j-th element of the Hessian matrix estimated previously using the
Expand All @@ -107,7 +107,7 @@ class FumiliFCNBase : public FCNBase {
@param col col Index of the matrix
**/

std::vector<double> Hessian(std::span<const double>) const override { return fHessian;}
std::vector<double> Hessian(std::vector<double> const&) const override { return fHessian;}
virtual double Hessian(unsigned int row, unsigned int col) const
{
assert(row < fGradient.size() && col < fGradient.size());
Expand Down
6 changes: 2 additions & 4 deletions math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ class FumiliMaximumLikelihoodFCN : public FumiliFCNBase {
public:
FumiliMaximumLikelihoodFCN() {}

~FumiliMaximumLikelihoodFCN() override {}

/**

Sets the model function for the data (for example gaussian+linear for a peak)
Expand Down Expand Up @@ -84,7 +82,7 @@ class FumiliMaximumLikelihoodFCN : public FumiliFCNBase {

*/

virtual std::vector<double> Elements(std::span<const double> par) const = 0;
virtual std::vector<double> Elements(std::vector<double> const &par) const = 0;

/**

Expand Down Expand Up @@ -126,7 +124,7 @@ class FumiliMaximumLikelihoodFCN : public FumiliFCNBase {

*/

double operator()(std::span<const double> par) const override
double operator()(std::vector<double> const &par) const override
{

double sumoflogs = 0.0;
Expand Down
6 changes: 2 additions & 4 deletions math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ class FumiliStandardChi2FCN : public FumiliChi2FCN {
}
}

~FumiliStandardChi2FCN() override {}

/**

Evaluates the model function for the different measurement points and
Expand All @@ -141,7 +139,7 @@ class FumiliStandardChi2FCN : public FumiliChi2FCN {

*/

std::vector<double> Elements(std::span<const double> par) const override;
std::vector<double> Elements(std::vector<double> const &par) const override;

/**

Expand Down Expand Up @@ -176,7 +174,7 @@ class FumiliStandardChi2FCN : public FumiliChi2FCN {

**/

void EvaluateAll(std::span<const double> par) override;
void EvaluateAll(std::vector<double> const &par) override;

private:
std::vector<double> fMeasurements;
Expand Down
6 changes: 2 additions & 4 deletions math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ class FumiliStandardMaximumLikelihoodFCN : public FumiliMaximumLikelihoodFCN {
fPositions.assign(pos.begin(), pos.end());
}

~FumiliStandardMaximumLikelihoodFCN() override {}

/**

Evaluates the model function for the different measurement points and
Expand All @@ -88,7 +86,7 @@ class FumiliStandardMaximumLikelihoodFCN : public FumiliMaximumLikelihoodFCN {

*/

std::vector<double> Elements(std::span<const double> par) const override;
std::vector<double> Elements(std::vector<double> const &par) const override;

/**

Expand Down Expand Up @@ -123,7 +121,7 @@ class FumiliStandardMaximumLikelihoodFCN : public FumiliMaximumLikelihoodFCN {

**/

void EvaluateAll(std::span<const double> par) override;
void EvaluateAll(std::vector<double> const &par) override;

private:
std::vector<std::vector<double>> fPositions;
Expand Down
2 changes: 1 addition & 1 deletion math/minuit2/inc/Minuit2/GenericFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class GenericFunction {

*/

virtual double operator()(std::span<const double> x) const = 0;
virtual double operator()(std::vector<double> const& x) const = 0;
};

} // namespace Minuit2
Expand Down
10 changes: 4 additions & 6 deletions math/minuit2/inc/Minuit2/ParametricFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ class ParametricFunction : public FCNBase {

ParametricFunction(int nparams) : par(nparams) {}

~ParametricFunction() override {}

/**

Sets the parameters of the ParametricFunction.
Expand All @@ -75,7 +73,7 @@ class ParametricFunction : public FCNBase {

*/

virtual void SetParameters(std::span<const double> params) const
virtual void SetParameters(std::vector<double> const& params) const
{

assert(params.size() == par.size());
Expand Down Expand Up @@ -115,7 +113,7 @@ class ParametricFunction : public FCNBase {

*/

double operator()(std::span<const double> x) const override = 0;
double operator()(std::vector<double> const& x) const override = 0;

/**

Expand All @@ -134,7 +132,7 @@ class ParametricFunction : public FCNBase {

*/

virtual double operator()(std::span<const double> x, std::span<const double> params) const
virtual double operator()(std::vector<double> const& x, std::vector<double> const& params) const
{
SetParameters(params);
return operator()(x);
Expand All @@ -153,7 +151,7 @@ class ParametricFunction : public FCNBase {

*/

virtual std::vector<double> GetGradient(std::span<const double> x) const;
virtual std::vector<double> GetGradient(std::vector<double> const& x) const;

protected:
/**
Expand Down
4 changes: 2 additions & 2 deletions math/minuit2/src/FumiliStandardChi2FCN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ROOT {

namespace Minuit2 {

std::vector<double> FumiliStandardChi2FCN::Elements(std::span<const double> par) const
std::vector<double> FumiliStandardChi2FCN::Elements(std::vector<double> const &par) const
{
// Calculate the f(i) contribution to the Chi2. Chi2 = Sum[f(i)**2]

Expand Down Expand Up @@ -54,7 +54,7 @@ int FumiliStandardChi2FCN::GetNumberOfMeasurements() const
return fPositions.size();
}

void FumiliStandardChi2FCN::EvaluateAll(std::span<const double> par)
void FumiliStandardChi2FCN::EvaluateAll(std::vector<double> const &par)
{
// Evaluate chi2 value, gradient and hessian all in a single
// loop on the measurements
Expand Down
4 changes: 2 additions & 2 deletions math/minuit2/src/FumiliStandardMaximumLikelihoodFCN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace ROOT {

namespace Minuit2 {

std::vector<double> FumiliStandardMaximumLikelihoodFCN::Elements(std::span<const double> par) const
std::vector<double> FumiliStandardMaximumLikelihoodFCN::Elements(std::vector<double> const &par) const
{

// calculate likelihood element f(i) = pdf(x(i))
Expand Down Expand Up @@ -54,7 +54,7 @@ int FumiliStandardMaximumLikelihoodFCN::GetNumberOfMeasurements() const
return fPositions.size();
}

void FumiliStandardMaximumLikelihoodFCN::EvaluateAll(std::span<const double> par)
void FumiliStandardMaximumLikelihoodFCN::EvaluateAll(std::vector<double> const &par)
{
// Evaluate in one loop likelihood value, gradient and hessian

Expand Down
4 changes: 1 addition & 3 deletions math/minuit2/src/ParametricFunction.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ namespace ROOT {

namespace Minuit2 {

//#include "Minuit2/MnPrint.h"

std::vector<double> ParametricFunction::GetGradient(std::span<const double> x) const
std::vector<double> ParametricFunction::GetGradient(std::vector<double> const &x) const
{
// calculate the numerical gradient (using Numerical2PGradientCalculator)

Expand Down
2 changes: 1 addition & 1 deletion math/minuit2/test/MnSim/GaussFcn.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace ROOT {

namespace Minuit2 {

double GaussFcn::operator()(std::span<const double> par) const
double GaussFcn::operator()(std::vector<double> const &par) const
{

assert(par.size() == 3);
Expand Down
Loading