From 352caf30b6b7f23169da2bd2869d48142ce458b8 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 8 Mar 2016 19:37:02 +0000 Subject: [PATCH] more deactivation of the old fit interface --- lib/Plot.cpp | 28 ++++++++++++++-------------- lib/Plot.hpp | 6 ++++-- lib/TabFunction.cpp | 30 +++++++++++++++--------------- lib/TabFunction.hpp | 14 +++++++------- 4 files changed, 40 insertions(+), 38 deletions(-) diff --git a/lib/Plot.cpp b/lib/Plot.cpp index 0e1f0e9..1aebbe7 100644 --- a/lib/Plot.cpp +++ b/lib/Plot.cpp @@ -167,20 +167,20 @@ PlotData::PlotData(const DMatSample &x, const DVec &y) setCommand("'" + tmpFileName + "' u 1:3:2 w xerr"); } -PlotData::PlotData(const XYStatData &data, const Index i, const Index j) -{ - DMat d(data.getNData(), 4); - string usingCmd, tmpFileName; - - d.col(0) = data.x(i); - d.col(2) = data.y(j); - d.col(1) = data.xxVar(i, i).diagonal().array().sqrt(); - d.col(3) = data.yyVar(j, j).diagonal().array().sqrt(); - usingCmd = (data.isXExact(i)) ? "u 1:3:4 w yerr" : "u 1:3:2:4 w xyerr"; - tmpFileName = dumpToTmpFile(d); - pushTmpFile(tmpFileName); - setCommand("'" + tmpFileName + "' " + usingCmd); -} +//PlotData::PlotData(const XYStatData &data, const Index i, const Index j) +//{ +// DMat d(data.getNData(), 4); +// string usingCmd, tmpFileName; +// +// d.col(0) = data.x(i); +// d.col(2) = data.y(j); +// d.col(1) = data.xxVar(i, i).diagonal().array().sqrt(); +// d.col(3) = data.yyVar(j, j).diagonal().array().sqrt(); +// usingCmd = (data.isXExact(i)) ? "u 1:3:4 w yerr" : "u 1:3:2:4 w xyerr"; +// tmpFileName = dumpToTmpFile(d); +// pushTmpFile(tmpFileName); +// setCommand("'" + tmpFileName + "' " + usingCmd); +//} // PlotHLine constructor /////////////////////////////////////////////////////// PlotHLine::PlotHLine(const double y) diff --git a/lib/Plot.hpp b/lib/Plot.hpp index 57ffe65..200df0b 100644 --- a/lib/Plot.hpp +++ b/lib/Plot.hpp @@ -21,9 +21,11 @@ #define Latan_Plot_hpp_ #include +#include #include +#include #include -#include +//#include #include #include @@ -92,7 +94,7 @@ public: PlotData(const DMatSample &x, const DMatSample &y); PlotData(const DVec &x, const DMatSample &y); PlotData(const DMatSample &x, const DVec &y); - PlotData(const XYStatData &data, const Index i = 0, const Index j = 0); + //PlotData(const XYStatData &data, const Index i = 0, const Index j = 0); // destructor virtual ~PlotData(void) = default; }; diff --git a/lib/TabFunction.cpp b/lib/TabFunction.cpp index fac3fba..dea41ea 100644 --- a/lib/TabFunction.cpp +++ b/lib/TabFunction.cpp @@ -34,12 +34,12 @@ TabFunction::TabFunction(const DVec &x, const DVec &y, setData(x, y); } -TabFunction::TabFunction(const XYStatData &data, const Index i, const Index j, - const InterpType interpType) -: interpType_(interpType) -{ - setData(data, i, j); -} +//TabFunction::TabFunction(const XYStatData &data, const Index i, const Index j, +// const InterpType interpType) +//: interpType_(interpType) +//{ +// setData(data, i, j); +//} // access ////////////////////////////////////////////////////////////////////// void TabFunction::setData(const DVec &x, const DVec &y) @@ -54,10 +54,10 @@ void TabFunction::setData(const DVec &x, const DVec &y) } } -void TabFunction::setData(const XYStatData &data, const Index i, const Index j) -{ - setData(data.x(i), data.y(j)); -} +//void TabFunction::setData(const XYStatData &data, const Index i, const Index j) +//{ +// setData(data.x(i), data.y(j)); +//} // function call /////////////////////////////////////////////////////////////// double TabFunction::operator()(const double *arg) const @@ -154,11 +154,11 @@ DoubleFunction Latan::interpolate(const DVec &x, const DVec &y, return TabFunction(x, y, interpType).makeFunction(); } -DoubleFunction Latan::interpolate(const XYStatData &data, const Index i, - const Index j, const InterpType interpType) -{ - return TabFunction(data, i, j, interpType).makeFunction(); -} +//DoubleFunction Latan::interpolate(const XYStatData &data, const Index i, +// const Index j, const InterpType interpType) +//{ +// return TabFunction(data, i, j, interpType).makeFunction(); +//} map::const_iterator TabFunction::nearest(const double x) const { diff --git a/lib/TabFunction.hpp b/lib/TabFunction.hpp index d5623b7..f31187d 100644 --- a/lib/TabFunction.hpp +++ b/lib/TabFunction.hpp @@ -25,7 +25,7 @@ #include #include #include -#include +//#include BEGIN_LATAN_NAMESPACE @@ -47,13 +47,13 @@ public: TabFunction(void) = default; TabFunction(const DVec &x, const DVec &y, const InterpType interpType = InterpType::LINEAR); - TabFunction(const XYStatData &data, const Index i = 0, const Index j = 0, - const InterpType interpType = InterpType::LINEAR); + //TabFunction(const XYStatData &data, const Index i = 0, const Index j = 0, + // const InterpType interpType = InterpType::LINEAR); // destructor virtual ~TabFunction(void) = default; // access void setData(const DVec &x, const DVec &y); - void setData(const XYStatData &data, const Index i = 0, const Index j = 0); + // void setData(const XYStatData &data, const Index i = 0, const Index j = 0); // function call double operator()(const double *arg) const; // factory @@ -67,9 +67,9 @@ private: DoubleFunction interpolate(const DVec &x, const DVec &y, const InterpType interpType = InterpType::LINEAR); -DoubleFunction interpolate(const XYStatData &data, const Index i = 0, - const Index j = 0, - const InterpType interpType = InterpType::LINEAR); +//DoubleFunction interpolate(const XYStatData &data, const Index i = 0, +// const Index j = 0, +// const InterpType interpType = InterpType::LINEAR); END_LATAN_NAMESPACE