From bdfbaa80b9591e99c36dc51bc9a8351433bbb934 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Fri, 4 Apr 2025 20:04:50 +0200
Subject: [PATCH] plot value/error pairs

---
 lib/LatAnalyze/Core/Plot.cpp | 63 ++++++++++++++++++++++++++----------
 lib/LatAnalyze/Core/Plot.hpp |  5 +++
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/lib/LatAnalyze/Core/Plot.cpp b/lib/LatAnalyze/Core/Plot.cpp
index 6b93960..bef645a 100644
--- a/lib/LatAnalyze/Core/Plot.cpp
+++ b/lib/LatAnalyze/Core/Plot.cpp
@@ -112,20 +112,28 @@ PlotHeadCommand::PlotHeadCommand(const string &command)
 }
 
 // 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");
     }
+    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;
 
-    d.col(0)    = x[central].col(0);
-    d.col(2)    = y[central].col(0);
-    d.col(1)    = x.variance().cwiseSqrt().col(0);
-    d.col(3)    = y.variance().cwiseSqrt().col(0);
+    d.col(0)    = x.first.col(0);
+    d.col(2)    = y.first.col(0);
+    d.col(1)    = x.second.col(0);
+    d.col(3)    = y.second.col(0);
     tmpFileName = dumpToTmpFile(d);
     pushTmpFile(tmpFileName);
     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);
     string usingCmd, tmpFileName;
 
     d.col(0)    = x;
-    d.col(1)    = y[central].col(0);
-    d.col(2)    = y.variance().cwiseSqrt().col(0);
+    d.col(1)    = y.first.col(0);
+    d.col(2)    = y.second.col(0);
     tmpFileName = dumpToTmpFile(d);
     pushTmpFile(tmpFileName);
     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");
     }
+    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;
 
-    d.col(0)    = x[central].col(0);
+    d.col(0)    = x.first.col(0);
     d.col(2)    = y;
-    d.col(1)    = x.variance().cwiseSqrt().col(0);
+    d.col(1)    = x.second.col(0);
     tmpFileName = dumpToTmpFile(d);
     pushTmpFile(tmpFileName);
     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)
 {
     string usingCmd, tmpFileName;
diff --git a/lib/LatAnalyze/Core/Plot.hpp b/lib/LatAnalyze/Core/Plot.hpp
index ae578c5..1ae4d91 100644
--- a/lib/LatAnalyze/Core/Plot.hpp
+++ b/lib/LatAnalyze/Core/Plot.hpp
@@ -87,8 +87,13 @@ public:
 
 class PlotData: public PlotObject
 {
+public:
+    typedef std::pair<DVec, DVec> DVecPair;
 public:
     // 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 DVec       &x, const DMatSample &y, const bool abs = false);
     PlotData(const DMatSample &x, const DVec       &y, const bool abs = false);