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

axes classes: express operator[] through binCenter

parent 503dad3f
Branches
Tags
1 merge request!1564from axes, rm operator[]; add VectorUtil
...@@ -32,7 +32,7 @@ FixedBinAxis* FixedBinAxis::clone() const ...@@ -32,7 +32,7 @@ FixedBinAxis* FixedBinAxis::clone() const
return result; return result;
} }
double FixedBinAxis::operator[](size_t index) const double FixedBinAxis::binCenter(size_t index) const
{ {
if (index >= m_nbins) if (index >= m_nbins)
throw std::runtime_error("FixedBinAxis::operator[] -> Error. Wrong index."); throw std::runtime_error("FixedBinAxis::operator[] -> Error. Wrong index.");
......
...@@ -34,14 +34,12 @@ public: ...@@ -34,14 +34,12 @@ public:
size_t size() const override { return m_nbins; } size_t size() const override { return m_nbins; }
double operator[](size_t index) const override;
Bin1D bin(size_t index) const override; Bin1D bin(size_t index) const override;
double min() const override { return m_start; } double min() const override { return m_start; }
double max() const override { return m_end; } double max() const override { return m_end; }
double binCenter(size_t index) const override { return (*this)[index]; } double binCenter(size_t index) const override;
size_t findClosestIndex(double value) const override; size_t findClosestIndex(double value) const override;
......
...@@ -65,7 +65,7 @@ public: ...@@ -65,7 +65,7 @@ public:
virtual std::vector<double> binBoundaries() const; virtual std::vector<double> binBoundaries() const;
//! indexed accessor retrieves a sample //! indexed accessor retrieves a sample
virtual double operator[](size_t index) const = 0; double operator[](size_t index) const { return binCenter(index); }
//! retrieve a 1d bin for the given index //! retrieve a 1d bin for the given index
virtual Bin1D bin(size_t index) const = 0; virtual Bin1D bin(size_t index) const = 0;
......
...@@ -46,9 +46,6 @@ public: ...@@ -46,9 +46,6 @@ public:
//! retrieve the number of bins //! retrieve the number of bins
size_t size() const override { return m_coordinates.size(); } size_t size() const override { return m_coordinates.size(); }
//! indexed accessor retrieves a sample
double operator[](size_t index) const override { return binCenter(index); }
//! retrieve a 1d bin for the given index //! retrieve a 1d bin for the given index
Bin1D bin(size_t index) const override; Bin1D bin(size_t index) const override;
......
...@@ -37,11 +37,6 @@ VariableBinAxis* VariableBinAxis::clone() const ...@@ -37,11 +37,6 @@ VariableBinAxis* VariableBinAxis::clone() const
return result; return result;
} }
double VariableBinAxis::operator[](size_t index) const
{
return bin(index).center();
}
Bin1D VariableBinAxis::bin(size_t index) const Bin1D VariableBinAxis::bin(size_t index) const
{ {
if (index >= m_nbins) if (index >= m_nbins)
......
...@@ -28,8 +28,6 @@ public: ...@@ -28,8 +28,6 @@ public:
size_t size() const override { return m_nbins; } size_t size() const override { return m_nbins; }
double operator[](size_t index) const override;
Bin1D bin(size_t index) const override; Bin1D bin(size_t index) const override;
double min() const override; double min() const override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment