portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2024-11-10 00:45:36 +00:00
Code Releases Activity

XYSampleData: various size and init fixes

Browse Source
This commit is contained in:
Antonin Portelli 2014-03-17 14:58:59 +00:00
parent 1ff004b8ad
commit b9d7681b76
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/XYSampleData.cpp
View File

@ -150,14 +150,14 @@ XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused,
{
isCovarianceInit_ = false;
return y_.block(0, 0, getNData(), getXDim());
return y_.block(0, 0, getNData(), getYDim());
}
XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused,
const PlaceHolder ph2 __unused)
const
{
return y_.block(0, 0, getNData(), getXDim());
return y_.block(0, 0, getNData(), getYDim());
}
XYSampleData::SampleBlock XYSampleData::y(const Index j,
@ -180,13 +180,13 @@ XYSampleData::SampleBlock XYSampleData::y(const PlaceHolder ph1 __unused,
{
isCovarianceInit_ = false;
return y_.block(k, 0, 1, getXDim());
return y_.block(k, 0, 1, getYDim());
}
XYSampleData::ConstSampleBlock XYSampleData::y(const PlaceHolder ph1 __unused,
const Index k) const
{
return y_.block(k, 0, 1, getXDim());
return y_.block(k, 0, 1, getYDim());
}
XYSampleData::SampleBlock XYSampleData::y(const Index j, const Index k)
@ -213,9 +213,6 @@ SampleFitResult XYSampleData::fit(
SampleFitResult result;
bool initChi2;
// copy interface to sample data
data_.setFitInterface(*this);
// sample loop
result.resize(nSample);
result.chi2_.resize(nSample);
@ -288,6 +285,10 @@ void XYSampleData::setDataToSample(const Index s)
}
isCovarianceInit_ = true;
}
// copy interface to sample data
data_.setFitInterface(*this);
// set data
data_.x() = x_[s];
data_.y() = y_[s];