[Minuit2] Remove explicit default constructors and destructors

Remove unneeded code.
root-project · Feb 25, 2025 · 6337959 · 6337959
1 parent 8651c37
commit 6337959
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 99 deletions.
diff --git a/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h b/math/minuit2/inc/Minuit2/AnalyticalGradientCalculator.h
@@ -29,8 +29,6 @@ class AnalyticalGradientCalculator : public GradientCalculator {
    {
    }
 
-   ~AnalyticalGradientCalculator() override {}
-
    FunctionGradient operator()(const MinimumParameters &) const override;
 
    FunctionGradient operator()(const MinimumParameters &, const FunctionGradient &) const override;

diff --git a/math/minuit2/inc/Minuit2/BFGSErrorUpdator.h b/math/minuit2/inc/Minuit2/BFGSErrorUpdator.h
@@ -20,15 +20,8 @@ namespace Minuit2 {
    Update of the covariance matrix for the Variable Metric minimizer (MIGRAD)
  */
 class BFGSErrorUpdator : public MinimumErrorUpdator {
-
 public:
-   BFGSErrorUpdator() {}
-
-   ~BFGSErrorUpdator() override {}
-
    MinimumError Update(const MinimumState &, const MinimumParameters &, const FunctionGradient &) const override;
-
-private:
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/CombinedMinimizer.h b/math/minuit2/inc/Minuit2/CombinedMinimizer.h
@@ -30,10 +30,6 @@ namespace Minuit2 {
 class CombinedMinimizer : public ModularFunctionMinimizer {
 
 public:
-   CombinedMinimizer() : fMinSeedGen(MnSeedGenerator()), fMinBuilder(CombinedMinimumBuilder()) {}
-
-   ~CombinedMinimizer() override {}
-
    const MinimumSeedGenerator &SeedGenerator() const override { return fMinSeedGen; }
    const MinimumBuilder &Builder() const override { return fMinBuilder; }
    MinimumBuilder &Builder() override { return fMinBuilder; }

diff --git a/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h b/math/minuit2/inc/Minuit2/CombinedMinimumBuilder.h
@@ -21,10 +21,6 @@ namespace Minuit2 {
 class CombinedMinimumBuilder : public MinimumBuilder {
 
 public:
-   CombinedMinimumBuilder() : fVMMinimizer(VariableMetricMinimizer()), fSimplexMinimizer(SimplexMinimizer()) {}
-
-   ~CombinedMinimumBuilder() override {}
-
    FunctionMinimum Minimum(const MnFcn &, const GradientCalculator &, const MinimumSeed &, const MnStrategy &,
                                    unsigned int, double) const override;
 

diff --git a/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h b/math/minuit2/inc/Minuit2/DavidonErrorUpdator.h
@@ -20,15 +20,8 @@ namespace Minuit2 {
    Update of the covariance matrix for the Variable Metric minimizer (MIGRAD)
  */
 class DavidonErrorUpdator : public MinimumErrorUpdator {
-
 public:
-   DavidonErrorUpdator() {}
-
-   ~DavidonErrorUpdator() override {}
-
    MinimumError Update(const MinimumState &, const MinimumParameters &, const FunctionGradient &) const override;
-
-private:
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/ExternalInternalGradientCalculator.h b/math/minuit2/inc/Minuit2/ExternalInternalGradientCalculator.h
@@ -35,8 +35,6 @@ class ExternalInternalGradientCalculator : public AnalyticalGradientCalculator {
    {
    }
 
-   ~ExternalInternalGradientCalculator() override {}
-
    FunctionGradient operator()(const MinimumParameters &) const override;
 
    FunctionGradient operator()(const MinimumParameters &, const FunctionGradient &) const override;

diff --git a/math/minuit2/inc/Minuit2/FCNGradAdapter.h b/math/minuit2/inc/Minuit2/FCNGradAdapter.h
@@ -37,8 +37,6 @@ class FCNGradAdapter : public FCNBase {
 public:
    FCNGradAdapter(const Function &f, double up = 1.) : fFunc(f), fUp(up), fGrad(std::vector<double>(fFunc.NDim())) {}
 
-   ~FCNGradAdapter() override {}
-
    bool HasGradient() const override { return true; }
 
    double operator()(std::vector<double> const& v) const override { return fFunc.operator()(&v[0]); }

diff --git a/math/minuit2/inc/Minuit2/FumiliBuilder.h b/math/minuit2/inc/Minuit2/FumiliBuilder.h
@@ -40,10 +40,6 @@ section 5
 class FumiliBuilder : public MinimumBuilder {
 
 public:
-   FumiliBuilder() : fEstimator(VariableMetricEDMEstimator()), fErrorUpdator(FumiliErrorUpdator()) {}
-
-   ~FumiliBuilder() override {}
-
    /**
 
    Class the member function calculating the Minimum and verifies the result

diff --git a/math/minuit2/inc/Minuit2/FumiliChi2FCN.h b/math/minuit2/inc/Minuit2/FumiliChi2FCN.h
@@ -49,10 +49,6 @@ section 5
 class FumiliChi2FCN : public FumiliFCNBase {
 
 public:
-   FumiliChi2FCN() {}
-
-   ~FumiliChi2FCN() override {}
-
    /**
 
    Sets the model function for the data (for example gaussian+linear for a peak)

diff --git a/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h b/math/minuit2/inc/Minuit2/FumiliErrorUpdator.h
@@ -47,10 +47,6 @@ section 5
 class FumiliErrorUpdator : public MinimumErrorUpdator {
 
 public:
-   FumiliErrorUpdator() {}
-
-   ~FumiliErrorUpdator() override {}
-
    /**
 
    Member function that calculates the Error matrix (or the Hessian
@@ -88,8 +84,6 @@ class FumiliErrorUpdator : public MinimumErrorUpdator {
    */
 
    MinimumError Update(const MinimumState &, const MinimumParameters &, const FunctionGradient &) const override;
-
-private:
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/FumiliFCNBase.h b/math/minuit2/inc/Minuit2/FumiliFCNBase.h
@@ -72,8 +72,6 @@ class FumiliFCNBase : public FCNBase {
 
    //   FumiliFCNBase(const ParametricFunction& modelFCN) { fModelFunction = &modelFCN; }
 
-   ~FumiliFCNBase() override {}
-
    /**
 
       Evaluate function Value, Gradient and Hessian using Fumili approximation, for values of parameters p

diff --git a/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h b/math/minuit2/inc/Minuit2/FumiliGradientCalculator.h
@@ -27,8 +27,6 @@ class FumiliGradientCalculator : public AnalyticalGradientCalculator {
 public:
    FumiliGradientCalculator(const FumiliFCNBase &fcn, const MnUserTransformation &trafo, int n);
 
-   ~FumiliGradientCalculator() override {}
-
    FunctionGradient operator()(const MinimumParameters &) const override;
 
    FunctionGradient operator()(const MinimumParameters &, const FunctionGradient &) const override;

diff --git a/math/minuit2/inc/Minuit2/MnSeedGenerator.h b/math/minuit2/inc/Minuit2/MnSeedGenerator.h
@@ -21,19 +21,12 @@ namespace Minuit2 {
  */
 
 class MnSeedGenerator : public MinimumSeedGenerator {
-
 public:
-   MnSeedGenerator() {}
-
-   ~MnSeedGenerator() override {}
-
-   MinimumSeed
-   operator()(const MnFcn &, const GradientCalculator &, const MnUserParameterState &, const MnStrategy &) const override;
+   MinimumSeed operator()(const MnFcn &, const GradientCalculator &, const MnUserParameterState &,
+                          const MnStrategy &) const override;
 
    MinimumSeed operator()(const MnFcn &, const AnalyticalGradientCalculator &, const MnUserParameterState &,
-                                  const MnStrategy &) const override;
-
-private:
+                          const MnStrategy &) const override;
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h b/math/minuit2/inc/Minuit2/Numerical2PGradientCalculator.h
@@ -39,8 +39,6 @@ class Numerical2PGradientCalculator : public GradientCalculator {
    {
    }
 
-   ~Numerical2PGradientCalculator() override {}
-
    FunctionGradient operator()(const MinimumParameters &) const override;
 
    virtual FunctionGradient operator()(std::span<const double> params) const;

diff --git a/math/minuit2/inc/Minuit2/ScanBuilder.h b/math/minuit2/inc/Minuit2/ScanBuilder.h
@@ -25,16 +25,9 @@ class MinimumSeed;
  */
 
 class ScanBuilder : public MinimumBuilder {
-
 public:
-   ScanBuilder() {}
-
-   ~ScanBuilder() override {}
-
    FunctionMinimum Minimum(const MnFcn &, const GradientCalculator &, const MinimumSeed &, const MnStrategy &,
-                                   unsigned int, double) const override;
-
-private:
+                           unsigned int, double) const override;
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/ScanMinimizer.h b/math/minuit2/inc/Minuit2/ScanMinimizer.h
@@ -26,12 +26,7 @@ namespace Minuit2 {
  */
 
 class ScanMinimizer : public ModularFunctionMinimizer {
-
 public:
-   ScanMinimizer() : fSeedGenerator(SimplexSeedGenerator()), fBuilder(ScanBuilder()) {}
-
-   ~ScanMinimizer() override {}
-
    const MinimumSeedGenerator &SeedGenerator() const override { return fSeedGenerator; }
    const MinimumBuilder &Builder() const override { return fBuilder; }
    MinimumBuilder &Builder() override { return fBuilder; }

diff --git a/math/minuit2/inc/Minuit2/SimplexBuilder.h b/math/minuit2/inc/Minuit2/SimplexBuilder.h
@@ -25,16 +25,9 @@ class MinimumSeed;
  */
 
 class SimplexBuilder : public MinimumBuilder {
-
 public:
-   SimplexBuilder() {}
-
-   ~SimplexBuilder() override {}
-
    FunctionMinimum Minimum(const MnFcn &, const GradientCalculator &, const MinimumSeed &, const MnStrategy &,
-                                   unsigned int, double) const override;
-
-private:
+                           unsigned int, double) const override;
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/SimplexMinimizer.h b/math/minuit2/inc/Minuit2/SimplexMinimizer.h
@@ -26,12 +26,7 @@ namespace Minuit2 {
  */
 
 class SimplexMinimizer : public ModularFunctionMinimizer {
-
 public:
-   SimplexMinimizer() : fSeedGenerator(SimplexSeedGenerator()), fBuilder(SimplexBuilder()) {}
-
-   ~SimplexMinimizer() override {}
-
    const MinimumSeedGenerator &SeedGenerator() const override { return fSeedGenerator; }
    const MinimumBuilder &Builder() const override { return fBuilder; }
    MinimumBuilder &Builder() override { return fBuilder; }

diff --git a/math/minuit2/inc/Minuit2/SimplexSeedGenerator.h b/math/minuit2/inc/Minuit2/SimplexSeedGenerator.h
@@ -25,19 +25,12 @@ class MnStrategy;
    generate Simplex starting point (state)
  */
 class SimplexSeedGenerator : public MinimumSeedGenerator {
-
 public:
-   SimplexSeedGenerator() {}
-
-   ~SimplexSeedGenerator() override {}
-
-   MinimumSeed
-   operator()(const MnFcn &, const GradientCalculator &, const MnUserParameterState &, const MnStrategy &) const override;
+   MinimumSeed operator()(const MnFcn &, const GradientCalculator &, const MnUserParameterState &,
+                          const MnStrategy &) const override;
 
    MinimumSeed operator()(const MnFcn &, const AnalyticalGradientCalculator &, const MnUserParameterState &,
-                                  const MnStrategy &) const override;
-
-private:
+                          const MnStrategy &) const override;
 };
 
 } // namespace Minuit2

diff --git a/math/minuit2/inc/Minuit2/VariableMetricBuilder.h b/math/minuit2/inc/Minuit2/VariableMetricBuilder.h
@@ -44,8 +44,6 @@ class VariableMetricBuilder : public MinimumBuilder {
          fErrorUpdator = std::unique_ptr<MinimumErrorUpdator>(new DavidonErrorUpdator());
    }
 
-   ~VariableMetricBuilder() override {}
-
    FunctionMinimum Minimum(const MnFcn &, const GradientCalculator &, const MinimumSeed &, const MnStrategy &,
                                    unsigned int, double) const override;
 

diff --git a/math/minuit2/inc/Minuit2/VariableMetricMinimizer.h b/math/minuit2/inc/Minuit2/VariableMetricMinimizer.h
@@ -36,15 +36,13 @@ class VariableMetricMinimizer : public ModularFunctionMinimizer {
    class BFGSType {
    };
 
-   VariableMetricMinimizer() : fMinSeedGen(MnSeedGenerator()), fMinBuilder(VariableMetricBuilder()) {}
+   VariableMetricMinimizer() = default;
 
    VariableMetricMinimizer(BFGSType)
       : fMinSeedGen(MnSeedGenerator()), fMinBuilder(VariableMetricBuilder(VariableMetricBuilder::kBFGS))
    {
    }
 
-   ~VariableMetricMinimizer() override {}
-
    const MinimumSeedGenerator &SeedGenerator() const override { return fMinSeedGen; }
    const MinimumBuilder &Builder() const override { return fMinBuilder; }
    MinimumBuilder &Builder() override { return fMinBuilder; }
-Original file line number
+Diff line change
@@ Expand Up @@
        {
        }
-       ~AnalyticalGradientCalculator() override {}
        FunctionGradient operator()(const MinimumParameters &) const override;
        FunctionGradient operator()(const MinimumParameters &, const FunctionGradient &) const override;
@@ Expand Down @@