GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r625:2d8c14c32b86

Merge branch 'feature/MergeFix' into develop

Alexandre Leroux -

r625:2d8c14c32b86

parent child

Context file:

r625:2d8c14c32b86

Collapse all files

core/include/Data/DataSeriesMergeHelper.h created 644 +132 0

@@ -0,0 +1,132
	1	#ifndef SCIQLOP_DATASERIESMERGEHELPER_H
	2	#define SCIQLOP_DATASERIESMERGEHELPER_H
	3
	4	template <int Dim>
	5	class DataSeries;
	6
	7	namespace detail {
	8
	9	/**
	10	* Scope that can be used for a merge operation
	11	* @tparam FEnd the type of function that will be executed at the end of the scope
	12	*/
	13	template <typename FEnd>
	14	struct MergeScope {
	15	explicit MergeScope(FEnd end) : m_End{end} {}
	16	virtual ~MergeScope() noexcept { m_End(); }
	17	FEnd m_End;
	18	};
	19
	20	/**
	21	* Creates a scope for merge operation
	22	* @tparam end the function executed at the end of the scope
	23	*/
	24	template <typename FEnd>
	25	MergeScope<FEnd> scope(FEnd end)
	26	{
	27	return MergeScope<FEnd>{end};
	28	}
	29
	30	/**
	31	* Enum used to position a data series relative to another during a merge operation
	32	*/
	33	enum class MergePosition { LOWER_THAN, GREATER_THAN, EQUAL, OVERLAP };
	34
	35	/**
	36	* Computes the position of the first data series relative to the second data series
	37	* @param lhs the first data series
	38	* @param rhs the second data series
	39	* @return the merge position computed
	40	* @remarks the data series must not be empty
	41	*/
	42	template <int Dim>
	43	MergePosition mergePosition(DataSeries<Dim> &lhs, DataSeries<Dim> &rhs)
	44	{
	45	Q_ASSERT(!lhs.isEmpty() && !rhs.isEmpty());
	46
	47	// Case lhs < rhs
	48	auto lhsLast = --lhs.cend();
	49	auto rhsFirst = rhs.cbegin();
	50	if (lhsLast->x() < rhsFirst->x()) {
	51	return MergePosition::LOWER_THAN;
	52	}
	53
	54	// Case lhs > rhs
	55	auto lhsFirst = lhs.cbegin();
	56	auto rhsLast = --rhs.cend();
	57	if (lhsFirst->x() > rhsLast->x()) {
	58	return MergePosition::GREATER_THAN;
	59	}
	60
	61	// Other cases
	62	auto equal = std::equal(lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend(),
	63	[](const auto &it1, const auto &it2) {
	64	return it1.x() == it2.x() && it1.values() == it2.values();
	65	});
	66	return equal ? MergePosition::EQUAL : MergePosition::OVERLAP;
	67	}
	68
	69	} // namespace detail
	70
	71
	72	/// Helper used to merge two DataSeries
	73	/// @sa DataSeries
	74	struct DataSeriesMergeHelper {
	75	/// Merges the source data series into the dest data series. Data of the source data series are
	76	/// consumed
	77	template <int Dim>
	78	static void merge(DataSeries<Dim> &source, DataSeries<Dim> &dest)
	79	{
	80	// Creates a scope to clear source data series at the end of the merge
	81	auto _ = detail::scope([&source]() { source.clear(); });
	82
	83	// Case : source data series is empty -> no merge is made
	84	if (source.isEmpty()) {
	85	return;
	86	}
	87
	88	// Case : dest data series is empty -> we simply swap the data
	89	if (dest.isEmpty()) {
	90	std::swap(dest.m_XAxisData, source.m_XAxisData);
	91	std::swap(dest.m_ValuesData, source.m_ValuesData);
	92	return;
	93	}
	94
	95	// Gets the position of the source in relation to the destination
	96	auto sourcePosition = detail::mergePosition(source, dest);
	97
	98	switch (sourcePosition) {
	99	case detail::MergePosition::LOWER_THAN:
	100	case detail::MergePosition::GREATER_THAN: {
	101	auto prepend = sourcePosition == detail::MergePosition::LOWER_THAN;
	102	dest.m_XAxisData->add(*source.m_XAxisData, prepend);
	103	dest.m_ValuesData->add(*source.m_ValuesData, prepend);
	104	break;
	105	}
	106	case detail::MergePosition::EQUAL:
	107	// the data series equal each other : no merge made
	108	break;
	109	case detail::MergePosition::OVERLAP: {
	110	// the two data series overlap : merge is made
	111	auto temp = dest.clone();
	112	if (auto tempSeries = dynamic_cast<DataSeries<Dim> *>(temp.get())) {
	113	// Makes the merge :
	114	// - Data are sorted by x-axis values
	115	// - If two entries are in the source range and the other range, only one entry
	116	// is retained as result
	117	// - The results are stored directly in the data series
	118	dest.clear();
	119	std::set_union(
	120	tempSeries->cbegin(), tempSeries->cend(), source.cbegin(), source.cend(),
	121	std::back_inserter(dest),
	122	[](const auto &it1, const auto &it2) { return it1.x() < it2.x(); });
	123	}
	124	break;
	125	}
	126	default:
	127	Q_ASSERT(false);
	128	}
	129	}
	130	};
	131
	132	#endif // SCIQLOP_DATASERIESMERGEHELPER_H

core/include/Data/ArrayData.h +14 -3

             #ifndef SCIQLOP_ARRAYDATA_H
             #define SCIQLOP_ARRAYDATA_H
             #include "Data/ArrayDataIterator.h"
             #include <Common/SortUtils.h>
             #include <QReadLocker>
             #include <QReadWriteLock>
             #include <QVector>
             #include <memory>
             template <int Dim>
             class ArrayData;
             using DataContainer = QVector<double>;
             namespace arraydata_detail {
             /// Struct used to sort ArrayData
             template <int Dim>
             struct Sort {
                 static std::shared_ptr<ArrayData<Dim> > sort(const DataContainer &data, int nbComponents,
                                                              const std::vector<int> &sortPermutation)
                 {
                     return std::make_shared<ArrayData<Dim> >(
                         SortUtils::sort(data, nbComponents, sortPermutation), nbComponents);
                 }
             };
             /// Specialization for uni-dimensional ArrayData
             template <>
             struct Sort<1> {
                 static std::shared_ptr<ArrayData<1> > sort(const DataContainer &data, int nbComponents,
                                                            const std::vector<int> &sortPermutation)
                 {
                     Q_UNUSED(nbComponents)
                     return std::make_shared<ArrayData<1> >(SortUtils::sort(data, 1, sortPermutation));
                 }
             };
             template <int Dim>
             class IteratorValue : public ArrayDataIteratorValue::Impl {
             public:
                 explicit IteratorValue(const DataContainer &container, int nbComponents, bool begin)
                         : m_It{begin ? container.cbegin() : container.cend()}, m_NbComponents{nbComponents}
                 {
                 }
                 IteratorValue(const IteratorValue &other) = default;
                 std::unique_ptr<ArrayDataIteratorValue::Impl> clone() const override
                 {
                     return std::make_unique<IteratorValue<Dim> >(*this);
                 }
                 bool equals(const ArrayDataIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::tie(m_It, m_NbComponents) == std::tie(otherImpl.m_It, otherImpl.m_NbComponents);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 void next() override { std::advance(m_It, m_NbComponents); }
                 void prev() override { std::advance(m_It, -m_NbComponents); }
                 double at(int componentIndex) const override { return *(m_It + componentIndex); }
                 double first() const override { return *m_It; }
                 double min() const override
                 {
                     auto values = this->values();
                     auto end = values.cend();
                     auto it = std::min_element(values.cbegin(), end, [](const auto &v1, const auto &v2) {
                         return SortUtils::minCompareWithNaN(v1, v2);
                     });
                     return it != end ? *it : std::numeric_limits<double>::quiet_NaN();
                 }
                 double max() const override
                 {
                     auto values = this->values();
                     auto end = values.cend();
                     auto it = std::max_element(values.cbegin(), end, [](const auto &v1, const auto &v2) {
                         return SortUtils::maxCompareWithNaN(v1, v2);
                     });
                     return it != end ? *it : std::numeric_limits<double>::quiet_NaN();
                 }
-            private:
+                QVector<double> values() const override
-                std::vector<double> values() const
                 {
-                    auto result = std::vector<double>{};
+                    auto result = QVector<double>{};
                     for (auto i = 0; i < m_NbComponents; ++i) {
                         result.push_back(*(m_It + i));
                     }
                     return result;
                 }
+            private:
                 DataContainer::const_iterator m_It;
                 int m_NbComponents;
             };
             } // namespace arraydata_detail
             /**
              * @brief The ArrayData class represents a dataset for a data series.
              *
              * A dataset can be unidimensional or two-dimensional. This property is determined by the Dim
              * template-parameter. In a case of a two-dimensional dataset, each dataset component has the same
              * number of values
              *
              * @tparam Dim the dimension of the ArrayData (one or two)
              * @sa IDataSeries
              */
             template <int Dim>
             class ArrayData {
             public:
                 // ///// //
                 // Ctors //
                 // ///// //
                 /**
                  * Ctor for a unidimensional ArrayData
                  * @param data the data the ArrayData will hold
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 1> >
                 explicit ArrayData(DataContainer data) : m_Data{std::move(data)}, m_NbComponents{1}
                 {
                 }
                 /**
                  * Ctor for a two-dimensional ArrayData. The number of components (number of lines) must be
                  * greater than 2 and must be a divisor of the total number of data in the vector
                  * @param data the data the ArrayData will hold
                  * @param nbComponents the number of components
                  * @throws std::invalid_argument if the number of components is less than 2 or is not a divisor
                  * of the size of the data
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 2> >
                 explicit ArrayData(DataContainer data, int nbComponents)
                         : m_Data{std::move(data)}, m_NbComponents{nbComponents}
                 {
                     if (nbComponents < 2) {
                         throw std::invalid_argument{
                             QString{"A multidimensional ArrayData must have at least 2 components (found: %1)"}
                                 .arg(nbComponents)
                                 .toStdString()};
                     }
                     if (m_Data.size() % m_NbComponents != 0) {
                         throw std::invalid_argument{QString{
                             "The number of components (%1) is inconsistent with the total number of data (%2)"}
                                                         .arg(m_Data.size(), nbComponents)
                                                         .toStdString()};
                     }
                 }
                 /// Copy ctor
                 explicit ArrayData(const ArrayData &other)
                 {
                     QReadLocker otherLocker{&other.m_Lock};
                     m_Data = other.m_Data;
                     m_NbComponents = other.m_NbComponents;
                 }
                 // /////////////// //
                 // General methods //
                 // /////////////// //
                 /**
                  * Merges into the array data an other array data. The two array datas must have the same number
                  * of components so the merge can be done
                  * @param other the array data to merge with
                  * @param prepend if true, the other array data is inserted at the beginning, otherwise it is
                  * inserted at the end
                  */
                 void add(const ArrayData<Dim> &other, bool prepend = false)
                 {
                     QWriteLocker locker{&m_Lock};
                     QReadLocker otherLocker{&other.m_Lock};
                     if (m_NbComponents != other.componentCount()) {
                         return;
                     }
                     if (prepend) {
                         auto otherDataSize = other.m_Data.size();
                         m_Data.insert(m_Data.begin(), otherDataSize, 0.);
                         for (auto i = 0; i < otherDataSize; ++i) {
                             m_Data.replace(i, other.m_Data.at(i));
                         }
                     }
                     else {
                         m_Data.append(other.m_Data);
                     }
                 }
                 void clear()
                 {
                     QWriteLocker locker{&m_Lock};
                     m_Data.clear();
                 }
                 int componentCount() const noexcept { return m_NbComponents; }
                 /// @return the size (i.e. number of values) of a single component
                 /// @remarks in a case of a two-dimensional ArrayData, each component has the same size
                 int size() const
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data.size() / m_NbComponents;
                 }
                 std::shared_ptr<ArrayData<Dim> > sort(const std::vector<int> &sortPermutation)
                 {
                     QReadLocker locker{&m_Lock};
                     return arraydata_detail::Sort<Dim>::sort(m_Data, m_NbComponents, sortPermutation);
                 }
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 ArrayDataIterator cbegin() const
                 {
                     return ArrayDataIterator{ArrayDataIteratorValue{
                         std::make_unique<arraydata_detail::IteratorValue<Dim> >(m_Data, m_NbComponents, true)}};
                 }
                 ArrayDataIterator cend() const
                 {
                     return ArrayDataIterator{
                         ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim> >(
                             m_Data, m_NbComponents, false)}};
                 }
+                /// Inserts at the end of the array data the values passed as a parameter. This
+                /// method is intended to be used in the context of generating a back insert iterator, or only
+                /// if it's ensured that the total size of the vector is consistent with the number of
+                /// components of the array data
+                /// @param values the values to insert
+                /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
+                void push_back(const QVector<double> &values)
+                {
+                    Q_ASSERT(values.size() % m_NbComponents == 0);
+                    m_Data.append(values);
+                }
                 /**
                  * @return the data at a specified index
                  * @remarks index must be a valid position
                  */
                 double at(int index) const noexcept
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data.at(index);
                 }
                 // ///////////// //
                 // 1-dim methods //
                 // ///////////// //
                 /**
                  * @return the data as a vector, as a const reference
                  * @remarks this method is only available for a unidimensional ArrayData
                  */
                 template <int D = Dim, typename = std::enable_if_t<D == 1> >
                 const QVector<double> &cdata() const noexcept
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data;
                 }
             private:
                 DataContainer m_Data;
                 /// Number of components (lines). Is always 1 in a 1-dim ArrayData
                 int m_NbComponents;
                 mutable QReadWriteLock m_Lock;
             };
             #endif // SCIQLOP_ARRAYDATA_H

core/include/Data/ArrayDataIterator.h +4 0

             #ifndef SCIQLOP_ARRAYDATAITERATOR_H
             #define SCIQLOP_ARRAYDATAITERATOR_H
             #include "CoreGlobal.h"
             #include "Data/SqpIterator.h"
+            #include <QVector>
             #include <memory>
             /**
              * @brief The ArrayDataIteratorValue class represents the current value of an array data iterator.
              * It offers standard access methods for the data in the series (at(), first()), but it is up to
              * each array data to define its own implementation of how to retrieve this data (one-dim or two-dim
              * array), by implementing the ArrayDataIteratorValue::Impl interface
              * @sa ArrayDataIterator
              */
             class SCIQLOP_CORE_EXPORT ArrayDataIteratorValue {
             public:
                 struct Impl {
                     virtual ~Impl() noexcept = default;
                     virtual std::unique_ptr<Impl> clone() const = 0;
                     virtual bool equals(const Impl &other) const = 0;
                     virtual void next() = 0;
                     virtual void prev() = 0;
                     virtual double at(int componentIndex) const = 0;
                     virtual double first() const = 0;
                     virtual double min() const = 0;
                     virtual double max() const = 0;
+                    virtual QVector<double> values() const = 0;
                 };
                 explicit ArrayDataIteratorValue(std::unique_ptr<Impl> impl);
                 ArrayDataIteratorValue(const ArrayDataIteratorValue &other);
                 ArrayDataIteratorValue(ArrayDataIteratorValue &&other) = default;
                 ArrayDataIteratorValue &operator=(ArrayDataIteratorValue other);
                 bool equals(const ArrayDataIteratorValue &other) const;
                 /// Advances to the next value
                 void next();
                 /// Moves back to the previous value
                 void prev();
                 /// Gets value of a specified component
                 double at(int componentIndex) const;
                 /// Gets value of first component
                 double first() const;
                 /// Gets min value among all components
                 double min() const;
                 /// Gets max value among all components
                 double max() const;
+                /// Gets all values
+                QVector<double> values() const;
             private:
                 std::unique_ptr<Impl> m_Impl;
             };
             using ArrayDataIterator = SqpIterator<ArrayDataIteratorValue>;
             #endif // SCIQLOP_ARRAYDATAITERATOR_H

core/include/Data/DataSeries.h +27 -43

             #ifndef SCIQLOP_DATASERIES_H
             #define SCIQLOP_DATASERIES_H
             #include "CoreGlobal.h"
             #include <Common/SortUtils.h>
             #include <Data/ArrayData.h>
+            #include <Data/DataSeriesMergeHelper.h>
             #include <Data/IDataSeries.h>
             #include <QLoggingCategory>
             #include <QReadLocker>
             #include <QReadWriteLock>
             #include <memory>
             // We don't use the Qt macro since the log is used in the header file, which causes multiple log
             // definitions with inheritance. Inline method is used instead
             inline const QLoggingCategory &LOG_DataSeries()
             {
                 static const QLoggingCategory category{"DataSeries"};
                 return category;
             }
             template <int Dim>
             class DataSeries;
             namespace dataseries_detail {
             template <int Dim>
             class IteratorValue : public DataSeriesIteratorValue::Impl {
             public:
                 explicit IteratorValue(const DataSeries<Dim> &dataSeries, bool begin)
                         : m_XIt(begin ? dataSeries.xAxisData()->cbegin() : dataSeries.xAxisData()->cend()),
                           m_ValuesIt(begin ? dataSeries.valuesData()->cbegin()
                                            : dataSeries.valuesData()->cend())
                 {
                 }
                 IteratorValue(const IteratorValue &other) = default;
                 std::unique_ptr<DataSeriesIteratorValue::Impl> clone() const override
                 {
                     return std::make_unique<IteratorValue<Dim> >(*this);
                 }
                 bool equals(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::tie(m_XIt, m_ValuesIt) == std::tie(otherImpl.m_XIt, otherImpl.m_ValuesIt);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 void next() override
                 {
                     ++m_XIt;
                     ++m_ValuesIt;
                 }
                 void prev() override
                 {
                     --m_XIt;
                     --m_ValuesIt;
                 }
                 double x() const override { return m_XIt->at(0); }
                 double value() const override { return m_ValuesIt->at(0); }
                 double value(int componentIndex) const override { return m_ValuesIt->at(componentIndex); }
                 double minValue() const override { return m_ValuesIt->min(); }
                 double maxValue() const override { return m_ValuesIt->max(); }
+                QVector<double> values() const override { return m_ValuesIt->values(); }
             private:
                 ArrayDataIterator m_XIt;
                 ArrayDataIterator m_ValuesIt;
             };
             } // namespace dataseries_detail
             /**
              * @brief The DataSeries class is the base (abstract) implementation of IDataSeries.
              *
              * It proposes to set a dimension for the values data.
              *
              * A DataSeries is always sorted on its x-axis data.
              *
              * @tparam Dim The dimension of the values data
              *
              */
             template <int Dim>
             class SCIQLOP_CORE_EXPORT DataSeries : public IDataSeries {
+                friend class DataSeriesMergeHelper;
             public:
+                /// Tag needed to define the push_back() method
+                /// @sa push_back()
+                using value_type = DataSeriesIteratorValue;
                 /// @sa IDataSeries::xAxisData()
                 std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; }
                 const std::shared_ptr<ArrayData<1> > xAxisData() const { return m_XAxisData; }
                 /// @sa IDataSeries::xAxisUnit()
                 Unit xAxisUnit() const override { return m_XAxisUnit; }
                 /// @return the values dataset
                 std::shared_ptr<ArrayData<Dim> > valuesData() { return m_ValuesData; }
                 const std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; }
                 /// @sa IDataSeries::valuesUnit()
                 Unit valuesUnit() const override { return m_ValuesUnit; }
                 SqpRange range() const override
                 {
                     if (!m_XAxisData->cdata().isEmpty()) {
                         return SqpRange{m_XAxisData->cdata().first(), m_XAxisData->cdata().last()};
                     }
                     return SqpRange{};
                 }
                 void clear()
                 {
                     m_XAxisData->clear();
                     m_ValuesData->clear();
                 }
+                bool isEmpty() const noexcept { return m_XAxisData->size() == 0; }
                 /// Merges into the data series an other data series
                 /// @remarks the data series to merge with is cleared after the operation
                 void merge(IDataSeries *dataSeries) override
                 {
                     dataSeries->lockWrite();
                     lockWrite();
                     if (auto other = dynamic_cast<DataSeries<Dim> *>(dataSeries)) {
-                        const auto &otherXAxisData = other->xAxisData()->cdata();
+                        DataSeriesMergeHelper::merge(*other, *this);
-                        const auto &xAxisData = m_XAxisData->cdata();
-                        // As data series are sorted, we can improve performances of merge, by call the sort
-                        // method only if the two data series overlap.
-                        if (!otherXAxisData.empty()) {
-                            auto firstValue = otherXAxisData.front();
-                            auto lastValue = otherXAxisData.back();
-                            auto xAxisDataBegin = xAxisData.cbegin();
-                            auto xAxisDataEnd = xAxisData.cend();
-                            bool prepend;
-                            bool sortNeeded;
-                            if (std::lower_bound(xAxisDataBegin, xAxisDataEnd, firstValue) == xAxisDataEnd) {
-                                // Other data series if after data series
-                                prepend = false;
-                                sortNeeded = false;
-                            else if (std::upper_bound(xAxisDataBegin, xAxisDataEnd, lastValue)
-                                     == xAxisDataBegin) {
-                                // Other data series if before data series
-                                prepend = true;
-                                sortNeeded = false;
-                            else {
-                                // The two data series overlap
-                                prepend = false;
-                                sortNeeded = true;
-                            // Makes the merge
-                            m_XAxisData->add(*other->xAxisData(), prepend);
-                            m_ValuesData->add(*other->valuesData(), prepend);
-                            if (sortNeeded) {
-                                sort();
-                        // Clears the other data series
-                        other->clear();
                     }
                     else {
                         qCWarning(LOG_DataSeries())
                             << QObject::tr("Detection of a type of IDataSeries we cannot merge with !");
                     }
                     unlock();
                     dataSeries->unlock();
                 }
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 DataSeriesIterator cbegin() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, true)}};
                 }
                 DataSeriesIterator cend() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, false)}};
                 }
                 /// @sa IDataSeries::minXAxisData()
                 DataSeriesIterator minXAxisData(double minXAxisData) const override
                 {
                     return std::lower_bound(
                         cbegin(), cend(), minXAxisData,
                         [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                 }
                 /// @sa IDataSeries::maxXAxisData()
                 DataSeriesIterator maxXAxisData(double maxXAxisData) const override
                 {
                     // Gets the first element that greater than max value
                     auto it = std::upper_bound(
                         cbegin(), cend(), maxXAxisData,
                         [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                     return it == cbegin() ? cend() : --it;
                 }
                 std::pair<DataSeriesIterator, DataSeriesIterator> xAxisRange(double minXAxisData,
                                                                              double maxXAxisData) const override
                 {
                     if (minXAxisData > maxXAxisData) {
                         std::swap(minXAxisData, maxXAxisData);
                     }
                     auto begin = cbegin();
                     auto end = cend();
                     auto lowerIt = std::lower_bound(
                         begin, end, minXAxisData,
                         [](const auto &itValue, const auto &value) { return itValue.x() < value; });
                     auto upperIt = std::upper_bound(
                         begin, end, maxXAxisData,
                         [](const auto &value, const auto &itValue) { return value < itValue.x(); });
                     return std::make_pair(lowerIt, upperIt);
                 }
                 std::pair<DataSeriesIterator, DataSeriesIterator>
                 valuesBounds(double minXAxisData, double maxXAxisData) const override
                 {
                     // Places iterators to the correct x-axis range
                     auto xAxisRangeIts = xAxisRange(minXAxisData, maxXAxisData);
                     // Returns end iterators if the range is empty
                     if (xAxisRangeIts.first == xAxisRangeIts.second) {
                         return std::make_pair(cend(), cend());
                     }
                     // Gets the iterator on the min of all values data
                     auto minIt = std::min_element(
                         xAxisRangeIts.first, xAxisRangeIts.second, [](const auto &it1, const auto &it2) {
                             return SortUtils::minCompareWithNaN(it1.minValue(), it2.minValue());
                         });
                     // Gets the iterator on the max of all values data
                     auto maxIt = std::max_element(
                         xAxisRangeIts.first, xAxisRangeIts.second, [](const auto &it1, const auto &it2) {
                             return SortUtils::maxCompareWithNaN(it1.maxValue(), it2.maxValue());
                         });
                     return std::make_pair(minIt, maxIt);
                 }
                 // /////// //
                 // Mutexes //
                 // /////// //
                 virtual void lockRead() { m_Lock.lockForRead(); }
                 virtual void lockWrite() { m_Lock.lockForWrite(); }
                 virtual void unlock() { m_Lock.unlock(); }
+                // ///// //
+                // Other //
+                // ///// //
+                /// Inserts at the end of the data series the value of the iterator passed as a parameter. This
+                /// method is intended to be used in the context of generating a back insert iterator
+                /// @param iteratorValue the iterator value containing the values to insert
+                /// @sa http://en.cppreference.com/w/cpp/iterator/back_inserter
+                /// @sa merge()
+                /// @sa value_type
+                void push_back(const value_type &iteratorValue)
+                {
+                    m_XAxisData->push_back(QVector<double>{iteratorValue.x()});
+                    m_ValuesData->push_back(iteratorValue.values());
+                }
             protected:
                 /// Protected ctor (DataSeries is abstract). The vectors must have the same size, otherwise a
                 /// DataSeries with no values will be created.
                 /// @remarks data series is automatically sorted on its x-axis data
                 explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, const Unit &xAxisUnit,
                                     std::shared_ptr<ArrayData<Dim> > valuesData, const Unit &valuesUnit)
                         : m_XAxisData{xAxisData},
                           m_XAxisUnit{xAxisUnit},
                           m_ValuesData{valuesData},
                           m_ValuesUnit{valuesUnit}
                 {
                     if (m_XAxisData->size() != m_ValuesData->size()) {
                         clear();
                     }
                     // Sorts data if it's not the case
                     const auto &xAxisCData = m_XAxisData->cdata();
                     if (!std::is_sorted(xAxisCData.cbegin(), xAxisCData.cend())) {
                         sort();
                     }
                 }
                 /// Copy ctor
                 explicit DataSeries(const DataSeries<Dim> &other)
                         : m_XAxisData{std::make_shared<ArrayData<1> >(*other.m_XAxisData)},
                           m_XAxisUnit{other.m_XAxisUnit},
                           m_ValuesData{std::make_shared<ArrayData<Dim> >(*other.m_ValuesData)},
                           m_ValuesUnit{other.m_ValuesUnit}
                 {
                     // Since a series is ordered from its construction and is always ordered, it is not
                     // necessary to call the sort method here ('other' is sorted)
                 }
                 /// Assignment operator
                 template <int D>
                 DataSeries &operator=(DataSeries<D> other)
                 {
                     std::swap(m_XAxisData, other.m_XAxisData);
                     std::swap(m_XAxisUnit, other.m_XAxisUnit);
                     std::swap(m_ValuesData, other.m_ValuesData);
                     std::swap(m_ValuesUnit, other.m_ValuesUnit);
                     return *this;
                 }
             private:
                 /**
                  * Sorts data series on its x-axis data
                  */
                 void sort() noexcept
                 {
                     auto permutation = SortUtils::sortPermutation(*m_XAxisData, std::less<double>());
                     m_XAxisData = m_XAxisData->sort(permutation);
                     m_ValuesData = m_ValuesData->sort(permutation);
                 }
                 std::shared_ptr<ArrayData<1> > m_XAxisData;
                 Unit m_XAxisUnit;
                 std::shared_ptr<ArrayData<Dim> > m_ValuesData;
                 Unit m_ValuesUnit;
                 QReadWriteLock m_Lock;
             };
             #endif // SCIQLOP_DATASERIES_H

core/include/Data/DataSeriesIterator.h +4 0

             #ifndef SCIQLOP_DATASERIESITERATOR_H
             #define SCIQLOP_DATASERIESITERATOR_H
             #include "CoreGlobal.h"
             #include "Data/SqpIterator.h"
+            #include <QVector>
             #include <memory>
             /**
              * @brief The DataSeriesIteratorValue class represents the current value of a data series iterator.
              * It offers standard access methods for the data in the series (x-axis, values), but it is up to
              * each series to define its own implementation of how to retrieve this data, by implementing the
              * DataSeriesIteratorValue::Impl interface
              *
              * @sa DataSeriesIterator
              */
             class SCIQLOP_CORE_EXPORT DataSeriesIteratorValue {
             public:
                 struct Impl {
                     virtual ~Impl() noexcept = default;
                     virtual std::unique_ptr<Impl> clone() const = 0;
                     virtual bool equals(const Impl &other) const = 0;
                     virtual void next() = 0;
                     virtual void prev() = 0;
                     virtual double x() const = 0;
                     virtual double value() const = 0;
                     virtual double value(int componentIndex) const = 0;
                     virtual double minValue() const = 0;
                     virtual double maxValue() const = 0;
+                    virtual QVector<double> values() const = 0;
                 };
                 explicit DataSeriesIteratorValue(std::unique_ptr<Impl> impl);
                 DataSeriesIteratorValue(const DataSeriesIteratorValue &other);
                 DataSeriesIteratorValue(DataSeriesIteratorValue &&other) = default;
                 DataSeriesIteratorValue &operator=(DataSeriesIteratorValue other);
                 bool equals(const DataSeriesIteratorValue &other) const;
                 /// Advances to the next value
                 void next();
                 /// Moves back to the previous value
                 void prev();
                 /// Gets x-axis data
                 double x() const;
                 /// Gets value data
                 double value() const;
                 /// Gets value data depending on an index
                 double value(int componentIndex) const;
                 /// Gets min of all values data
                 double minValue() const;
                 /// Gets max of all values data
                 double maxValue() const;
+                /// Gets all values data
+                QVector<double> values() const;
             private:
                 std::unique_ptr<Impl> m_Impl;
             };
             using DataSeriesIterator = SqpIterator<DataSeriesIteratorValue>;
             #endif // SCIQLOP_DATASERIESITERATOR_H

core/src/Data/ArrayDataIterator.cpp +5 0

             #include "Data/ArrayDataIterator.h"
             ArrayDataIteratorValue::ArrayDataIteratorValue(std::unique_ptr<ArrayDataIteratorValue::Impl> impl)
                     : m_Impl{std::move(impl)}
             {
             }
             ArrayDataIteratorValue::ArrayDataIteratorValue(const ArrayDataIteratorValue &other)
                     : m_Impl{other.m_Impl->clone()}
             {
             }
             ArrayDataIteratorValue &ArrayDataIteratorValue::operator=(ArrayDataIteratorValue other)
             {
                 std::swap(m_Impl, other.m_Impl);
                 return *this;
             }
             bool ArrayDataIteratorValue::equals(const ArrayDataIteratorValue &other) const
             {
                 return m_Impl->equals(*other.m_Impl);
             }
             void ArrayDataIteratorValue::next()
             {
                 m_Impl->next();
             }
             void ArrayDataIteratorValue::prev()
             {
                 m_Impl->prev();
             }
             double ArrayDataIteratorValue::at(int componentIndex) const
             {
                 return m_Impl->at(componentIndex);
             }
             double ArrayDataIteratorValue::first() const
             {
                 return m_Impl->first();
             }
             double ArrayDataIteratorValue::min() const
             {
                 return m_Impl->min();
             }
             double ArrayDataIteratorValue::max() const
             {
                 return m_Impl->max();
             }
+            QVector<double> ArrayDataIteratorValue::values() const
+            {
+                return m_Impl->values();
+            }

core/src/Data/DataSeriesIterator.cpp +5 0

             #include "Data/DataSeriesIterator.h"
             DataSeriesIteratorValue::DataSeriesIteratorValue(
                 std::unique_ptr<DataSeriesIteratorValue::Impl> impl)
                     : m_Impl{std::move(impl)}
             {
             }
             DataSeriesIteratorValue::DataSeriesIteratorValue(const DataSeriesIteratorValue &other)
                     : m_Impl{other.m_Impl->clone()}
             {
             }
             DataSeriesIteratorValue &DataSeriesIteratorValue::operator=(DataSeriesIteratorValue other)
             {
                 std::swap(m_Impl, other.m_Impl);
                 return *this;
             }
             bool DataSeriesIteratorValue::equals(const DataSeriesIteratorValue &other) const
             {
                 return m_Impl->equals(*other.m_Impl);
             }
             void DataSeriesIteratorValue::next()
             {
                 m_Impl->next();
             }
             void DataSeriesIteratorValue::prev()
             {
                 m_Impl->prev();
             }
             double DataSeriesIteratorValue::x() const
             {
                 return m_Impl->x();
             }
             double DataSeriesIteratorValue::value() const
             {
                 return m_Impl->value();
             }
             double DataSeriesIteratorValue::value(int componentIndex) const
             {
                 return m_Impl->value(componentIndex);
             }
             double DataSeriesIteratorValue::minValue() const
             {
                 return m_Impl->minValue();
             }
             double DataSeriesIteratorValue::maxValue() const
             {
                 return m_Impl->maxValue();
             }
+            QVector<double> DataSeriesIteratorValue::values() const
+            {
+                return m_Impl->values();
+            }

core/vera-exclusions/exclusions.txt +6 0

             # On ignore toutes les règles vera++ pour le fichier spimpl
             Common/spimpl\.h:\d+:.*
             # Ignore false positive relative to two class definitions in a same file
             ArrayData\.h:\d+:.*IPSIS_S01.*
             ArrayDataIterator\.h:\d+:.*IPSIS_S01.*
             DataSourceItem\.h:\d+:.*IPSIS_S01.*
             DataSeries\.h:\d+:.*IPSIS_S01.*
             DataSeriesIterator\.h:\d+:.*IPSIS_S01.*
+            DataSeriesMergeHelper\.h:\d+:.*IPSIS_S01.*
             # Ignore false positive relative to a template class
+            ArrayData\.h:\d+:.*IPSIS_S04_METHOD.*found: push_back
             ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (D)
             ArrayData\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (arraydata_detail)
             ArrayData\.h:\d+:.*IPSIS_S06.*found: (D)
             ArrayData\.h:\d+:.*IPSIS_S06.*found: (Dim)
             DataSeries\.h:\d+:.*IPSIS_S04_METHOD.*found: LOG_DataSeries
+            DataSeries\.h:\d+:.*IPSIS_S04_METHOD.*found: push_back
             DataSeries\.h:\d+:.*IPSIS_S04_VARIABLE.*
             DataSeries\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (dataseries_detail)
+            DataSeries\.h:\d+:.*IPSIS_S05.*
+            DataSeries\.h:\d+:.*IPSIS_S06.*found: (value_type)
+            DataSeries\.h:\d+:.*IPSIS_S06.*found: (DataSeriesIteratorValue)
             # Ignore false positive relative to iterators
             SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag)
             SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (T)
             SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t)
             SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (T)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (pointer)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (reference)
             SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
             # Ignore false positive relative to an alias
             DataSourceItemAction\.h:\d+:.*IPSIS_S06.*found: (ExecuteFunction)
             # Ignore false positive relative to unnamed namespace
             VariableController\.cpp:\d+:.*IPSIS_F13.*

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages