Skip to content
Snippets Groups Projects
Commit d76b7c29 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

Fit + other rules

parent 822221e0
No related branches found
No related tags found
1 merge request!458Automatic modernization (clang-tidy --fix)
...@@ -101,24 +101,24 @@ Checks: ' ...@@ -101,24 +101,24 @@ Checks: '
-*use-auto, -*use-auto,
-*move-const-arg, -*move-const-arg,
-*use-equals-default, *use-equals-default,
-*use-nullptr, *use-nullptr,
-*use-override, *use-override,
-bugprone-parent-virtual-call, bugprone-parent-virtual-call,
-clang-analyzer-core.CallAndMessage, clang-analyzer-core.CallAndMessage,
-clang-analyzer-optin.cplusplus.VirtualCall, clang-analyzer-optin.cplusplus.VirtualCall,
-cppcoreguidelines-explicit-virtual-functions, cppcoreguidelines-explicit-virtual-functions,
-cppcoreguidelines-pro-type-const-cast, cppcoreguidelines-pro-type-const-cast,
-cppcoreguidelines-pro-type-static-cast-downcast, cppcoreguidelines-pro-type-static-cast-downcast,
-google-explicit-constructor, google-explicit-constructor,
-google-readability-avoid-underscore-in-googletest-name, google-readability-avoid-underscore-in-googletest-name,
-google-runtime-references, google-runtime-references,
-hicpp-explicit-conversions, hicpp-explicit-conversions,
-hicpp-member-init, hicpp-member-init,
-hicpp-noexcept-move, hicpp-noexcept-move,
-llvm-qualified-auto, llvm-qualified-auto,
-misc-non-private-member-variables-in-classes, misc-non-private-member-variables-in-classes,
-misc-uniqueptr-reset-release, misc-uniqueptr-reset-release,
modernize-avoid-bind, modernize-avoid-bind,
-modernize-loop-convert, -modernize-loop-convert,
modernize-make-unique, modernize-make-unique,
......
...@@ -31,7 +31,7 @@ class GSLMinimizer; ...@@ -31,7 +31,7 @@ class GSLMinimizer;
class GSLMultiMinimizer : public MinimizerAdapter { class GSLMultiMinimizer : public MinimizerAdapter {
public: public:
explicit GSLMultiMinimizer(const std::string& algorithmName = "ConjugateFR"); explicit GSLMultiMinimizer(const std::string& algorithmName = "ConjugateFR");
~GSLMultiMinimizer(); ~GSLMultiMinimizer() override;
//! Sets minimizer internal print level. //! Sets minimizer internal print level.
void setPrintLevel(int value); void setPrintLevel(int value);
......
...@@ -31,7 +31,7 @@ class GeneticMinimizer; ...@@ -31,7 +31,7 @@ class GeneticMinimizer;
class GeneticMinimizer : public MinimizerAdapter { class GeneticMinimizer : public MinimizerAdapter {
public: public:
GeneticMinimizer(); GeneticMinimizer();
~GeneticMinimizer(); ~GeneticMinimizer() override;
//! Sets tolerance on the function value at the minimum. //! Sets tolerance on the function value at the minimum.
//! Minimization will stop when the estimated vertical distance to the minimum (EDM) is less //! Minimization will stop when the estimated vertical distance to the minimum (EDM) is less
......
...@@ -201,7 +201,7 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const ...@@ -201,7 +201,7 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const
{ {
std::vector<double> result; std::vector<double> result;
result.resize(fitDimension(), 0.0); result.resize(fitDimension(), 0.0);
if (rootMinimizer()->Errors() != 0) { if (rootMinimizer()->Errors() != nullptr) {
std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitDimension(), std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitDimension(),
result.begin()); result.begin());
} }
......
...@@ -43,7 +43,7 @@ class MinimizerAdapter : public IMinimizer { ...@@ -43,7 +43,7 @@ class MinimizerAdapter : public IMinimizer {
public: public:
using root_minimizer_t = ROOT::Math::Minimizer; using root_minimizer_t = ROOT::Math::Minimizer;
virtual ~MinimizerAdapter() override; ~MinimizerAdapter() override;
mumufit::MinimizerResult minimize_scalar(fcn_scalar_t fcn, mumufit::MinimizerResult minimize_scalar(fcn_scalar_t fcn,
mumufit::Parameters parameters) override; mumufit::Parameters parameters) override;
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
void setOptions(const std::string& optionString) override; void setOptions(const std::string& optionString) override;
protected: protected:
MinimizerAdapter(MinimizerInfo minimizerInfo); explicit MinimizerAdapter(MinimizerInfo minimizerInfo);
mumufit::MinimizerResult minimize(mumufit::Parameters parameters); mumufit::MinimizerResult minimize(mumufit::Parameters parameters);
......
...@@ -32,8 +32,8 @@ class Minuit2Minimizer; ...@@ -32,8 +32,8 @@ class Minuit2Minimizer;
class Minuit2Minimizer : public MinimizerAdapter { class Minuit2Minimizer : public MinimizerAdapter {
public: public:
Minuit2Minimizer(const std::string& algorithmName = "Migrad"); explicit Minuit2Minimizer(const std::string& algorithmName = "Migrad");
~Minuit2Minimizer(); ~Minuit2Minimizer() override;
//! Sets minimization strategy (0-low, 1-medium, 2-high minimization quality). //! Sets minimization strategy (0-low, 1-medium, 2-high minimization quality).
//! At low quality number of function calls will be economized. //! At low quality number of function calls will be economized.
......
...@@ -29,7 +29,7 @@ ObjectiveFunctionAdapter::rootObjectiveFunction(fcn_scalar_t fcn, const Paramete ...@@ -29,7 +29,7 @@ ObjectiveFunctionAdapter::rootObjectiveFunction(fcn_scalar_t fcn, const Paramete
{ {
std::unique_ptr<ScalarFunctionAdapter> tem_adapter(new ScalarFunctionAdapter(fcn, parameters)); std::unique_ptr<ScalarFunctionAdapter> tem_adapter(new ScalarFunctionAdapter(fcn, parameters));
const auto *result = tem_adapter->rootObjectiveFunction(); const auto *result = tem_adapter->rootObjectiveFunction();
m_adapter.reset(tem_adapter.release()); m_adapter = std::move(tem_adapter);
return result; return result;
} }
...@@ -39,7 +39,7 @@ ObjectiveFunctionAdapter::rootResidualFunction(fcn_residual_t fcn, const Paramet ...@@ -39,7 +39,7 @@ ObjectiveFunctionAdapter::rootResidualFunction(fcn_residual_t fcn, const Paramet
std::unique_ptr<ResidualFunctionAdapter> tem_adapter( std::unique_ptr<ResidualFunctionAdapter> tem_adapter(
new ResidualFunctionAdapter(fcn, parameters)); new ResidualFunctionAdapter(fcn, parameters));
const auto *result = tem_adapter->rootResidualFunction(); const auto *result = tem_adapter->rootResidualFunction();
m_adapter.reset(tem_adapter.release()); m_adapter = std::move(tem_adapter);
return result; return result;
} }
......
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
//! Evaluation of single data element residual. Will be called by ROOT minimizer. //! Evaluation of single data element residual. Will be called by ROOT minimizer.
double DataElement(const double* pars, unsigned int index, double DataElement(const double* pars, unsigned int index,
double* gradients = 0) const override; double* gradients = nullptr) const override;
private: private:
//! evaluation of chi2 //! evaluation of chi2
......
...@@ -29,7 +29,7 @@ IMinimizer* MinimizerFactory::createMinimizer(const std::string& minimizerName, ...@@ -29,7 +29,7 @@ IMinimizer* MinimizerFactory::createMinimizer(const std::string& minimizerName,
const std::string& algorithmType, const std::string& algorithmType,
const std::string& optionString) const std::string& optionString)
{ {
IMinimizer* result(0); IMinimizer* result(nullptr);
if (minimizerName == "Minuit2") { if (minimizerName == "Minuit2") {
result = new Minuit2Minimizer(algorithmType); result = new Minuit2Minimizer(algorithmType);
......
...@@ -25,7 +25,7 @@ class PyCallback { ...@@ -25,7 +25,7 @@ class PyCallback {
public: public:
enum CallbackType { SCALAR, RESIDUAL }; enum CallbackType { SCALAR, RESIDUAL };
PyCallback(CallbackType callback_type = SCALAR); explicit PyCallback(CallbackType callback_type = SCALAR);
virtual ~PyCallback(); virtual ~PyCallback();
CallbackType callback_type() const; CallbackType callback_type() const;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
class Attributes { class Attributes {
public: public:
Attributes() {} Attributes() = default;
//! Creates a fixed value object //! Creates a fixed value object
static Attributes fixed() { return Attributes(true); } static Attributes fixed() { return Attributes(true); }
static Attributes free() { return Attributes(false); } static Attributes free() { return Attributes(false); }
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
bool operator!=(const Attributes& other) const { return !(*this == other); } bool operator!=(const Attributes& other) const { return !(*this == other); }
protected: protected:
Attributes(bool is_fixed) : m_is_fixed(is_fixed) {} explicit Attributes(bool is_fixed) : m_is_fixed(is_fixed) {}
bool m_is_fixed{false}; //! parameter is fixed bool m_is_fixed{false}; //! parameter is fixed
......
...@@ -44,8 +44,8 @@ class Minimizer; ...@@ -44,8 +44,8 @@ class Minimizer;
class MinimizerTestPlan { class MinimizerTestPlan {
public: public:
MinimizerTestPlan() {} MinimizerTestPlan() = default;
MinimizerTestPlan(std::vector<ParameterReference> parameter_references) explicit MinimizerTestPlan(std::vector<ParameterReference> parameter_references)
: m_parameter_references(std::move(parameter_references)) : m_parameter_references(std::move(parameter_references))
{ {
} }
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
using iterator = container_t::iterator; using iterator = container_t::iterator;
using const_iterator = container_t::const_iterator; using const_iterator = container_t::const_iterator;
OptionContainer() {} OptionContainer() = default;
OptionContainer(const OptionContainer& other); OptionContainer(const OptionContainer& other);
OptionContainer& operator=(const OptionContainer& other); OptionContainer& operator=(const OptionContainer& other);
......
...@@ -292,7 +292,7 @@ Attributes for a fit parameter. Currently, the only attribute is fixed/free. ...@@ -292,7 +292,7 @@ Attributes for a fit parameter. Currently, the only attribute is fixed/free.
C++ includes: Attributes.h C++ includes: Attributes.h
"; ";
   
%feature("docstring") Attributes::Attributes "Attributes::Attributes() %feature("docstring") Attributes::Attributes "Attributes::Attributes()=default
"; ";
   
%feature("docstring") Attributes::setFixed "void Attributes::setFixed(bool is_fixed) %feature("docstring") Attributes::setFixed "void Attributes::setFixed(bool is_fixed)
...@@ -3584,7 +3584,7 @@ C++ includes: GeneticMinimizer.h ...@@ -3584,7 +3584,7 @@ C++ includes: GeneticMinimizer.h
%feature("docstring") GeneticMinimizer::GeneticMinimizer "GeneticMinimizer::GeneticMinimizer() %feature("docstring") GeneticMinimizer::GeneticMinimizer "GeneticMinimizer::GeneticMinimizer()
"; ";
   
%feature("docstring") GeneticMinimizer::~GeneticMinimizer "GeneticMinimizer::~GeneticMinimizer() %feature("docstring") GeneticMinimizer::~GeneticMinimizer "GeneticMinimizer::~GeneticMinimizer() override
"; ";
   
%feature("docstring") GeneticMinimizer::setTolerance "void GeneticMinimizer::setTolerance(double value) %feature("docstring") GeneticMinimizer::setTolerance "void GeneticMinimizer::setTolerance(double value)
...@@ -4548,7 +4548,7 @@ C++ includes: GSLMultiMinimizer.h ...@@ -4548,7 +4548,7 @@ C++ includes: GSLMultiMinimizer.h
%feature("docstring") GSLMultiMinimizer::GSLMultiMinimizer "GSLMultiMinimizer::GSLMultiMinimizer(const std::string &algorithmName=\"ConjugateFR\") %feature("docstring") GSLMultiMinimizer::GSLMultiMinimizer "GSLMultiMinimizer::GSLMultiMinimizer(const std::string &algorithmName=\"ConjugateFR\")
"; ";
   
%feature("docstring") GSLMultiMinimizer::~GSLMultiMinimizer "GSLMultiMinimizer::~GSLMultiMinimizer() %feature("docstring") GSLMultiMinimizer::~GSLMultiMinimizer "GSLMultiMinimizer::~GSLMultiMinimizer() override
"; ";
   
%feature("docstring") GSLMultiMinimizer::setPrintLevel "void GSLMultiMinimizer::setPrintLevel(int value) %feature("docstring") GSLMultiMinimizer::setPrintLevel "void GSLMultiMinimizer::setPrintLevel(int value)
...@@ -6986,7 +6986,7 @@ Defines objective function to fit, expected minimum, initial fit parameters and ...@@ -6986,7 +6986,7 @@ Defines objective function to fit, expected minimum, initial fit parameters and
C++ includes: MinimizerTestPlan.h C++ includes: MinimizerTestPlan.h
"; ";
   
%feature("docstring") MinimizerTestPlan::MinimizerTestPlan "MinimizerTestPlan::MinimizerTestPlan() %feature("docstring") MinimizerTestPlan::MinimizerTestPlan "MinimizerTestPlan::MinimizerTestPlan()=default
"; ";
   
%feature("docstring") MinimizerTestPlan::MinimizerTestPlan "MinimizerTestPlan::MinimizerTestPlan(std::vector< ParameterReference > parameter_references) %feature("docstring") MinimizerTestPlan::MinimizerTestPlan "MinimizerTestPlan::MinimizerTestPlan(std::vector< ParameterReference > parameter_references)
...@@ -7508,7 +7508,7 @@ C++ includes: Minuit2Minimizer.h ...@@ -7508,7 +7508,7 @@ C++ includes: Minuit2Minimizer.h
%feature("docstring") Minuit2Minimizer::Minuit2Minimizer "Minuit2Minimizer::Minuit2Minimizer(const std::string &algorithmName=\"Migrad\") %feature("docstring") Minuit2Minimizer::Minuit2Minimizer "Minuit2Minimizer::Minuit2Minimizer(const std::string &algorithmName=\"Migrad\")
"; ";
   
%feature("docstring") Minuit2Minimizer::~Minuit2Minimizer "Minuit2Minimizer::~Minuit2Minimizer() %feature("docstring") Minuit2Minimizer::~Minuit2Minimizer "Minuit2Minimizer::~Minuit2Minimizer() override
"; ";
   
%feature("docstring") Minuit2Minimizer::setStrategy "void Minuit2Minimizer::setStrategy(int value) %feature("docstring") Minuit2Minimizer::setStrategy "void Minuit2Minimizer::setStrategy(int value)
...@@ -10293,7 +10293,7 @@ Stores multi option (int,double,string) in a container. ...@@ -10293,7 +10293,7 @@ Stores multi option (int,double,string) in a container.
C++ includes: OptionContainer.h C++ includes: OptionContainer.h
"; ";
   
%feature("docstring") OptionContainer::OptionContainer "OptionContainer::OptionContainer() %feature("docstring") OptionContainer::OptionContainer "OptionContainer::OptionContainer()=default
"; ";
   
%feature("docstring") OptionContainer::OptionContainer "OptionContainer::OptionContainer(const OptionContainer &other) %feature("docstring") OptionContainer::OptionContainer "OptionContainer::OptionContainer(const OptionContainer &other)
...@@ -11340,7 +11340,7 @@ return the type of method, override if needed ...@@ -11340,7 +11340,7 @@ return the type of method, override if needed
%feature("docstring") RootResidualFunction::Clone "ROOT::Math::IMultiGenFunction * RootResidualFunction::Clone() const override %feature("docstring") RootResidualFunction::Clone "ROOT::Math::IMultiGenFunction * RootResidualFunction::Clone() const override
"; ";
   
%feature("docstring") RootResidualFunction::DataElement "double RootResidualFunction::DataElement(const double *pars, unsigned int index, double *gradients=0) const override %feature("docstring") RootResidualFunction::DataElement "double RootResidualFunction::DataElement(const double *pars, unsigned int index, double *gradients=nullptr) const override
   
Evaluation of single data element residual. Will be called by ROOT minimizer. Evaluation of single data element residual. Will be called by ROOT minimizer.
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment