portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-04-10 19:20:44 +01:00
Code Releases Activity

XY*Data: better choice of default arguments for data interface

Browse Source
This commit is contained in:
Antonin Portelli 2014-03-12 20:02:14 +00:00
parent 28b3306110
commit 82abf7872a
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
latan/XYSampleData.cpp
View File

@ -289,6 +289,6 @@ void XYSampleData::setDataToSample(const Index s)
isCovarianceInit_ = true; isCovarianceInit_ = true;
} }
// set data // set data
data_.x(_, _) = x_[s]; data_.x() = x_[s];
data_.y(_, _) = y_[s]; data_.y() = y_[s];
} }

22
latan/XYSampleData.hpp
View File

@ -42,13 +42,13 @@ public:
// destructor // destructor
virtual ~SampleFitResult(void) = default; virtual ~SampleFitResult(void) = default;
// access // access
double getChi2(const Index s) const; double getChi2(const Index s = central) const;
const DSample & getChi2(const PlaceHolder ph = _) const; const DSample & getChi2(const PlaceHolder ph) const;
double getChi2PerDof(const Index s) const; double getChi2PerDof(const Index s = central) const;
DSample getChi2PerDof(const PlaceHolder ph = _) const; DSample getChi2PerDof(const PlaceHolder ph) const;
const DoubleFunction & getModel(const Index s, const DoubleFunction & getModel(const Index s = central,
const Index j = 0) const; const Index j = 0) const;
const DoubleFunctionSample & getModel(const PlaceHolder ph = _, const DoubleFunctionSample & getModel(const PlaceHolder ph,
const Index j = 0) const; const Index j = 0) const;
private: private:
DSample chi2_; DSample chi2_;
@ -75,16 +75,18 @@ public:
const XYStatData & getData(const Index s = central); const XYStatData & getData(const Index s = central);
void resize(const Index nData, const Index xDim, void resize(const Index nData, const Index xDim,
const Index yDim, const Index nSample); const Index yDim, const Index nSample);
SampleBlock x(const PlaceHolder ph1, const PlaceHolder ph2); SampleBlock x(const PlaceHolder ph1 = _, const PlaceHolder ph2 = _);
ConstSampleBlock x(const PlaceHolder ph1, const PlaceHolder ph2) const; ConstSampleBlock x(const PlaceHolder ph1 = _,
const PlaceHolder ph2 = _) const;
SampleBlock x(const Index i, const PlaceHolder ph2 = _); SampleBlock x(const Index i, const PlaceHolder ph2 = _);
ConstSampleBlock x(const Index i, const PlaceHolder ph2 = _) const; ConstSampleBlock x(const Index i, const PlaceHolder ph2 = _) const;
SampleBlock x(const PlaceHolder ph1, const Index k); SampleBlock x(const PlaceHolder ph1, const Index k);
ConstSampleBlock x(const PlaceHolder ph1, const Index k) const; ConstSampleBlock x(const PlaceHolder ph1, const Index k) const;
SampleBlock x(const Index i, const Index k); SampleBlock x(const Index i, const Index k);
ConstSampleBlock x(const Index i, const Index k) const; ConstSampleBlock x(const Index i, const Index k) const;
SampleBlock y(const PlaceHolder ph1, const PlaceHolder ph2); SampleBlock y(const PlaceHolder ph1 = _, const PlaceHolder ph2 = _);
ConstSampleBlock y(const PlaceHolder ph1, const PlaceHolder ph2) const; ConstSampleBlock y(const PlaceHolder ph1 = _,
const PlaceHolder ph2 = _) const;
SampleBlock y(const Index i, const PlaceHolder ph2 = _); SampleBlock y(const Index i, const PlaceHolder ph2 = _);
ConstSampleBlock y(const Index i, const PlaceHolder ph2 = _) const; ConstSampleBlock y(const Index i, const PlaceHolder ph2 = _) const;
SampleBlock y(const PlaceHolder ph1, const Index k); SampleBlock y(const PlaceHolder ph1, const Index k);

12
latan/XYStatData.hpp
View File

@ -75,16 +75,20 @@ public:
// access // access
void resize(const Index nData, const Index xDim, void resize(const Index nData, const Index xDim,
const Index yDim); const Index yDim);
Block<DMatBase> x(const PlaceHolder ph1, const PlaceHolder ph2); Block<DMatBase> x(const PlaceHolder ph1 = _,
ConstBlock<DMatBase> x(const PlaceHolder ph1, const PlaceHolder ph2) const; const PlaceHolder ph2 = _);
ConstBlock<DMatBase> x(const PlaceHolder ph1 = _,
const PlaceHolder ph2 = _) const;
Block<DMatBase> x(const Index i, const PlaceHolder ph2 = _); Block<DMatBase> x(const Index i, const PlaceHolder ph2 = _);
ConstBlock<DMatBase> x(const Index i, const PlaceHolder ph2 = _) const; ConstBlock<DMatBase> x(const Index i, const PlaceHolder ph2 = _) const;
Block<DMatBase> x(const PlaceHolder ph1, const Index k); Block<DMatBase> x(const PlaceHolder ph1, const Index k);
ConstBlock<DMatBase> x(const PlaceHolder ph1, const Index k) const; ConstBlock<DMatBase> x(const PlaceHolder ph1, const Index k) const;
double & x(const Index i, const Index k); double & x(const Index i, const Index k);
const double & x(const Index i, const Index k) const; const double & x(const Index i, const Index k) const;
Block<DMatBase> y(const PlaceHolder ph1, const PlaceHolder ph2); Block<DMatBase> y(const PlaceHolder ph1 = _,
ConstBlock<DMatBase> y(const PlaceHolder ph1, const PlaceHolder ph2) const; const PlaceHolder ph2 = _);
ConstBlock<DMatBase> y(const PlaceHolder ph1 = _,
const PlaceHolder ph2 = _) const;
Block<DMatBase> y(const Index i, const PlaceHolder ph2 = _); Block<DMatBase> y(const Index i, const PlaceHolder ph2 = _);
ConstBlock<DMatBase> y(const Index i, const PlaceHolder ph2 = _) const; ConstBlock<DMatBase> y(const Index i, const PlaceHolder ph2 = _) const;
Block<DMatBase> y(const PlaceHolder ph1, const Index k); Block<DMatBase> y(const PlaceHolder ph1, const Index k);