portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-05-14 05:15:45 +01:00
Code Releases Activity

plot value/error pairs

Browse Source
This commit is contained in:
Antonin Portelli 2025-04-04 20:04:50 +02:00
parent 6fbb0f70ef
commit bdfbaa80b9
2 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/LatAnalyze/Core/Plot.cpp
View File

@ -112,20 +112,28 @@ PlotHeadCommand::PlotHeadCommand(const string &command)
} }
// PlotData constructor //////////////////////////////////////////////////////// // PlotData constructor ////////////////////////////////////////////////////////
PlotData::PlotData(const DMatSample &x, const DMatSample &y, const bool abs) PlotData::PlotData(const DVecPair &x, const DVecPair &y, const bool abs)
{ {
if (x[central].rows() != y[central].rows()) if (x.first.rows() != y.first.rows())
{ {
LATAN_ERROR(Size, "x and y vectors do not have the same size"); LATAN_ERROR(Size, "x and y vectors do not have the same size");
} }
if (x.first.rows() != x.second.rows())
{
LATAN_ERROR(Size, "x and error vectors do not have the same size");
}
if (y.first.rows() != y.second.rows())
{
LATAN_ERROR(Size, "y and error vectors do not have the same size");
}
DMat d(x[central].rows(), 4); DMat d(x.first.rows(), 4);
string usingCmd, tmpFileName; string usingCmd, tmpFileName;
d.col(0) = x[central].col(0); d.col(0) = x.first.col(0);
d.col(2) = y[central].col(0); d.col(2) = y.first.col(0);
d.col(1) = x.variance().cwiseSqrt().col(0); d.col(1) = x.second.col(0);
d.col(3) = y.variance().cwiseSqrt().col(0); d.col(3) = y.second.col(0);
tmpFileName = dumpToTmpFile(d); tmpFileName = dumpToTmpFile(d);
pushTmpFile(tmpFileName); pushTmpFile(tmpFileName);
if (!abs) if (!abs)
@ -138,19 +146,23 @@ PlotData::PlotData(const DMatSample &x, const DMatSample &y, const bool abs)
} }
} }
PlotData::PlotData(const DVec &x, const DMatSample &y, const bool abs) PlotData::PlotData(const DVec &x, const DVecPair &y, const bool abs)
{ {
if (x.rows() != y[central].rows()) if (x.rows() != y.first.rows())
{ {
LATAN_ERROR(Size, "x and y vector does not have the same size"); LATAN_ERROR(Size, "x and y vectors do not have the same size");
}
if (y.first.rows() != y.second.rows())
{
LATAN_ERROR(Size, "y and error vectors do not have the same size");
} }
DMat d(x.rows(), 3); DMat d(x.rows(), 3);
string usingCmd, tmpFileName; string usingCmd, tmpFileName;
d.col(0) = x; d.col(0) = x;
d.col(1) = y[central].col(0); d.col(1) = y.first.col(0);
d.col(2) = y.variance().cwiseSqrt().col(0); d.col(2) = y.second.col(0);
tmpFileName = dumpToTmpFile(d); tmpFileName = dumpToTmpFile(d);
pushTmpFile(tmpFileName); pushTmpFile(tmpFileName);
if (!abs) if (!abs)
@ -163,19 +175,23 @@ PlotData::PlotData(const DVec &x, const DMatSample &y, const bool abs)
} }
} }
PlotData::PlotData(const DMatSample &x, const DVec &y, const bool abs) PlotData::PlotData(const DVecPair &x, const DVec &y, const bool abs)
{ {
if (x[central].rows() != y.rows()) if (x.first.rows() != y.rows())
{ {
LATAN_ERROR(Size, "x and y vectors do not have the same size"); LATAN_ERROR(Size, "x and y vectors do not have the same size");
} }
if (x.first.rows() != x.second.rows())
{
LATAN_ERROR(Size, "x and error vectors do not have the same size");
}
DMat d(x[central].rows(), 3), xerr, yerr; DMat d(x.first.rows(), 3), xerr, yerr;
string usingCmd, tmpFileName; string usingCmd, tmpFileName;
d.col(0) = x[central].col(0); d.col(0) = x.first.col(0);
d.col(2) = y; d.col(2) = y;
d.col(1) = x.variance().cwiseSqrt().col(0); d.col(1) = x.second.col(0);
tmpFileName = dumpToTmpFile(d); tmpFileName = dumpToTmpFile(d);
pushTmpFile(tmpFileName); pushTmpFile(tmpFileName);
if (!abs) if (!abs)
@ -188,6 +204,19 @@ PlotData::PlotData(const DMatSample &x, const DVec &y, const bool abs)
} }
} }
PlotData::PlotData(const DMatSample &x, const DMatSample &y, const bool abs)
: PlotData(DVecPair(x[central], x.variance().cwiseSqrt()),
DVecPair(y[central], y.variance().cwiseSqrt()), abs)
{}
PlotData::PlotData(const DVec &x, const DMatSample &y, const bool abs)
: PlotData(x, DVecPair(y[central], y.variance().cwiseSqrt()), abs)
{}
PlotData::PlotData(const DMatSample &x, const DVec &y, const bool abs)
: PlotData(DVecPair(x[central], x.variance().cwiseSqrt()), y, abs)
{}
PlotData::PlotData(const XYStatData &data, const Index i, const Index j, const bool abs) PlotData::PlotData(const XYStatData &data, const Index i, const Index j, const bool abs)
{ {
string usingCmd, tmpFileName; string usingCmd, tmpFileName;

5
lib/LatAnalyze/Core/Plot.hpp
View File

@ -87,8 +87,13 @@ public:
class PlotData: public PlotObject class PlotData: public PlotObject
{ {
public:
typedef std::pair<DVec, DVec> DVecPair;
public: public:
// constructor // constructor
PlotData(const DVecPair &x, const DVecPair &y, const bool abs = false);
PlotData(const DVec &x, const DVecPair &y, const bool abs = false);
PlotData(const DVecPair &x, const DVec &y, const bool abs = false);
PlotData(const DMatSample &x, const DMatSample &y, const bool abs = false); PlotData(const DMatSample &x, const DMatSample &y, const bool abs = false);
PlotData(const DVec &x, const DMatSample &y, const bool abs = false); PlotData(const DVec &x, const DMatSample &y, const bool abs = false);
PlotData(const DMatSample &x, const DVec &y, const bool abs = false); PlotData(const DMatSample &x, const DVec &y, const bool abs = false);