HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r681:56bbb54b69b6

Merge pull request from SCIQLOP-Initialisation develop...

leroux -

r681:56bbb54b69b6

parent child

Context file:

r681:56bbb54b69b6

Collapse all files

core/include/Data/ArrayData.h +76 -5

             #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, bool IsConst>
+            class IteratorValue;
+            template <int Dim, bool IsConst>
+            struct IteratorValueBuilder {
+            };
+            template <int Dim>
+            struct IteratorValueBuilder<Dim, true> {
+                using DataContainerIterator = DataContainer::const_iterator;
+                static void swap(IteratorValue<Dim, true> &o1, IteratorValue<Dim, true> &o2) {}
+            };
             template <int Dim>
+            struct IteratorValueBuilder<Dim, false> {
+                using DataContainerIterator = DataContainer::iterator;
+                static void swap(IteratorValue<Dim, false> &o1, IteratorValue<Dim, false> &o2)
+                {
+                    for (auto i = 0; i < o1.m_NbComponents; ++i) {
+                        std::iter_swap(o1.m_It + i, o2.m_It + i);
+                    }
+                }
+            };
+            template <int Dim, bool IsConst>
             class IteratorValue : public ArrayDataIteratorValue::Impl {
             public:
+                friend class ArrayData<Dim>;
+                friend class IteratorValueBuilder<Dim, IsConst>;
+                using DataContainerIterator =
+                    typename IteratorValueBuilder<Dim, IsConst>::DataContainerIterator;
+                template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
                 explicit IteratorValue(const DataContainer &container, int nbComponents, bool begin)
                         : m_It{begin ? container.cbegin() : container.cend()}, m_NbComponents{nbComponents}
                 {
                 }
+                template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
+                explicit IteratorValue(DataContainer &container, int nbComponents, bool begin)
+                        : m_It{begin ? container.begin() : container.end()}, m_NbComponents{nbComponents}
+                {
+                }
                 IteratorValue(const IteratorValue &other) = default;
                 std::unique_ptr<ArrayDataIteratorValue::Impl> clone() const override
                 {
-                    return std::make_unique<IteratorValue<Dim> >(*this);
+                    return std::make_unique<IteratorValue<Dim, IsConst> >(*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();
                 }
                 QVector<double> values() const override
                 {
                     auto result = QVector<double>{};
                     for (auto i = 0; i < m_NbComponents; ++i) {
                         result.push_back(*(m_It + i));
                     }
                     return result;
                 }
+                void swap(ArrayDataIteratorValue::Impl &other) override
+                {
+                    auto &otherImpl = dynamic_cast<IteratorValue &>(other);
+                    IteratorValueBuilder<Dim, IsConst>::swap(*this, otherImpl);
+                }
             private:
-                DataContainer::const_iterator m_It;
+                DataContainerIterator 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 begin()
+                {
+                    return ArrayDataIterator{
+                        ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, false> >(
+                            m_Data, m_NbComponents, true)}};
+                }
+                ArrayDataIterator end()
+                {
+                    return ArrayDataIterator{
+                        ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, false> >(
+                            m_Data, m_NbComponents, false)}};
+                }
                 ArrayDataIterator cbegin() const
                 {
-                    return ArrayDataIterator{ArrayDataIteratorValue{
+                    return ArrayDataIterator{
-                        std::make_unique<arraydata_detail::IteratorValue<Dim> >(m_Data, m_NbComponents, true)}};
+                        ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, true> >(
+                            m_Data, m_NbComponents, true)}};
                 }
                 ArrayDataIterator cend() const
                 {
                     return ArrayDataIterator{
-                        ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim> >(
+                        ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, true> >(
                             m_Data, m_NbComponents, false)}};
                 }
+                void erase(ArrayDataIterator first, ArrayDataIterator last)
+                {
+                    auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, false> *>(first->impl());
+                    auto lastImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, false> *>(last->impl());
+                    if (firstImpl && lastImpl) {
+                        m_Data.erase(firstImpl->m_It, lastImpl->m_It);
+                    }
+                }
                 /// 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 +9 -1

             #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;
+                    virtual void swap(Impl &other) = 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;
+                Impl *impl();
+                friend void swap(ArrayDataIteratorValue &lhs, ArrayDataIteratorValue &rhs)
+                {
+                    std::swap(lhs.m_Impl, rhs.m_Impl);
+                }
             private:
                 std::unique_ptr<Impl> m_Impl;
             };
             using ArrayDataIterator = SqpIterator<ArrayDataIteratorValue>;
             #endif // SCIQLOP_ARRAYDATAITERATOR_H

core/include/Data/DataSeries.h +61 -4

             #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>
+            template <int Dim, bool IsConst>
             class IteratorValue : public DataSeriesIteratorValue::Impl {
             public:
+                friend class DataSeries<Dim>;
+                template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
+                explicit IteratorValue(DataSeries<Dim> &dataSeries, bool begin)
+                        : m_XIt(begin ? dataSeries.xAxisData()->begin() : dataSeries.xAxisData()->end()),
+                          m_ValuesIt(begin ? dataSeries.valuesData()->begin() : dataSeries.valuesData()->end())
+                {
+                }
+                template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
                 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);
+                    return std::make_unique<IteratorValue<Dim, IsConst> >(*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(); }
+                void swap(DataSeriesIteratorValue::Impl &other) override
+                {
+                    auto &otherImpl = dynamic_cast<IteratorValue &>(other);
+                    m_XIt->impl()->swap(*otherImpl.m_XIt->impl());
+                    m_ValuesIt->impl()->swap(*otherImpl.m_ValuesIt->impl());
+                }
             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)) {
                         DataSeriesMergeHelper::merge(*other, *this);
                     }
                     else {
                         qCWarning(LOG_DataSeries())
                             << QObject::tr("Detection of a type of IDataSeries we cannot merge with !");
                     }
                     unlock();
                     dataSeries->unlock();
                 }
+                void purge(double min, double max) override
+                {
+                    if (min > max) {
+                        std::swap(min, max);
+                    }
+                    lockWrite();
+                    auto it = std::remove_if(
+                        begin(), end(), [min, max](const auto &it) { return it.x() < min || it.x() > max; });
+                    erase(it, end());
+                    unlock();
+                }
                 // ///////// //
                 // Iterators //
                 // ///////// //
+                DataSeriesIterator begin() override
+                {
+                    return DataSeriesIterator{DataSeriesIteratorValue{
+                        std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, true)}};
+                }
+                DataSeriesIterator end() override
+                {
+                    return DataSeriesIterator{DataSeriesIteratorValue{
+                        std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, false)}};
+                }
                 DataSeriesIterator cbegin() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
-                        std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, true)}};
+                        std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, true)}};
                 }
                 DataSeriesIterator cend() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
-                        std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, false)}};
+                        std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, false)}};
+                }
+                void erase(DataSeriesIterator first, DataSeriesIterator last)
+                {
+                    auto firstImpl
+                        = dynamic_cast<dataseries_detail::IteratorValue<Dim, false> *>(first->impl());
+                    auto lastImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, false> *>(last->impl());
+                    if (firstImpl && lastImpl) {
+                        m_XAxisData->erase(firstImpl->m_XIt, lastImpl->m_XIt);
+                        m_ValuesData->erase(firstImpl->m_ValuesIt, lastImpl->m_ValuesIt);
+                    }
                 }
                 /// @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 +9 -1

             #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;
+                    virtual void swap(Impl &other) = 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;
+                Impl *impl();
+                friend void swap(DataSeriesIteratorValue &lhs, DataSeriesIteratorValue &rhs)
+                {
+                    std::swap(lhs.m_Impl, rhs.m_Impl);
+                }
             private:
                 std::unique_ptr<Impl> m_Impl;
             };
             using DataSeriesIterator = SqpIterator<DataSeriesIteratorValue>;
             #endif // SCIQLOP_DATASERIESITERATOR_H

core/include/Data/IDataSeries.h +5 0

             #ifndef SCIQLOP_IDATASERIES_H
             #define SCIQLOP_IDATASERIES_H
             #include <Common/MetaTypes.h>
             #include <Data/DataSeriesIterator.h>
             #include <Data/SqpRange.h>
             #include <memory>
             #include <QString>
             template <int Dim>
             class ArrayData;
             struct Unit {
                 explicit Unit(const QString &name = {}, bool timeUnit = false)
                         : m_Name{name}, m_TimeUnit{timeUnit}
                 {
                 }
                 inline bool operator==(const Unit &other) const
                 {
                     return std::tie(m_Name, m_TimeUnit) == std::tie(other.m_Name, other.m_TimeUnit);
                 }
                 inline bool operator!=(const Unit &other) const { return !(*this == other); }
                 QString m_Name;  ///< Unit name
                 bool m_TimeUnit; ///< The unit is a unit of time (UTC)
             };
             /**
              * @brief The IDataSeries aims to declare a data series.
              *
              * A data series is an entity that contains at least :
              * - one dataset representing the x-axis
              * - one dataset representing the values
              *
              * Each dataset is represented by an ArrayData, and is associated with a unit.
              *
              * An ArrayData can be unidimensional or two-dimensional, depending on the implementation of the
              * IDataSeries. The x-axis dataset is always unidimensional.
              *
              * @sa ArrayData
              */
             class IDataSeries {
             public:
                 virtual ~IDataSeries() noexcept = default;
                 /// Returns the x-axis dataset
                 virtual std::shared_ptr<ArrayData<1> > xAxisData() = 0;
                 /// Returns the x-axis dataset (as const)
                 virtual const std::shared_ptr<ArrayData<1> > xAxisData() const = 0;
                 virtual Unit xAxisUnit() const = 0;
                 virtual Unit valuesUnit() const = 0;
                 virtual void merge(IDataSeries *dataSeries) = 0;
+                /// Removes from data series all entries whose value on the x-axis is not between min and max
+                virtual void purge(double min, double max) = 0;
                 /// @todo Review the name and signature of this method
                 virtual std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) = 0;
                 virtual std::unique_ptr<IDataSeries> clone() const = 0;
                 virtual SqpRange range() const = 0;
                 // ///////// //
                 // Iterators //
                 // ///////// //
                 virtual DataSeriesIterator cbegin() const = 0;
                 virtual DataSeriesIterator cend() const = 0;
+                virtual DataSeriesIterator begin() = 0;
+                virtual DataSeriesIterator end() = 0;
                 /// @return the iterator to the first entry of the data series whose x-axis data is greater than
                 /// or equal to the value passed in parameter, or the end iterator if there is no matching value
                 virtual DataSeriesIterator minXAxisData(double minXAxisData) const = 0;
                 /// @return the iterator to the last entry of the data series whose x-axis data is less than or
                 /// equal to the value passed in parameter, or the end iterator if there is no matching value
                 virtual DataSeriesIterator maxXAxisData(double maxXAxisData) const = 0;
                 /// @return the iterators pointing to the range of data whose x-axis values are between min and
                 /// max passed in parameters
                 virtual std::pair<DataSeriesIterator, DataSeriesIterator>
                 xAxisRange(double minXAxisData, double maxXAxisData) const = 0;
                 /// @return two iterators pointing to the data that have respectively the min and the max value
                 /// data of a data series' range. The search is performed for a given x-axis range.
                 /// @sa xAxisRange()
                 virtual std::pair<DataSeriesIterator, DataSeriesIterator>
                 valuesBounds(double minXAxisData, double maxXAxisData) const = 0;
                 // /////// //
                 // Mutexes //
                 // /////// //
                 virtual void lockRead() = 0;
                 virtual void lockWrite() = 0;
                 virtual void unlock() = 0;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(IDATASERIES_PTR_REGISTRY, std::shared_ptr<IDataSeries>)
             #endif // SCIQLOP_IDATASERIES_H

core/include/Data/SqpIterator.h +5 -5

             #ifndef SCIQLOP_SQPITERATOR_H
             #define SCIQLOP_SQPITERATOR_H
             #include "CoreGlobal.h"
             /**
              * @brief The SqpIterator class represents an iterator used in SciQlop. It defines all operators
              * needed for a standard forward iterator
              * @tparam T the type of object handled in iterator
              * @sa http://www.cplusplus.com/reference/iterator/
              */
             template <typename T>
             class SCIQLOP_CORE_EXPORT SqpIterator {
             public:
                 using iterator_category = std::forward_iterator_tag;
                 using value_type = const T;
                 using difference_type = std::ptrdiff_t;
                 using pointer = value_type *;
                 using reference = value_type &;
                 explicit SqpIterator(T value) : m_CurrentValue{std::move(value)} {}
                 virtual ~SqpIterator() noexcept = default;
                 SqpIterator(const SqpIterator &) = default;
-                SqpIterator(SqpIterator &&) = default;
+                SqpIterator &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
-                SqpIterator &operator=(const SqpIterator &) = default;
-                SqpIterator &operator=(SqpIterator &&) = default;
                 SqpIterator &operator++()
                 {
                     m_CurrentValue.next();
                     return *this;
                 }
                 SqpIterator &operator--()
                 {
                     m_CurrentValue.prev();
                     return *this;
                 }
-                pointer operator->() const { return &m_CurrentValue; }
+                const T *operator->() const { return &m_CurrentValue; }
-                reference operator*() const { return m_CurrentValue; }
+                const T &operator*() const { return m_CurrentValue; }
+                T *operator->() { return &m_CurrentValue; }
+                T &operator*() { return m_CurrentValue; }
                 bool operator==(const SqpIterator &other) const
                 {
                     return m_CurrentValue.equals(other.m_CurrentValue);
                 }
                 bool operator!=(const SqpIterator &other) const { return !(*this == other); }
             private:
                 T m_CurrentValue;
             };
             #endif // SCIQLOP_SQPITERATOR_H

core/include/Variable/Variable.h 0 -1

             #ifndef SCIQLOP_VARIABLE_H
             #define SCIQLOP_VARIABLE_H
             #include "CoreGlobal.h"
             #include <Data/DataSeriesIterator.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
             class IDataSeries;
             class QString;
             /**
              * @brief The Variable class represents a variable in SciQlop.
              */
             class SCIQLOP_CORE_EXPORT Variable : public QObject {
                 Q_OBJECT
             public:
                 explicit Variable(const QString &name, const SqpRange &dateTime,
                                   const QVariantHash &metadata = {});
                 QString name() const noexcept;
                 SqpRange range() const noexcept;
                 void setRange(const SqpRange &range) noexcept;
                 SqpRange cacheRange() const noexcept;
                 void setCacheRange(const SqpRange &cacheRange) noexcept;
                 /// Returns the real range of the variable, i.e. the min and max x-axis values of the data
                 /// series between the range of the variable. The real range is updated each time the variable
                 /// range or the data series changed
                 /// @return the real range, invalid range if the data series is null or empty
                 /// @sa setDataSeries()
                 /// @sa setRange()
                 SqpRange realRange() const noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 std::shared_ptr<IDataSeries> dataSeries() const noexcept;
                 QVariantHash metadata() const noexcept;
                 bool contains(const SqpRange &range) const noexcept;
                 bool intersect(const SqpRange &range) const noexcept;
                 bool isInside(const SqpRange &range) const noexcept;
                 bool cacheContains(const SqpRange &range) const noexcept;
                 bool cacheIntersect(const SqpRange &range) const noexcept;
                 bool cacheIsInside(const SqpRange &range) const noexcept;
                 QVector<SqpRange> provideNotInCacheRangeList(const SqpRange &range) const noexcept;
                 QVector<SqpRange> provideInCacheRangeList(const SqpRange &range) const noexcept;
-                void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
                 void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
             signals:
                 void updated();
             private:
                 class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>)
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_VECTOR_REGISTRY, QVector<std::shared_ptr<Variable> >)
             #endif // SCIQLOP_VARIABLE_H

core/src/Data/ArrayDataIterator.cpp +6 -1

             #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);
+                m_Impl->swap(*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();
             }
+            ArrayDataIteratorValue::Impl *ArrayDataIteratorValue::impl()
+            {
+                return m_Impl.get();
+            }

core/src/Data/DataSeriesIterator.cpp +6 -1

             #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);
+                m_Impl->swap(*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();
             }
+            DataSeriesIteratorValue::Impl *DataSeriesIteratorValue::impl()
+            {
+                return m_Impl.get();
+            }

core/src/Variable/Variable.cpp +12 -21

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
             #include <Data/SqpRange.h>
             #include <QMutex>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const SqpRange &dateTime,
                                          const QVariantHash &metadata)
                         : m_Name{name},
                           m_Range{dateTime},
                           m_Metadata{metadata},
                           m_DataSeries{nullptr},
                           m_RealRange{INVALID_RANGE}
                 {
                 }
                 void lockRead() { m_Lock.lockForRead(); }
                 void lockWrite() { m_Lock.lockForWrite(); }
                 void unlock() { m_Lock.unlock(); }
+                void purgeDataSeries()
+                {
+                    if (m_DataSeries) {
+                        m_DataSeries->purge(m_CacheRange.m_TStart, m_CacheRange.m_TEnd);
+                    }
+                    updateRealRange();
+                }
                 /// Updates real range according to current variable range and data series
                 void updateRealRange()
                 {
                     if (m_DataSeries) {
                         m_DataSeries->lockRead();
                         auto end = m_DataSeries->cend();
                         auto minXAxisIt = m_DataSeries->minXAxisData(m_Range.m_TStart);
                         auto maxXAxisIt = m_DataSeries->maxXAxisData(m_Range.m_TEnd);
                         m_RealRange = (minXAxisIt != end && maxXAxisIt != end)
                                           ? SqpRange{minXAxisIt->x(), maxXAxisIt->x()}
                                           : INVALID_RANGE;
                         m_DataSeries->unlock();
                     }
                     else {
                         m_RealRange = INVALID_RANGE;
                     }
                 }
                 QString m_Name;
                 SqpRange m_Range;
                 SqpRange m_CacheRange;
                 QVariantHash m_Metadata;
                 std::shared_ptr<IDataSeries> m_DataSeries;
                 SqpRange m_RealRange;
                 QReadWriteLock m_Lock;
             };
             Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
             {
             }
             QString Variable::name() const noexcept
             {
                 impl->lockRead();
                 auto name = impl->m_Name;
                 impl->unlock();
                 return name;
             }
             SqpRange Variable::range() const noexcept
             {
                 impl->lockRead();
                 auto range = impl->m_Range;
                 impl->unlock();
                 return range;
             }
             void Variable::setRange(const SqpRange &range) noexcept
             {
                 impl->lockWrite();
                 impl->m_Range = range;
                 impl->updateRealRange();
                 impl->unlock();
             }
             SqpRange Variable::cacheRange() const noexcept
             {
                 impl->lockRead();
                 auto cacheRange = impl->m_CacheRange;
                 impl->unlock();
                 return cacheRange;
             }
             void Variable::setCacheRange(const SqpRange &cacheRange) noexcept
             {
                 impl->lockWrite();
+                if (cacheRange != impl->m_CacheRange) {
                     impl->m_CacheRange = cacheRange;
+                    impl->purgeDataSeries();
+                }
                 impl->unlock();
             }
             SqpRange Variable::realRange() const noexcept
             {
                 return impl->m_RealRange;
             }
-            void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
-                qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries"
-                                        << QThread::currentThread()->objectName();
-                if (!dataSeries) {
-                    /// @todo ALX : log
-                    return;
-                impl->lockWrite();
-                impl->m_DataSeries = dataSeries->clone();
-                impl->updateRealRange();
-                impl->unlock();
             void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries"
                                         << QThread::currentThread()->objectName();
                 if (!dataSeries) {
                     /// @todo ALX : log
                     return;
                 }
                 // Add or merge the data
-                // Inits the data series of the variable
                 impl->lockWrite();
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = dataSeries->clone();
                 }
                 else {
                     impl->m_DataSeries->merge(dataSeries.get());
                 }
+                impl->purgeDataSeries();
                 impl->unlock();
-                // sub the data
-                auto subData = this->dataSeries()->subDataSeries(this->cacheRange());
-                qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range();
-                this->setDataSeries(subData);
-                qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range();
             }
             std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept
             {
                 impl->lockRead();
                 auto dataSeries = impl->m_DataSeries;
                 impl->unlock();
                 return dataSeries;
             }
             QVariantHash Variable::metadata() const noexcept
             {
                 impl->lockRead();
                 auto metadata = impl->m_Metadata;
                 impl->unlock();
                 return metadata;
             }
             bool Variable::contains(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_Range.contains(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::intersect(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_Range.intersect(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::isInside(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = range.contains(SqpRange{impl->m_Range.m_TStart, impl->m_Range.m_TEnd});
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheContains(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_CacheRange.contains(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheIntersect(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = impl->m_CacheRange.intersect(range);
                 impl->unlock();
                 return res;
             }
             bool Variable::cacheIsInside(const SqpRange &range) const noexcept
             {
                 impl->lockRead();
                 auto res = range.contains(SqpRange{impl->m_CacheRange.m_TStart, impl->m_CacheRange.m_TEnd});
                 impl->unlock();
                 return res;
             }
             QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept
             {
                 // This code assume that cach in contigue. Can return 0, 1 or 2 SqpRange
                 auto notInCache = QVector<SqpRange>{};
                 if (!this->cacheContains(range)) {
                     if (range.m_TEnd <= impl->m_CacheRange.m_TStart
                         || range.m_TStart >= impl->m_CacheRange.m_TEnd) {
                         notInCache << range;
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TStart
                              && range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart};
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TStart
                              && range.m_TEnd > impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart}
                                    << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
                     }
                     else if (range.m_TStart < impl->m_CacheRange.m_TEnd) {
                         notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd};
                     }
                     else {
                         qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
                                                    << QThread::currentThread();
                     }
                 }
                 return notInCache;
             }
             QVector<SqpRange> Variable::provideInCacheRangeList(const SqpRange &range) const noexcept
             {
                 // This code assume that cach in contigue. Can return 0 or 1 SqpRange
                 auto inCache = QVector<SqpRange>{};
                 if (this->intersect(range)) {
                     if (range.m_TStart <= impl->m_CacheRange.m_TStart
                         && range.m_TEnd >= impl->m_CacheRange.m_TStart
                         && range.m_TEnd < impl->m_CacheRange.m_TEnd) {
                         inCache << SqpRange{impl->m_CacheRange.m_TStart, range.m_TEnd};
                     }
                     else if (range.m_TStart >= impl->m_CacheRange.m_TStart
                              && range.m_TEnd <= impl->m_CacheRange.m_TEnd) {
                         inCache << range;
                     }
                     else if (range.m_TStart > impl->m_CacheRange.m_TStart
                              && range.m_TEnd > impl->m_CacheRange.m_TEnd) {
                         inCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TEnd};
                     }
                     else if (range.m_TStart <= impl->m_CacheRange.m_TStart
                              && range.m_TEnd >= impl->m_CacheRange.m_TEnd) {
                         inCache << impl->m_CacheRange;
                     }
                     else {
                         qCCritical(LOG_Variable()) << tr("Detection of unknown case.")
                                                    << QThread::currentThread();
                     }
                 }
                 return inCache;
             }

core/tests/Data/TestDataSeries.cpp +119 0

             #include "Data/DataSeries.h"
             #include "Data/ScalarSeries.h"
             #include "Data/VectorSeries.h"
             #include <cmath>
             #include <QObject>
             #include <QtTest>
             Q_DECLARE_METATYPE(std::shared_ptr<ScalarSeries>)
             Q_DECLARE_METATYPE(std::shared_ptr<VectorSeries>)
             namespace {
             void validateRange(DataSeriesIterator first, DataSeriesIterator last, const QVector<double> &xData,
                                const QVector<double> &valuesData)
             {
                 QVERIFY(std::equal(first, last, xData.cbegin(), xData.cend(),
                                    [](const auto &it, const auto &expectedX) { return it.x() == expectedX; }));
                 QVERIFY(std::equal(
                     first, last, valuesData.cbegin(), valuesData.cend(),
                     [](const auto &it, const auto &expectedVal) { return it.value() == expectedVal; }));
             }
+            void validateRange(DataSeriesIterator first, DataSeriesIterator last, const QVector<double> &xData,
+                               const QVector<QVector<double> > &valuesData)
+            {
+                QVERIFY(std::equal(first, last, xData.cbegin(), xData.cend(),
+                                   [](const auto &it, const auto &expectedX) { return it.x() == expectedX; }));
+                for (auto i = 0; i < valuesData.size(); ++i) {
+                    auto componentData = valuesData.at(i);
+                    QVERIFY(std::equal(
+                        first, last, componentData.cbegin(), componentData.cend(),
+                        [i](const auto &it, const auto &expectedVal) { return it.value(i) == expectedVal; }));
+                }
+            }
             } // namespace
             class TestDataSeries : public QObject {
                 Q_OBJECT
             private:
                 template <typename T>
                 void testValuesBoundsStructure()
                 {
                     // ////////////// //
                     // Test structure //
                     // ////////////// //
                     // Data series to get values bounds
                     QTest::addColumn<std::shared_ptr<T> >("dataSeries");
                     // x-axis range
                     QTest::addColumn<double>("minXAxis");
                     QTest::addColumn<double>("maxXAxis");
                     // Expected results
                     QTest::addColumn<bool>(
                         "expectedOK"); // Test is expected to be ok (i.e. method doesn't return end iterators)
                     QTest::addColumn<double>("expectedMinValue");
                     QTest::addColumn<double>("expectedMaxValue");
                 }
                 template <typename T>
                 void testValuesBounds()
                 {
                     QFETCH(std::shared_ptr<T>, dataSeries);
                     QFETCH(double, minXAxis);
                     QFETCH(double, maxXAxis);
                     QFETCH(bool, expectedOK);
                     QFETCH(double, expectedMinValue);
                     QFETCH(double, expectedMaxValue);
                     auto minMaxIts = dataSeries->valuesBounds(minXAxis, maxXAxis);
                     auto end = dataSeries->cend();
                     // Checks iterators with expected result
                     QCOMPARE(expectedOK, minMaxIts.first != end && minMaxIts.second != end);
                     if (expectedOK) {
                         auto compare = [](const auto &v1, const auto &v2) {
                             return (std::isnan(v1) && std::isnan(v2)) || v1 == v2;
                         };
                         QVERIFY(compare(expectedMinValue, minMaxIts.first->minValue()));
                         QVERIFY(compare(expectedMaxValue, minMaxIts.second->maxValue()));
                     }
                 }
+                template <typename T>
+                void testPurgeStructure()
+                {
+                    // ////////////// //
+                    // Test structure //
+                    // ////////////// //
+                    // Data series to purge
+                    QTest::addColumn<std::shared_ptr<T> >("dataSeries");
+                    QTest::addColumn<double>("min");
+                    QTest::addColumn<double>("max");
+                    // Expected values after purge
+                    QTest::addColumn<QVector<double> >("expectedXAxisData");
+                    QTest::addColumn<QVector<QVector<double> > >("expectedValuesData");
+                }
+                template <typename T>
+                void testPurge()
+                {
+                    QFETCH(std::shared_ptr<T>, dataSeries);
+                    QFETCH(double, min);
+                    QFETCH(double, max);
+                    dataSeries->purge(min, max);
+                    // Validates results
+                    QFETCH(QVector<double>, expectedXAxisData);
+                    QFETCH(QVector<QVector<double> >, expectedValuesData);
+                    validateRange(dataSeries->cbegin(), dataSeries->cend(), expectedXAxisData,
+                                  expectedValuesData);
+                }
             private slots:
                 /// Input test data
                 /// @sa testCtor()
                 void testCtor_data();
                 /// Tests construction of a data series
                 void testCtor();
                 /// Input test data
                 /// @sa testMerge()
                 void testMerge_data();
                 /// Tests merge of two data series
                 void testMerge();
                 /// Input test data
+                /// @sa testPurgeScalar()
+                void testPurgeScalar_data();
+                /// Tests purge of a scalar series
+                void testPurgeScalar();
+                /// Input test data
+                /// @sa testPurgeVector()
+                void testPurgeVector_data();
+                /// Tests purge of a vector series
+                void testPurgeVector();
+                /// Input test data
                 /// @sa testMinXAxisData()
                 void testMinXAxisData_data();
                 /// Tests get min x-axis data of a data series
                 void testMinXAxisData();
                 /// Input test data
                 /// @sa testMaxXAxisData()
                 void testMaxXAxisData_data();
                 /// Tests get max x-axis data of a data series
                 void testMaxXAxisData();
                 /// Input test data
                 /// @sa testXAxisRange()
                 void testXAxisRange_data();
                 /// Tests get x-axis range of a data series
                 void testXAxisRange();
                 /// Input test data
                 /// @sa testValuesBoundsScalar()
                 void testValuesBoundsScalar_data();
                 /// Tests get values bounds of a scalar series
                 void testValuesBoundsScalar();
                 /// Input test data
                 /// @sa testValuesBoundsVector()
                 void testValuesBoundsVector_data();
                 /// Tests get values bounds of a vector series
                 void testValuesBoundsVector();
             };
             void TestDataSeries::testCtor_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // x-axis data
                 QTest::addColumn<QVector<double> >("xAxisData");
                 // values data
                 QTest::addColumn<QVector<double> >("valuesData");
                 // expected x-axis data
                 QTest::addColumn<QVector<double> >("expectedXAxisData");
                 // expected values data
                 QTest::addColumn<QVector<double> >("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("invalidData (different sizes of vectors)")
                     << QVector<double>{1., 2., 3., 4., 5.} << QVector<double>{100., 200., 300.}
                     << QVector<double>{} << QVector<double>{};
                 QTest::newRow("sortedData") << QVector<double>{1., 2., 3., 4., 5.}
                                             << QVector<double>{100., 200., 300., 400., 500.}
                                             << QVector<double>{1., 2., 3., 4., 5.}
                                             << QVector<double>{100., 200., 300., 400., 500.};
                 QTest::newRow("unsortedData") << QVector<double>{5., 4., 3., 2., 1.}
                                               << QVector<double>{100., 200., 300., 400., 500.}
                                               << QVector<double>{1., 2., 3., 4., 5.}
                                               << QVector<double>{500., 400., 300., 200., 100.};
                 QTest::newRow("unsortedData2")
                     << QVector<double>{1., 4., 3., 5., 2.} << QVector<double>{100., 200., 300., 400., 500.}
                     << QVector<double>{1., 2., 3., 4., 5.} << QVector<double>{100., 500., 300., 200., 400.};
             }
             void TestDataSeries::testCtor()
             {
                 // Creates series
                 QFETCH(QVector<double>, xAxisData);
                 QFETCH(QVector<double>, valuesData);
                 auto series = std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
                                                              Unit{}, Unit{});
                 // Validates results : we check that the data series is sorted on its x-axis data
                 QFETCH(QVector<double>, expectedXAxisData);
                 QFETCH(QVector<double>, expectedValuesData);
                 validateRange(series->cbegin(), series->cend(), expectedXAxisData, expectedValuesData);
             }
             namespace {
             std::shared_ptr<ScalarSeries> createScalarSeries(QVector<double> xAxisData,
                                                              QVector<double> valuesData)
             {
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), Unit{},
                                                       Unit{});
             }
             std::shared_ptr<VectorSeries> createVectorSeries(QVector<double> xAxisData,
                                                              QVector<double> xValuesData,
                                                              QVector<double> yValuesData,
                                                              QVector<double> zValuesData)
             {
                 return std::make_shared<VectorSeries>(std::move(xAxisData), std::move(xValuesData),
                                                       std::move(yValuesData), std::move(zValuesData), Unit{},
                                                       Unit{});
             }
             } // namespace
             void TestDataSeries::testMerge_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to merge
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries2");
                 // Expected values in the first data series after merge
                 QTest::addColumn<QVector<double> >("expectedXAxisData");
                 QTest::addColumn<QVector<double> >("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("sortedMerge")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
                     << createScalarSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.})
                     << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << QVector<double>{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
                 QTest::newRow("unsortedMerge")
                     << createScalarSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.})
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.})
                     << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << QVector<double>{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
                 QTest::newRow("unsortedMerge2")
                     << createScalarSeries({1., 2., 8., 9., 10}, {100., 200., 300., 400., 500.})
                     << createScalarSeries({3., 4., 5., 6., 7.}, {600., 700., 800., 900., 1000.})
                     << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << QVector<double>{100., 200., 600., 700., 800., 900., 1000., 300., 400., 500.};
                 QTest::newRow("unsortedMerge3")
                     << createScalarSeries({3., 5., 8., 7., 2}, {100., 200., 300., 400., 500.})
                     << createScalarSeries({6., 4., 9., 10., 1.}, {600., 700., 800., 900., 1000.})
                     << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
                     << QVector<double>{1000., 500., 100., 700., 200., 600., 400., 300., 800., 900.};
             }
             void TestDataSeries::testMerge()
             {
                 // Merges series
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries2);
                 dataSeries->merge(dataSeries2.get());
                 // Validates results : we check that the merge is valid and the data series is sorted on its
                 // x-axis data
                 QFETCH(QVector<double>, expectedXAxisData);
                 QFETCH(QVector<double>, expectedValuesData);
                 validateRange(dataSeries->cbegin(), dataSeries->cend(), expectedXAxisData, expectedValuesData);
             }
+            void TestDataSeries::testPurgeScalar_data()
+            {
+                testPurgeStructure<ScalarSeries>();
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                QTest::newRow("purgeScalar") << createScalarSeries({1., 2., 3., 4., 5.},
+                                                                   {100., 200., 300., 400., 500.})
+                                             << 2. << 4. << QVector<double>{2., 3., 4.}
+                                             << QVector<QVector<double> >{{200., 300., 400.}};
+                QTest::newRow("purgeScalar2") << createScalarSeries({1., 2., 3., 4., 5.},
+                                                                    {100., 200., 300., 400., 500.})
+                                              << 0. << 2.5 << QVector<double>{1., 2.}
+                                              << QVector<QVector<double> >{{100., 200.}};
+                QTest::newRow("purgeScalar3") << createScalarSeries({1., 2., 3., 4., 5.},
+                                                                    {100., 200., 300., 400., 500.})
+                                              << 3.5 << 7. << QVector<double>{4., 5.}
+                                              << QVector<QVector<double> >{{400., 500.}};
+                QTest::newRow("purgeScalar4") << createScalarSeries({1., 2., 3., 4., 5.},
+                                                                    {100., 200., 300., 400., 500.})
+                                              << 0. << 7. << QVector<double>{1., 2., 3., 4., 5.}
+                                              << QVector<QVector<double> >{{100., 200., 300., 400., 500.}};
+                QTest::newRow("purgeScalar5") << createScalarSeries({1., 2., 3., 4., 5.},
+                                                                    {100., 200., 300., 400., 500.})
+                                              << 5.5 << 7. << QVector<double>{}
+                                              << QVector<QVector<double> >{{}};
+            }
+            void TestDataSeries::testPurgeScalar()
+            {
+                testPurge<ScalarSeries>();
+            }
+            void TestDataSeries::testPurgeVector_data()
+            {
+                testPurgeStructure<VectorSeries>();
+                // ////////// //
+                // Test cases //
+                // ////////// //
+                QTest::newRow("purgeVector") << createVectorSeries({1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.},
+                                                                   {11., 12., 13., 14., 15.},
+                                                                   {16., 17., 18., 19., 20.})
+                                             << 2. << 4. << QVector<double>{2., 3., 4.}
+                                             << QVector<QVector<double> >{
+                                                    {7., 8., 9.}, {12., 13., 14.}, {17., 18., 19.}};
+            }
+            void TestDataSeries::testPurgeVector()
+            {
+                testPurge<VectorSeries>();
+            }
             void TestDataSeries::testMinXAxisData_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get min data
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Min data
                 QTest::addColumn<double>("min");
                 // Expected results
                 QTest::addColumn<bool>(
                     "expectedOK"); // if true, expects to have a result (i.e. the iterator != end iterator)
                 QTest::addColumn<double>(
                     "expectedMin"); // Expected value when method doesn't return end iterator
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("minData1") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 0. << true << 1.;
                 QTest::newRow("minData2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1. << true << 1.;
                 QTest::newRow("minData3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1.1 << true << 2.;
                 QTest::newRow("minData4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5. << true << 5.;
                 QTest::newRow("minData5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5.1 << false << std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("minData6") << createScalarSeries({}, {}) << 1.1 << false
                                           << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testMinXAxisData()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, min);
                 QFETCH(bool, expectedOK);
                 QFETCH(double, expectedMin);
                 auto it = dataSeries->minXAxisData(min);
                 QCOMPARE(expectedOK, it != dataSeries->cend());
                 // If the method doesn't return a end iterator, checks with expected value
                 if (expectedOK) {
                     QCOMPARE(expectedMin, it->x());
                 }
             }
             void TestDataSeries::testMaxXAxisData_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get max data
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Max data
                 QTest::addColumn<double>("max");
                 // Expected results
                 QTest::addColumn<bool>(
                     "expectedOK"); // if true, expects to have a result (i.e. the iterator != end iterator)
                 QTest::addColumn<double>(
                     "expectedMax"); // Expected value when method doesn't return end iterator
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("maxData1") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 6. << true << 5.;
                 QTest::newRow("maxData2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 5. << true << 5.;
                 QTest::newRow("maxData3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 4.9 << true << 4.;
                 QTest::newRow("maxData4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1.1 << true << 1.;
                 QTest::newRow("maxData5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                 {100., 200., 300., 400., 500.})
                                           << 1. << true << 1.;
                 QTest::newRow("maxData6") << createScalarSeries({}, {}) << 1.1 << false
                                           << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testMaxXAxisData()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, max);
                 QFETCH(bool, expectedOK);
                 QFETCH(double, expectedMax);
                 auto it = dataSeries->maxXAxisData(max);
                 QCOMPARE(expectedOK, it != dataSeries->cend());
                 // If the method doesn't return a end iterator, checks with expected value
                 if (expectedOK) {
                     QCOMPARE(expectedMax, it->x());
                 }
             }
             void TestDataSeries::testXAxisRange_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Data series to get x-axis range
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // Min/max values
                 QTest::addColumn<double>("min");
                 QTest::addColumn<double>("max");
                 // Expected values
                 QTest::addColumn<QVector<double> >("expectedXAxisData");
                 QTest::addColumn<QVector<double> >("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("xAxisRange1") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << -1. << 3.2 << QVector<double>{1., 2., 3.}
                                              << QVector<double>{100., 200., 300.};
                 QTest::newRow("xAxisRange2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 1. << 4. << QVector<double>{1., 2., 3., 4.}
                                              << QVector<double>{100., 200., 300., 400.};
                 QTest::newRow("xAxisRange3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 1. << 3.9 << QVector<double>{1., 2., 3.}
                                              << QVector<double>{100., 200., 300.};
                 QTest::newRow("xAxisRange4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 0. << 0.9 << QVector<double>{} << QVector<double>{};
                 QTest::newRow("xAxisRange5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 0. << 1. << QVector<double>{1.} << QVector<double>{100.};
                 QTest::newRow("xAxisRange6") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 2.1 << 6. << QVector<double>{3., 4., 5.}
                                              << QVector<double>{300., 400., 500.};
                 QTest::newRow("xAxisRange7") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 6. << 9. << QVector<double>{} << QVector<double>{};
                 QTest::newRow("xAxisRange8") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
                                              << 5. << 9. << QVector<double>{5.} << QVector<double>{500.};
             }
             void TestDataSeries::testXAxisRange()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, min);
                 QFETCH(double, max);
                 QFETCH(QVector<double>, expectedXAxisData);
                 QFETCH(QVector<double>, expectedValuesData);
                 auto bounds = dataSeries->xAxisRange(min, max);
                 validateRange(bounds.first, bounds.second, expectedXAxisData, expectedValuesData);
             }
             void TestDataSeries::testValuesBoundsScalar_data()
             {
                 testValuesBoundsStructure<ScalarSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto nan = std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("scalarBounds1")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 0. << 6.
                     << true << 100. << 500.;
                 QTest::newRow("scalarBounds2")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 2. << 4.
                     << true << 200. << 400.;
                 QTest::newRow("scalarBounds3")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 0. << 0.5
                     << false << nan << nan;
                 QTest::newRow("scalarBounds4")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) << 5.1 << 6.
                     << false << nan << nan;
                 QTest::newRow("scalarBounds5") << createScalarSeries({1.}, {100.}) << 0. << 2. << true << 100.
                                                << 100.;
                 QTest::newRow("scalarBounds6") << createScalarSeries({}, {}) << 0. << 2. << false << nan << nan;
                 // Tests with NaN values: NaN values are not included in min/max search
                 QTest::newRow("scalarBounds7")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {nan, 200., 300., 400., nan}) << 0. << 6.
                     << true << 200. << 400.;
                 QTest::newRow("scalarBounds8")
                     << createScalarSeries({1., 2., 3., 4., 5.}, {nan, nan, nan, nan, nan}) << 0. << 6. << true
                     << std::numeric_limits<double>::quiet_NaN() << std::numeric_limits<double>::quiet_NaN();
             }
             void TestDataSeries::testValuesBoundsScalar()
             {
                 testValuesBounds<ScalarSeries>();
             }
             void TestDataSeries::testValuesBoundsVector_data()
             {
                 testValuesBoundsStructure<VectorSeries>();
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto nan = std::numeric_limits<double>::quiet_NaN();
                 QTest::newRow("vectorBounds1")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {10., 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 0.3}, {13., 14., 12., 9., 24.})
                     << 0. << 6. << true << 0.3 << 35.; // min/max in same component
                 QTest::newRow("vectorBounds2")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {2.3, 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 4.}, {13., 14., 12., 9., 24.})
                     << 0. << 6. << true << 2.3 << 35.; // min/max in same entry
                 QTest::newRow("vectorBounds3")
                     << createVectorSeries({1., 2., 3., 4., 5.}, {2.3, 15., 20., 13., 12.},
                                           {35., 24., 10., 9., 4.}, {13., 14., 12., 9., 24.})
                     << 2. << 3. << true << 10. << 24.;
                 // Tests with NaN values: NaN values are not included in min/max search
                 QTest::newRow("vectorBounds4")
                     << createVectorSeries({1., 2.}, {nan, nan}, {nan, nan}, {nan, nan}) << 0. << 6. << true
                     << nan << nan;
             }
             void TestDataSeries::testValuesBoundsVector()
             {
                 testValuesBounds<VectorSeries>();
             }
             QTEST_MAIN(TestDataSeries)
             #include "TestDataSeries.moc"

core/vera-exclusions/exclusions.txt +7 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: (const_iterator)
             ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (D)
+            ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (IC)
             ArrayData\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (arraydata_detail)
             ArrayData\.h:\d+:.*IPSIS_S06.*found: (D)
             ArrayData\.h:\d+:.*IPSIS_S06.*found: (Dim)
+            ArrayData\.h:\d+:.*IPSIS_S06.*found: (IC)
+            ArrayData\.h:\d+:.*IPSIS_S06.*found: (IsConst)
             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)
+            DataSeries\.h:\d+:.*IPSIS_S06.*found: (Dim)
+            DataSeries\.h:\d+:.*IPSIS_S06.*found: (IC)
+            DataSeries\.h:\d+:.*IPSIS_S06.*found: (IsConst)
             # 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