GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r648:cdcfd45a9b91

Merge branch 'feature/ImprovePerfs3' into develop

Alexandre Leroux -

r648:cdcfd45a9b91

parent child

Context file:

r648:cdcfd45a9b91

Collapse all files

core/include/Common/SortUtils.h +1 -1

             #ifndef SCIQLOP_SORTUTILS_H
             #define SCIQLOP_SORTUTILS_H
             #include <algorithm>
             #include <cmath>
             #include <numeric>
             #include <vector>
             /**
              * Utility class with methods for sorting data
              */
             struct SortUtils {
                 /**
                  * Generates a vector representing the index of insertion of each data of a container if this
                  * one had to be sorted according to a comparison function.
                  *
                  * For example:
                  * If the container is a vector {1; 4; 2; 5; 3} and the comparison function is std::less, the
                  * result would be : {0; 3; 1; 4; 2}
                  *
                  * @tparam Container the type of the container.
                  * @tparam Compare the type of the comparison function
                  * @param container the container from which to generate the result. The container must have a
                  * at() method that returns a value associated to an index
                  * @param compare the comparison function
                  */
                 template <typename Container, typename Compare>
                 static std::vector<int> sortPermutation(const Container &container, const Compare &compare)
                 {
                     auto permutation = std::vector<int>{};
                     permutation.resize(container.size());
                     std::iota(permutation.begin(), permutation.end(), 0);
                     std::sort(permutation.begin(), permutation.end(),
                               [&](int i, int j) { return compare(container.at(i), container.at(j)); });
                     return permutation;
                 }
                 /**
                  * Sorts a container according to indices passed in parameter. The number of data in the
                  * container must be a multiple of the number of indices used to sort the container.
                  *
                  * Example 1:
                  * container: {1, 2, 3, 4, 5, 6}
                  * sortPermutation: {1, 0}
                  *
                  * Values will be sorted three by three, and the result will be:
                  * {4, 5, 6, 1, 2, 3}
                  *
                  * Example 2:
                  * container: {1, 2, 3, 4, 5, 6}
                  * sortPermutation: {2, 0, 1}
                  *
                  * Values will be sorted two by two, and the result will be:
                  * {5, 6, 1, 2, 3, 4}
                  *
                  * @param container the container sorted
                  * @param sortPermutation the indices used to sort the container
                  * @return the container sorted
                  * @warning no verification is made on validity of sortPermutation (i.e. the vector has unique
                  * indices and its range is [0 ; vector.size()[ )
                  */
                 template <typename Container>
                 static Container sort(const Container &container, int nbValues,
                                       const std::vector<int> &sortPermutation)
                 {
                     auto containerSize = container.size();
                     if (containerSize % nbValues != 0
                         || ((containerSize / nbValues) != sortPermutation.size())) {
                         return Container{};
                     }
                     // Inits result
                     auto sortedData = Container{};
                     sortedData.reserve(containerSize);
                     for (auto i = 0, componentIndex = 0, permutationIndex = 0; i < containerSize;
                          ++i, componentIndex = i % nbValues, permutationIndex = i / nbValues) {
                         auto insertIndex = sortPermutation.at(permutationIndex) * nbValues + componentIndex;
-                        sortedData.append(container.at(insertIndex));
+                        sortedData.push_back(container.at(insertIndex));
                     }
                     return sortedData;
                 }
                 /**
                  * Compares two values that can be NaN. This method is intended to be used as a compare function
                  * for searching min value by excluding NaN values.
                  *
                  * Examples of use:
                  * - f({1, 3, 2, 4, 5}) will return 1
                  * - f({NaN, 3, 2, 4, 5}) will return 2 (NaN is excluded)
                  * - f({NaN, NaN, 3, NaN, NaN}) will return 3 (NaN are excluded)
                  * - f({NaN, NaN, NaN, NaN, NaN}) will return NaN (no existing value)
                  *
                  * @param v1 first value
                  * @param v2 second value
                  * @return true if v1 < v2, false otherwise
                  * @sa std::min_element
                  */
                 template <typename T>
                 static bool minCompareWithNaN(const T &v1, const T &v2)
                 {
                     // Table used with NaN values:
                     // NaN < v2 -> false
                     // v1 < NaN -> true
                     // NaN < NaN -> false
                     // v1 < v2 -> v1 < v2
                     return std::isnan(v1) ? false : std::isnan(v2) || (v1 < v2);
                 }
                 /**
                  * Compares two values that can be NaN. This method is intended to be used as a compare function
                  * for searching max value by excluding NaN values.
                  *
                  * Examples of use:
                  * - f({1, 3, 2, 4, 5}) will return 5
                  * - f({1, 3, 2, 4, NaN}) will return 4 (NaN is excluded)
                  * - f({NaN, NaN, 3, NaN, NaN}) will return 3 (NaN are excluded)
                  * - f({NaN, NaN, NaN, NaN, NaN}) will return NaN (no existing value)
                  *
                  * @param v1 first value
                  * @param v2 second value
                  * @return true if v1 < v2, false otherwise
                  * @sa std::max_element
                  */
                 template <typename T>
                 static bool maxCompareWithNaN(const T &v1, const T &v2)
                 {
                     // Table used with NaN values:
                     // NaN < v2 -> true
                     // v1 < NaN -> false
                     // NaN < NaN -> false
                     // v1 < v2 -> v1 < v2
                     return std::isnan(v1) ? true : !std::isnan(v2) && (v1 < v2);
                 }
             };
             #endif // SCIQLOP_SORTUTILS_H

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

             #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>;
+            using DataContainer = std::vector<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, IsConst> >(*this);
                 }
                 int distance(const ArrayDataIteratorValue::Impl &other) const override try {
                     /// @todo ALX : validate
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return std::distance(otherImpl.m_It, m_It) / m_NbComponents;
                 }
                 catch (const std::bad_cast &) {
                     return 0;
                 }
                 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;
                 }
                 bool lowerThan(const ArrayDataIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_It < otherImpl.m_It;
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 std::unique_ptr<ArrayDataIteratorValue::Impl> advance(int offset) const override
                 {
                     auto result = clone();
-                    while (offset--) {
+                    result->next(offset);
-                        result->next();
                     return result;
                 }
-                void next() override { std::advance(m_It, m_NbComponents); }
+                void next(int offset) override { std::advance(m_It, offset * 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:
                 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) {
+                    insert(other.cbegin(), other.cend(), 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{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, 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
+                void insert(ArrayDataIterator first, ArrayDataIterator last, bool prepend = false)
-                /// 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);
+                    auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(first->impl());
-                    m_Data.append(values);
+                    auto lastImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(last->impl());
+                    if (firstImpl && lastImpl) {
+                        auto insertIt = prepend ? m_Data.begin() : m_Data.end();
+                        m_Data.insert(insertIt, firstImpl->m_It, lastImpl->m_It);
+                    }
                 }
                 /**
                  * @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
+                DataContainer 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 +2 -2

             #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 int distance(const Impl &other) const = 0;
                     virtual bool equals(const Impl &other) const = 0;
                     virtual bool lowerThan(const Impl &other) const = 0;
                     virtual std::unique_ptr<Impl> advance(int offset) const = 0;
-                    virtual void next() = 0;
+                    virtual void next(int offset) = 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 &operator=(ArrayDataIteratorValue other);
                 int distance(const ArrayDataIteratorValue &other) const;
                 bool equals(const ArrayDataIteratorValue &other) const;
                 bool lowerThan(const ArrayDataIteratorValue &other) const;
                 ArrayDataIteratorValue advance(int offset) const;
                 /// Advances to the next value
-                void next();
+                void next(int offset = 1);
                 /// 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 +18 -29

             #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, 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, IsConst> >(*this);
                 }
                 int distance(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_XIt->distance(*otherImpl.m_XIt);
                 }
                 catch (const std::bad_cast &) {
                     return 0;
                 }
                 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;
                 }
                 bool lowerThan(const DataSeriesIteratorValue::Impl &other) const override try {
                     const auto &otherImpl = dynamic_cast<const IteratorValue &>(other);
                     return m_XIt->lowerThan(*otherImpl.m_XIt);
                 }
                 catch (const std::bad_cast &) {
                     return false;
                 }
                 std::unique_ptr<DataSeriesIteratorValue::Impl> advance(int offset) const override
                 {
                     auto result = clone();
-                    while (offset--) {
+                    result->next(offset);
-                        result->next();
                     return result;
                 }
-                void next() override
+                void next(int offset) override
                 {
-                    ++m_XIt;
+                    m_XIt->next(offset);
-                    ++m_ValuesIt;
+                    m_ValuesIt->next(offset);
                 }
                 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()) {
+                    if (!m_XAxisData->cdata().empty()) {
-                        return SqpRange{m_XAxisData->cdata().first(), m_XAxisData->cdata().last()};
+                        return SqpRange{m_XAxisData->cdata().front(), m_XAxisData->cdata().back()};
                     }
                     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
                 {
                     // Nothing to purge if series is empty
                     if (isEmpty()) {
                         return;
                     }
                     if (min > max) {
                         std::swap(min, max);
                     }
                     // Nothing to purge if series min/max are inside purge range
                     auto xMin = cbegin()->x();
                     auto xMax = (--cend())->x();
                     if (xMin >= min && xMax <= max) {
                         return;
                     }
                     auto lowerIt = std::lower_bound(
                         begin(), end(), min, [](const auto &it, const auto &val) { return it.x() < val; });
                     erase(begin(), lowerIt);
                     auto upperIt = std::upper_bound(
                         begin(), end(), max, [](const auto &val, const auto &it) { return val < it.x(); });
                     erase(upperIt, end());
                 }
                 // ///////// //
                 // 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, true> >(*this, true)}};
                 }
                 DataSeriesIterator cend() const override
                 {
                     return DataSeriesIterator{DataSeriesIteratorValue{
                         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);
                     }
                 }
+                void insert(DataSeriesIterator first, DataSeriesIterator last, bool prepend = false)
+                {
+                    auto firstImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(first->impl());
+                    auto lastImpl = dynamic_cast<dataseries_detail::IteratorValue<Dim, true> *>(last->impl());
+                    if (firstImpl && lastImpl) {
+                        m_XAxisData->insert(firstImpl->m_XIt, lastImpl->m_XIt, prepend);
+                        m_ValuesData->insert(firstImpl->m_ValuesIt, lastImpl->m_ValuesIt, prepend);
+                    }
+                }
                 /// @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,
+                        lowerIt, 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 +2 -2

             #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 int distance(const Impl &other) const = 0;
                     virtual bool equals(const Impl &other) const = 0;
                     virtual bool lowerThan(const Impl &other) const = 0;
                     virtual std::unique_ptr<Impl> advance(int offset) const = 0;
-                    virtual void next() = 0;
+                    virtual void next(int offset) = 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 &operator=(DataSeriesIteratorValue other);
                 int distance(const DataSeriesIteratorValue &other) const;
                 bool equals(const DataSeriesIteratorValue &other) const;
                 bool lowerThan(const DataSeriesIteratorValue &other) const;
                 DataSeriesIteratorValue advance(int offset) const;
                 /// Advances to the next value
-                void next();
+                void next(int offset = 1);
                 /// 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/DataSeriesMergeHelper.h +22 -71

             #ifndef SCIQLOP_DATASERIESMERGEHELPER_H
             #define SCIQLOP_DATASERIESMERGEHELPER_H
             template <int Dim>
             class DataSeries;
             namespace detail {
             /**
              * Scope that can be used for a merge operation
              * @tparam FEnd the type of function that will be executed at the end of the scope
              */
             template <typename FEnd>
             struct MergeScope {
                 explicit MergeScope(FEnd end) : m_End{end} {}
                 virtual ~MergeScope() noexcept { m_End(); }
                 FEnd m_End;
             };
             /**
              * Creates a scope for merge operation
              * @tparam end the function executed at the end of the scope
              */
             template <typename FEnd>
             MergeScope<FEnd> scope(FEnd end)
             {
                 return MergeScope<FEnd>{end};
             }
-            /**
-             * Enum used to position a data series relative to another during a merge operation
-             */
-            enum class MergePosition { LOWER_THAN, GREATER_THAN, EQUAL, OVERLAP };
-            /**
-             * Computes the position of the first data series relative to the second data series
-             * @param lhs the first data series
-             * @param rhs the second data series
-             * @return the merge position computed
-             * @remarks the data series must not be empty
-             */
-            template <int Dim>
-            MergePosition mergePosition(DataSeries<Dim> &lhs, DataSeries<Dim> &rhs)
-                Q_ASSERT(!lhs.isEmpty() && !rhs.isEmpty());
-                // Case lhs < rhs
-                auto lhsLast = --lhs.cend();
-                auto rhsFirst = rhs.cbegin();
-                if (lhsLast->x() < rhsFirst->x()) {
-                    return MergePosition::LOWER_THAN;
-                // Case lhs > rhs
-                auto lhsFirst = lhs.cbegin();
-                auto rhsLast = --rhs.cend();
-                if (lhsFirst->x() > rhsLast->x()) {
-                    return MergePosition::GREATER_THAN;
-                // Other cases
-                auto equal = std::equal(lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend(),
-                                        [](const auto &it1, const auto &it2) {
-                                            return it1.x() == it2.x() && it1.values() == it2.values();
-                                        });
-                return equal ? MergePosition::EQUAL : MergePosition::OVERLAP;
             } // namespace detail
             /// Helper used to merge two DataSeries
             /// @sa DataSeries
             struct DataSeriesMergeHelper {
                 /// Merges the source data series into the dest data series. Data of the source data series are
                 /// consumed
                 template <int Dim>
                 static void merge(DataSeries<Dim> &source, DataSeries<Dim> &dest)
                 {
                     // Creates a scope to clear source data series at the end of the merge
                     auto _ = detail::scope([&source]() { source.clear(); });
                     // Case : source data series is empty -> no merge is made
                     if (source.isEmpty()) {
                         return;
                     }
                     // Case : dest data series is empty -> we simply swap the data
                     if (dest.isEmpty()) {
                         std::swap(dest.m_XAxisData, source.m_XAxisData);
                         std::swap(dest.m_ValuesData, source.m_ValuesData);
                         return;
                     }
-                    // Gets the position of the source in relation to the destination
+                    auto destMin = dest.cbegin()->x();
-                    auto sourcePosition = detail::mergePosition(source, dest);
+                    auto destMax = (--dest.cend())->x();
+                    auto sourceBegin = source.cbegin();
+                    auto sourceEnd = source.cend();
+                    auto sourceMin = sourceBegin->x();
+                    auto sourceMax = (--source.cend())->x();
-                    switch (sourcePosition) {
+                    // Case : source bounds are inside dest bounds -> no merge is made
-                        case detail::MergePosition::LOWER_THAN:
+                    if (sourceMin >= destMin && sourceMax <= destMax) {
-                        case detail::MergePosition::GREATER_THAN: {
+                        return;
-                            auto prepend = sourcePosition == detail::MergePosition::LOWER_THAN;
-                            dest.m_XAxisData->add(*source.m_XAxisData, prepend);
-                            dest.m_ValuesData->add(*source.m_ValuesData, prepend);
-                            break;
-                        case detail::MergePosition::EQUAL:
-                            // the data series equal each other : no merge made
-                            break;
-                        case detail::MergePosition::OVERLAP: {
-                            // the two data series overlap : merge is made
-                            auto temp = dest.clone();
-                            if (auto tempSeries = dynamic_cast<DataSeries<Dim> *>(temp.get())) {
-                                // Makes the merge :
-                                // - Data are sorted by x-axis values
-                                // - If two entries are in the source range and the other range, only one entry
-                                // is retained as result
-                                // - The results are stored directly in the data series
-                                dest.clear();
-                                std::set_union(
-                                    tempSeries->cbegin(), tempSeries->cend(), source.cbegin(), source.cend(),
-                                    std::back_inserter(dest),
-                                    [](const auto &it1, const auto &it2) { return it1.x() < it2.x(); });
-                            break;
-                        default:
-                            Q_ASSERT(false);
                     }
+                    // Default case :
+                    // - prepend to dest the values of source that are lower than min value of dest
+                    // - append to dest the values of source that are greater than max value of dest
+                    auto lowerIt
+                        = std::lower_bound(sourceBegin, sourceEnd, destMin,
+                                           [](const auto &it, const auto &val) { return it.x() < val; });
+                    auto upperIt
+                        = std::upper_bound(lowerIt, sourceEnd, destMax,
+                                           [](const auto &val, const auto &it) { return val < it.x(); });
+                    dest.insert(sourceBegin, lowerIt, true);
+                    dest.insert(upperIt, sourceEnd);
                 }
             };
             #endif // SCIQLOP_DATASERIESMERGEHELPER_H

core/include/Data/ScalarSeries.h +1 -1

             #ifndef SCIQLOP_SCALARSERIES_H
             #define SCIQLOP_SCALARSERIES_H
             #include "CoreGlobal.h"
             #include <Data/DataSeries.h>
             /**
              * @brief The ScalarSeries class is the implementation for a data series representing a scalar.
              */
             class SCIQLOP_CORE_EXPORT ScalarSeries : public DataSeries<1> {
             public:
                 /**
                  * Ctor with two vectors. The vectors must have the same size, otherwise a ScalarSeries with no
                  * values will be created.
                  * @param xAxisData x-axis data
                  * @param valuesData values data
                  */
-                explicit ScalarSeries(QVector<double> xAxisData, QVector<double> valuesData,
+                explicit ScalarSeries(std::vector<double> xAxisData, std::vector<double> valuesData,
                                       const Unit &xAxisUnit, const Unit &valuesUnit);
                 std::unique_ptr<IDataSeries> clone() const override;
                 std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) override;
             };
             #endif // SCIQLOP_SCALARSERIES_H

core/include/Data/SqpIterator.h +1 -3

             #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::random_access_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 &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
                 SqpIterator &operator++()
                 {
                     m_CurrentValue.next();
                     return *this;
                 }
                 SqpIterator &operator--()
                 {
                     m_CurrentValue.prev();
                     return *this;
                 }
                 SqpIterator operator++(int)const
                 {
                     auto result = *this;
                     this->operator++();
                     return result;
                 }
                 SqpIterator operator--(int)const
                 {
                     auto result = *this;
                     this->operator--();
                     return result;
                 }
                 SqpIterator &operator+=(int offset)
                 {
                     if (offset >= 0) {
-                        while (offset--) {
+                        m_CurrentValue.next(offset);
-                            m_CurrentValue.next();
                     }
                     else {
                         while (offset++) {
                             m_CurrentValue.prev();
                         }
                     }
                     return *this;
                 }
                 SqpIterator &operator-=(int offset) { return *this += -offset; }
                 SqpIterator operator+(int offset) const
                 {
                     auto result = *this;
                     result += offset;
                     return result;
                 }
                 SqpIterator operator-(int offset) const
                 {
                     auto result = *this;
                     result -= offset;
                     return result;
                 }
                 int operator-(const SqpIterator &other) const
                 {
                     return m_CurrentValue.distance(other.m_CurrentValue);
                 }
                 const T *operator->() const { return &m_CurrentValue; }
                 const T &operator*() const { return m_CurrentValue; }
                 T *operator->() { return &m_CurrentValue; }
                 T &operator*() { return m_CurrentValue; }
                 T &operator[](int offset) const { return m_CurrentValue.advance(offset); }
                 bool operator==(const SqpIterator &other) const
                 {
                     return m_CurrentValue.equals(other.m_CurrentValue);
                 }
                 bool operator!=(const SqpIterator &other) const { return !(*this == other); }
                 bool operator>(const SqpIterator &other) const { return other.m_CurrentValue.lowerThan(*this); }
                 bool operator<(const SqpIterator &other) const
                 {
                     return m_CurrentValue.lowerThan(other.m_CurrentValue);
                 }
                 bool operator>=(const SqpIterator &other) const { return !(*this < other); }
                 bool operator<=(const SqpIterator &other) const { return !(*this > other); }
             private:
                 T m_CurrentValue;
             };
             #endif // SCIQLOP_SQPITERATOR_H

core/include/Data/VectorSeries.h +3 -3

             #ifndef SCIQLOP_VECTORSERIES_H
             #define SCIQLOP_VECTORSERIES_H
             #include "CoreGlobal.h"
             #include <Data/DataSeries.h>
             /**
              * @brief The VectorSeries class is the implementation for a data series representing a vector.
              */
             class SCIQLOP_CORE_EXPORT VectorSeries : public DataSeries<2> {
             public:
                 /**
                  * Ctor with three vectors (one per component). The vectors must have the same size, otherwise a
                  * ScalarSeries with no values will be created.
                  * @param xAxisData x-axis data
                  * @param xvaluesData x-values data
                  * @param yvaluesData y-values data
                  * @param zvaluesData z-values data
                  */
-                explicit VectorSeries(QVector<double> xAxisData, QVector<double> xValuesData,
+                explicit VectorSeries(std::vector<double> xAxisData, std::vector<double> xValuesData,
-                                      QVector<double> yValuesData, QVector<double> zValuesData,
+                                      std::vector<double> yValuesData, std::vector<double> zValuesData,
                                       const Unit &xAxisUnit, const Unit &valuesUnit);
                 /// Default Ctor
-                explicit VectorSeries(QVector<double> xAxisData, QVector<double> valuesData,
+                explicit VectorSeries(std::vector<double> xAxisData, std::vector<double> valuesData,
                                       const Unit &xAxisUnit, const Unit &valuesUnit);
                 std::unique_ptr<IDataSeries> clone() const;
                 std::shared_ptr<IDataSeries> subDataSeries(const SqpRange &range) override;
             };
             #endif // SCIQLOP_VECTORSERIES_H

core/src/Data/ArrayDataIterator.cpp +2 -2

             #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)
             {
                 m_Impl->swap(*other.m_Impl);
                 return *this;
             }
             int ArrayDataIteratorValue::distance(const ArrayDataIteratorValue &other) const
             {
                 return m_Impl->distance(*other.m_Impl);
             }
             bool ArrayDataIteratorValue::equals(const ArrayDataIteratorValue &other) const
             {
                 return m_Impl->equals(*other.m_Impl);
             }
             bool ArrayDataIteratorValue::lowerThan(const ArrayDataIteratorValue &other) const
             {
                 return m_Impl->lowerThan(*other.m_Impl);
             }
             ArrayDataIteratorValue ArrayDataIteratorValue::advance(int offset) const
             {
                 return ArrayDataIteratorValue{m_Impl->advance(offset)};
             }
-            void ArrayDataIteratorValue::next()
+            void ArrayDataIteratorValue::next(int offset)
             {
-                m_Impl->next();
+                m_Impl->next(offset);
             }
             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 +2 -2

             #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)
             {
                 m_Impl->swap(*other.m_Impl);
                 return *this;
             }
             int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const
             {
                 auto dist = m_Impl->distance(*other.m_Impl);
                 return m_Impl->distance(*other.m_Impl);
             }
             bool DataSeriesIteratorValue::equals(const DataSeriesIteratorValue &other) const
             {
                 return m_Impl->equals(*other.m_Impl);
             }
             bool DataSeriesIteratorValue::lowerThan(const DataSeriesIteratorValue &other) const
             {
                 return m_Impl->lowerThan(*other.m_Impl);
             }
             DataSeriesIteratorValue DataSeriesIteratorValue::advance(int offset) const
             {
                 return DataSeriesIteratorValue{m_Impl->advance(offset)};
             }
-            void DataSeriesIteratorValue::next()
+            void DataSeriesIteratorValue::next(int offset)
             {
-                m_Impl->next();
+                m_Impl->next(offset);
             }
             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/Data/ScalarSeries.cpp +7 -7

             #include <Data/ScalarSeries.h>
-            ScalarSeries::ScalarSeries(QVector<double> xAxisData, QVector<double> valuesData,
+            ScalarSeries::ScalarSeries(std::vector<double> xAxisData, std::vector<double> valuesData,
                                        const Unit &xAxisUnit, const Unit &valuesUnit)
                     : DataSeries{std::make_shared<ArrayData<1> >(std::move(xAxisData)), xAxisUnit,
                                  std::make_shared<ArrayData<1> >(std::move(valuesData)), valuesUnit}
             {
             }
             std::unique_ptr<IDataSeries> ScalarSeries::clone() const
             {
                 return std::make_unique<ScalarSeries>(*this);
             }
             std::shared_ptr<IDataSeries> ScalarSeries::subDataSeries(const SqpRange &range)
             {
-                auto subXAxisData = QVector<double>();
+                auto subXAxisData = std::vector<double>();
-                auto subValuesData = QVector<double>();
+                auto subValuesData = std::vector<double>();
                 this->lockRead();
                 {
                     auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                     for (auto it = bounds.first; it != bounds.second; ++it) {
-                        subXAxisData.append(it->x());
+                        subXAxisData.push_back(it->x());
-                        subValuesData.append(it->value());
+                        subValuesData.push_back(it->value());
                     }
                 }
                 this->unlock();
-                return std::make_shared<ScalarSeries>(subXAxisData, subValuesData, this->xAxisUnit(),
+                return std::make_shared<ScalarSeries>(std::move(subXAxisData), std::move(subValuesData),
-                                                      this->valuesUnit());
+                                                      this->xAxisUnit(), this->valuesUnit());
             }

core/src/Data/VectorSeries.cpp +22 -17

             #include "Data/VectorSeries.h"
             namespace {
             /**
              * Flatten the three components of a vector to a single QVector that can be passed to an ArrayData
              *
              * Example:
              * xValues = {1, 2, 3}
              * yValues = {4, 5, 6}
              * zValues = {7, 8, 9}
              *
              * result = {1, 4, 7, 2, 5, 8, 3, 6, 9}
              *
              * @param xValues the x-component values of the vector
              * @param yValues the y-component values of the vector
              * @param zValues the z-component values of the vector
              * @return the single QVector
              * @remarks the three components are consumed
              * @sa ArrayData
              */
-            QVector<double> flatten(QVector<double> xValues, QVector<double> yValues, QVector<double> zValues)
+            std::vector<double> flatten(std::vector<double> xValues, std::vector<double> yValues,
+                                        std::vector<double> zValues)
             {
                 if (xValues.size() != yValues.size() || xValues.size() != zValues.size()) {
                     /// @todo ALX : log
                     return {};
                 }
-                auto result = QVector<double>{};
+                auto result = std::vector<double>();
                 result.reserve(xValues.size() * 3);
-                while (!xValues.isEmpty()) {
+                while (!xValues.empty()) {
-                    result.append({xValues.takeFirst(), yValues.takeFirst(), zValues.takeFirst()});
+                    result.insert(result.cend(), {xValues.front(), yValues.front(), zValues.front()});
+                    xValues.erase(xValues.begin());
+                    yValues.erase(yValues.begin());
+                    zValues.erase(zValues.begin());
                 }
                 return result;
             }
             } // namespace
-            VectorSeries::VectorSeries(QVector<double> xAxisData, QVector<double> xValuesData,
+            VectorSeries::VectorSeries(std::vector<double> xAxisData, std::vector<double> xValuesData,
-                                       QVector<double> yValuesData, QVector<double> zValuesData,
+                                       std::vector<double> yValuesData, std::vector<double> zValuesData,
                                        const Unit &xAxisUnit, const Unit &valuesUnit)
                     : VectorSeries{std::move(xAxisData), flatten(std::move(xValuesData), std::move(yValuesData),
                                                                  std::move(zValuesData)),
                                    xAxisUnit, valuesUnit}
             {
             }
-            VectorSeries::VectorSeries(QVector<double> xAxisData, QVector<double> valuesData,
+            VectorSeries::VectorSeries(std::vector<double> xAxisData, std::vector<double> valuesData,
                                        const Unit &xAxisUnit, const Unit &valuesUnit)
                     : DataSeries{std::make_shared<ArrayData<1> >(std::move(xAxisData)), xAxisUnit,
                                  std::make_shared<ArrayData<2> >(std::move(valuesData), 3), valuesUnit}
             {
             }
             std::unique_ptr<IDataSeries> VectorSeries::clone() const
             {
                 return std::make_unique<VectorSeries>(*this);
             }
             std::shared_ptr<IDataSeries> VectorSeries::subDataSeries(const SqpRange &range)
             {
-                auto subXAxisData = QVector<double>();
+                auto subXAxisData = std::vector<double>();
-                auto subXValuesData = QVector<double>();
+                auto subXValuesData = std::vector<double>();
-                auto subYValuesData = QVector<double>();
+                auto subYValuesData = std::vector<double>();
-                auto subZValuesData = QVector<double>();
+                auto subZValuesData = std::vector<double>();
                 this->lockRead();
                 {
                     auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                     for (auto it = bounds.first; it != bounds.second; ++it) {
-                        subXAxisData.append(it->x());
+                        subXAxisData.push_back(it->x());
-                        subXValuesData.append(it->value(0));
+                        subXValuesData.push_back(it->value(0));
-                        subYValuesData.append(it->value(1));
+                        subYValuesData.push_back(it->value(1));
-                        subZValuesData.append(it->value(2));
+                        subZValuesData.push_back(it->value(2));
                     }
                 }
                 this->unlock();
-                return std::make_shared<VectorSeries>(subXAxisData, subXValuesData, subYValuesData,
+                return std::make_shared<VectorSeries>(std::move(subXAxisData), std::move(subXValuesData),
-                                                      subZValuesData, this->xAxisUnit(), this->valuesUnit());
+                                                      std::move(subYValuesData), std::move(subZValuesData),
+                                                      this->xAxisUnit(), this->valuesUnit());
             }

core/tests/Data/TestDataSeries.cpp +77 -79

             #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,
+            using DataContainer = std::vector<double>;
-                               const QVector<double> &valuesData)
+            void validateRange(DataSeriesIterator first, DataSeriesIterator last, const DataContainer &xData,
+                               const DataContainer &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,
+            void validateRange(DataSeriesIterator first, DataSeriesIterator last, const DataContainer &xData,
-                               const QVector<QVector<double> > &valuesData)
+                               const std::vector<DataContainer> &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<DataContainer>("expectedXAxisData");
-                    QTest::addColumn<QVector<QVector<double> > >("expectedValuesData");
+                    QTest::addColumn<std::vector<DataContainer> >("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(DataContainer, expectedXAxisData);
-                    QFETCH(QVector<QVector<double> >, expectedValuesData);
+                    QFETCH(std::vector<DataContainer>, 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");
+                QTest::addColumn<DataContainer>("xAxisData");
                 // values data
-                QTest::addColumn<QVector<double> >("valuesData");
+                QTest::addColumn<DataContainer>("valuesData");
                 // expected x-axis data
-                QTest::addColumn<QVector<double> >("expectedXAxisData");
+                QTest::addColumn<DataContainer>("expectedXAxisData");
                 // expected values data
-                QTest::addColumn<QVector<double> >("expectedValuesData");
+                QTest::addColumn<DataContainer>("expectedValuesData");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 QTest::newRow("invalidData (different sizes of vectors)")
-                    << QVector<double>{1., 2., 3., 4., 5.} << QVector<double>{100., 200., 300.}
+                    << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 200., 300.} << DataContainer{}
-                    << QVector<double>{} << QVector<double>{};
+                    << DataContainer{};
-                QTest::newRow("sortedData") << QVector<double>{1., 2., 3., 4., 5.}
+                QTest::newRow("sortedData") << DataContainer{1., 2., 3., 4., 5.}
-                                            << QVector<double>{100., 200., 300., 400., 500.}
+                                            << DataContainer{100., 200., 300., 400., 500.}
-                                            << QVector<double>{1., 2., 3., 4., 5.}
+                                            << DataContainer{1., 2., 3., 4., 5.}
-                                            << QVector<double>{100., 200., 300., 400., 500.};
+                                            << DataContainer{100., 200., 300., 400., 500.};
-                QTest::newRow("unsortedData") << QVector<double>{5., 4., 3., 2., 1.}
+                QTest::newRow("unsortedData") << DataContainer{5., 4., 3., 2., 1.}
-                                              << QVector<double>{100., 200., 300., 400., 500.}
+                                              << DataContainer{100., 200., 300., 400., 500.}
-                                              << QVector<double>{1., 2., 3., 4., 5.}
+                                              << DataContainer{1., 2., 3., 4., 5.}
-                                              << QVector<double>{500., 400., 300., 200., 100.};
+                                              << DataContainer{500., 400., 300., 200., 100.};
                 QTest::newRow("unsortedData2")
-                    << QVector<double>{1., 4., 3., 5., 2.} << QVector<double>{100., 200., 300., 400., 500.}
+                    << DataContainer{1., 4., 3., 5., 2.} << DataContainer{100., 200., 300., 400., 500.}
-                    << QVector<double>{1., 2., 3., 4., 5.} << QVector<double>{100., 500., 300., 200., 400.};
+                    << DataContainer{1., 2., 3., 4., 5.} << DataContainer{100., 500., 300., 200., 400.};
             }
             void TestDataSeries::testCtor()
             {
                 // Creates series
-                QFETCH(QVector<double>, xAxisData);
+                QFETCH(DataContainer, xAxisData);
-                QFETCH(QVector<double>, valuesData);
+                QFETCH(DataContainer, 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(DataContainer, expectedXAxisData);
-                QFETCH(QVector<double>, expectedValuesData);
+                QFETCH(DataContainer, expectedValuesData);
                 validateRange(series->cbegin(), series->cend(), expectedXAxisData, expectedValuesData);
             }
             namespace {
-            std::shared_ptr<ScalarSeries> createScalarSeries(QVector<double> xAxisData,
+            std::shared_ptr<ScalarSeries> createScalarSeries(DataContainer xAxisData, DataContainer valuesData)
-                                                             QVector<double> valuesData)
             {
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), Unit{},
                                                       Unit{});
             }
-            std::shared_ptr<VectorSeries> createVectorSeries(QVector<double> xAxisData,
+            std::shared_ptr<VectorSeries> createVectorSeries(DataContainer xAxisData, DataContainer xValuesData,
-                                                             QVector<double> xValuesData,
+                                                             DataContainer yValuesData,
-                                                             QVector<double> yValuesData,
+                                                             DataContainer zValuesData)
-                                                             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<DataContainer>("expectedXAxisData");
-                QTest::addColumn<QVector<double> >("expectedValuesData");
+                QTest::addColumn<DataContainer>("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.}
+                    << DataContainer{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
-                    << QVector<double>{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
+                    << DataContainer{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.}
+                    << DataContainer{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
-                    << QVector<double>{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
+                    << DataContainer{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.};
-                QTest::newRow("unsortedMerge2")
+                QTest::newRow("unsortedMerge2 (merge not made because source is in the bounds of dest)")
-                    << createScalarSeries({1., 2., 8., 9., 10}, {100., 200., 300., 400., 500.})
+                    << createScalarSeries({1., 2., 8., 9., 10}, {100., 200., 800., 900., 1000.})
-                    << createScalarSeries({3., 4., 5., 6., 7.}, {600., 700., 800., 900., 1000.})
+                    << createScalarSeries({3., 4., 5., 6., 7.}, {300., 400., 500., 600., 700.})
-                    << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
+                    << DataContainer{1., 2., 8., 9., 10.} << DataContainer{100., 200., 800., 900., 1000.};
-                    << 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({3., 4., 5., 7., 8}, {300., 400., 500., 700., 800.})
-                    << createScalarSeries({6., 4., 9., 10., 1.}, {600., 700., 800., 900., 1000.})
+                    << createScalarSeries({1., 2., 3., 7., 10.}, {100., 200., 333., 777., 1000.})
-                    << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.}
+                    << DataContainer{1., 2., 3., 4., 5., 7., 8., 10.}
-                    << QVector<double>{1000., 500., 100., 700., 200., 600., 400., 300., 800., 900.};
+                    << DataContainer{100., 200., 300., 400., 500., 700., 800., 1000.};
             }
             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(DataContainer, expectedXAxisData);
-                QFETCH(QVector<double>, expectedValuesData);
+                QFETCH(DataContainer, 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.}
+                                             << 2. << 4. << DataContainer{2., 3., 4.}
-                                             << QVector<QVector<double> >{{200., 300., 400.}};
+                                             << std::vector<DataContainer>{{200., 300., 400.}};
                 QTest::newRow("purgeScalar2") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
-                                              << 0. << 2.5 << QVector<double>{1., 2.}
+                                              << 0. << 2.5 << DataContainer{1., 2.}
-                                              << QVector<QVector<double> >{{100., 200.}};
+                                              << std::vector<DataContainer>{{100., 200.}};
                 QTest::newRow("purgeScalar3") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
-                                              << 3.5 << 7. << QVector<double>{4., 5.}
+                                              << 3.5 << 7. << DataContainer{4., 5.}
-                                              << QVector<QVector<double> >{{400., 500.}};
+                                              << std::vector<DataContainer>{{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.}
+                                              << 0. << 7. << DataContainer{1., 2., 3., 4., 5.}
-                                              << QVector<QVector<double> >{{100., 200., 300., 400., 500.}};
+                                              << std::vector<DataContainer>{{100., 200., 300., 400., 500.}};
                 QTest::newRow("purgeScalar5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                     {100., 200., 300., 400., 500.})
-                                              << 5.5 << 7. << QVector<double>{}
+                                              << 5.5 << 7. << DataContainer{} << std::vector<DataContainer>{{}};
-                                              << 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.}
+                                             << 2. << 4. << DataContainer{2., 3., 4.}
-                                             << QVector<QVector<double> >{
+                                             << std::vector<DataContainer>{
                                                     {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<DataContainer>("expectedXAxisData");
-                QTest::addColumn<QVector<double> >("expectedValuesData");
+                QTest::addColumn<DataContainer>("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.}
+                                             << -1. << 3.2 << DataContainer{1., 2., 3.}
-                                             << QVector<double>{100., 200., 300.};
+                                             << DataContainer{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.}
+                                             << 1. << 4. << DataContainer{1., 2., 3., 4.}
-                                             << QVector<double>{100., 200., 300., 400.};
+                                             << DataContainer{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.}
+                                             << 1. << 3.9 << DataContainer{1., 2., 3.}
-                                             << QVector<double>{100., 200., 300.};
+                                             << DataContainer{100., 200., 300.};
                 QTest::newRow("xAxisRange4") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
-                                             << 0. << 0.9 << QVector<double>{} << QVector<double>{};
+                                             << 0. << 0.9 << DataContainer{} << DataContainer{};
                 QTest::newRow("xAxisRange5") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
-                                             << 0. << 1. << QVector<double>{1.} << QVector<double>{100.};
+                                             << 0. << 1. << DataContainer{1.} << DataContainer{100.};
                 QTest::newRow("xAxisRange6") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
-                                             << 2.1 << 6. << QVector<double>{3., 4., 5.}
+                                             << 2.1 << 6. << DataContainer{3., 4., 5.}
-                                             << QVector<double>{300., 400., 500.};
+                                             << DataContainer{300., 400., 500.};
                 QTest::newRow("xAxisRange7") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
-                                             << 6. << 9. << QVector<double>{} << QVector<double>{};
+                                             << 6. << 9. << DataContainer{} << DataContainer{};
                 QTest::newRow("xAxisRange8") << createScalarSeries({1., 2., 3., 4., 5.},
                                                                    {100., 200., 300., 400., 500.})
-                                             << 5. << 9. << QVector<double>{5.} << QVector<double>{500.};
+                                             << 5. << 9. << DataContainer{5.} << DataContainer{500.};
             }
             void TestDataSeries::testXAxisRange()
             {
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 QFETCH(double, min);
                 QFETCH(double, max);
-                QFETCH(QVector<double>, expectedXAxisData);
+                QFETCH(DataContainer, expectedXAxisData);
-                QFETCH(QVector<double>, expectedValuesData);
+                QFETCH(DataContainer, 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/tests/Data/TestOneDimArrayData.cpp +42 -42

             #include "Data/ArrayData.h"
             #include <QObject>
             #include <QtTest>
             namespace {
-            void verifyArrayData(const ArrayData<1> &arrayData, const QVector<double> &expectedData)
+            using DataContainer = std::vector<double>;
+            void verifyArrayData(const ArrayData<1> &arrayData, const DataContainer &expectedData)
             {
                 QVERIFY(std::equal(
                     arrayData.cbegin(), arrayData.cend(), expectedData.cbegin(), expectedData.cend(),
                     [](const auto &it, const auto &expectedData) { return it.at(0) == expectedData; }));
             }
             } // namespace
             class TestOneDimArrayData : public QObject {
                 Q_OBJECT
             private slots:
                 /// Tests @sa ArrayData::data()
                 void testData_data();
                 void testData();
                 /// Tests @sa ArrayData::add()
                 void testAdd_data();
                 void testAdd();
                 /// Tests @sa ArrayData::at(int index)
                 void testAt_data();
                 void testAt();
                 /// Tests @sa ArrayData::clear()
                 void testClear_data();
                 void testClear();
                 /// Tests @sa ArrayData::size()
                 void testSize_data();
                 void testSize();
                 /// Tests @sa ArrayData::sort()
                 void testSort_data();
                 void testSort();
             };
             void TestOneDimArrayData::testData_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData");    // array's data input
+                QTest::addColumn<DataContainer>("inputData");    // array's data input
-                QTest::addColumn<QVector<double> >("expectedData"); // expected data
+                QTest::addColumn<DataContainer>("expectedData"); // expected data
                 // Test cases
-                QTest::newRow("data1") << QVector<double>{1., 2., 3., 4., 5.}
+                QTest::newRow("data1") << DataContainer{1., 2., 3., 4., 5.}
-                                       << QVector<double>{1., 2., 3., 4., 5.};
+                                       << DataContainer{1., 2., 3., 4., 5.};
             }
             void TestOneDimArrayData::testData()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
-                QFETCH(QVector<double>, expectedData);
+                QFETCH(DataContainer, expectedData);
                 ArrayData<1> arrayData{inputData};
                 verifyArrayData(arrayData, expectedData);
             }
             void TestOneDimArrayData::testAdd_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData");    // array's data input
+                QTest::addColumn<DataContainer>("inputData");    // array's data input
-                QTest::addColumn<QVector<double> >("otherData");    // array data's input to merge with
+                QTest::addColumn<DataContainer>("otherData");    // array data's input to merge with
-                QTest::addColumn<bool>("prepend");                  // prepend or append merge
+                QTest::addColumn<bool>("prepend");               // prepend or append merge
-                QTest::addColumn<QVector<double> >("expectedData"); // expected data after merge
+                QTest::addColumn<DataContainer>("expectedData"); // expected data after merge
                 // Test cases
-                QTest::newRow("appendMerge") << QVector<double>{1., 2., 3., 4., 5.}
+                QTest::newRow("appendMerge") << DataContainer{1., 2., 3., 4., 5.} << DataContainer{6., 7., 8.}
-                                             << QVector<double>{6., 7., 8.} << false
+                                             << false << DataContainer{1., 2., 3., 4., 5., 6., 7., 8.};
-                                             << QVector<double>{1., 2., 3., 4., 5., 6., 7., 8.};
+                QTest::newRow("prependMerge") << DataContainer{1., 2., 3., 4., 5.} << DataContainer{6., 7., 8.}
-                QTest::newRow("prependMerge") << QVector<double>{1., 2., 3., 4., 5.}
+                                              << true << DataContainer{6., 7., 8., 1., 2., 3., 4., 5.};
-                                              << QVector<double>{6., 7., 8.} << true
-                                              << QVector<double>{6., 7., 8., 1., 2., 3., 4., 5.};
             }
             void TestOneDimArrayData::testAdd()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
-                QFETCH(QVector<double>, otherData);
+                QFETCH(DataContainer, otherData);
                 QFETCH(bool, prepend);
-                QFETCH(QVector<double>, expectedData);
+                QFETCH(DataContainer, expectedData);
                 ArrayData<1> arrayData{inputData};
                 ArrayData<1> other{otherData};
                 arrayData.add(other, prepend);
                 verifyArrayData(arrayData, expectedData);
             }
             void TestOneDimArrayData::testAt_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData"); // array data's input
+                QTest::addColumn<DataContainer>("inputData"); // array data's input
-                QTest::addColumn<int>("index");                  // index to retrieve data
+                QTest::addColumn<int>("index");               // index to retrieve data
-                QTest::addColumn<double>("expectedData");        // expected data at index
+                QTest::addColumn<double>("expectedData");     // expected data at index
                 // Test cases
-                QTest::newRow("data1") << QVector<double>{1., 2., 3., 4., 5.} << 0 << 1.;
+                QTest::newRow("data1") << DataContainer{1., 2., 3., 4., 5.} << 0 << 1.;
-                QTest::newRow("data2") << QVector<double>{1., 2., 3., 4., 5.} << 3 << 4.;
+                QTest::newRow("data2") << DataContainer{1., 2., 3., 4., 5.} << 3 << 4.;
             }
             void TestOneDimArrayData::testAt()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
                 QFETCH(int, index);
                 QFETCH(double, expectedData);
                 ArrayData<1> arrayData{inputData};
                 QVERIFY(arrayData.at(index) == expectedData);
             }
             void TestOneDimArrayData::testClear_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData"); // array data's input
+                QTest::addColumn<DataContainer>("inputData"); // array data's input
                 // Test cases
-                QTest::newRow("data1") << QVector<double>{1., 2., 3., 4., 5.};
+                QTest::newRow("data1") << DataContainer{1., 2., 3., 4., 5.};
             }
             void TestOneDimArrayData::testClear()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
                 ArrayData<1> arrayData{inputData};
                 arrayData.clear();
-                verifyArrayData(arrayData, QVector<double>{});
+                verifyArrayData(arrayData, DataContainer{});
             }
             void TestOneDimArrayData::testSize_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData"); // array data's input
+                QTest::addColumn<DataContainer>("inputData"); // array data's input
-                QTest::addColumn<int>("expectedSize");           // expected array data size
+                QTest::addColumn<int>("expectedSize");        // expected array data size
                 // Test cases
-                QTest::newRow("data1") << QVector<double>{1., 2., 3., 4., 5.} << 5;
+                QTest::newRow("data1") << DataContainer{1., 2., 3., 4., 5.} << 5;
             }
             void TestOneDimArrayData::testSize()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
                 QFETCH(int, expectedSize);
                 ArrayData<1> arrayData{inputData};
                 QVERIFY(arrayData.size() == expectedSize);
             }
             void TestOneDimArrayData::testSort_data()
             {
                 // Test structure
-                QTest::addColumn<QVector<double> >("inputData");        // array data's input
+                QTest::addColumn<DataContainer>("inputData");           // array data's input
                 QTest::addColumn<std::vector<int> >("sortPermutation"); // permutation used to sort data
-                QTest::addColumn<QVector<double> >("expectedData");     // expected data after sorting
+                QTest::addColumn<DataContainer>("expectedData");        // expected data after sorting
                 // Test cases
-                QTest::newRow("data1") << QVector<double>{1., 2., 3., 4., 5.} << std::vector<int>{0, 2, 3, 1, 4}
+                QTest::newRow("data1") << DataContainer{1., 2., 3., 4., 5.} << std::vector<int>{0, 2, 3, 1, 4}
-                                       << QVector<double>{1., 3., 4., 2., 5.};
+                                       << DataContainer{1., 3., 4., 2., 5.};
-                QTest::newRow("data2") << QVector<double>{1., 2., 3., 4., 5.} << std::vector<int>{4, 1, 2, 3, 0}
+                QTest::newRow("data2") << DataContainer{1., 2., 3., 4., 5.} << std::vector<int>{4, 1, 2, 3, 0}
-                                       << QVector<double>{5., 2., 3., 4., 1.};
+                                       << DataContainer{5., 2., 3., 4., 1.};
             }
             void TestOneDimArrayData::testSort()
             {
-                QFETCH(QVector<double>, inputData);
+                QFETCH(DataContainer, inputData);
                 QFETCH(std::vector<int>, sortPermutation);
-                QFETCH(QVector<double>, expectedData);
+                QFETCH(DataContainer, expectedData);
                 ArrayData<1> arrayData{inputData};
                 auto sortedArrayData = arrayData.sort(sortPermutation);
                 QVERIFY(sortedArrayData != nullptr);
                 verifyArrayData(*sortedArrayData, expectedData);
             }
             QTEST_MAIN(TestOneDimArrayData)
             #include "TestOneDimArrayData.moc"

core/tests/Data/TestTwoDimArrayData.cpp +9 -8

             #include "Data/ArrayData.h"
             #include <QObject>
             #include <QtTest>
-            using Container = QVector<QVector<double> >;
+            using DataContainer = std::vector<double>;
-            using InputData = QPair<QVector<double>, int>;
+            using Container = std::vector<DataContainer>;
+            using InputData = QPair<DataContainer, int>;
             namespace {
             InputData flatten(const Container &container)
             {
-                if (container.isEmpty()) {
+                if (container.empty()) {
                     return {};
                 }
                 // We assume here that each component of the container have the same size
                 auto containerSize = container.size();
-                auto componentSize = container.first().size();
+                auto componentSize = container.front().size();
-                auto result = QVector<double>{};
+                auto result = DataContainer{};
                 result.reserve(componentSize * containerSize);
                 for (auto i = 0; i < componentSize; ++i) {
                     for (auto j = 0; j < containerSize; ++j) {
-                        result.append(container.at(j).at(i));
+                        result.push_back(container.at(j).at(i));
                     }
                 }
-                return {result, containerSize};
+                return {result, static_cast<int>(containerSize)};
             }
             void verifyArrayData(const ArrayData<2> &arrayData, const Container &expectedData)
             {
                 auto verifyComponent = [&arrayData](const auto &componentData, const auto &equalFun) {
                     QVERIFY(std::equal(arrayData.cbegin(), arrayData.cend(), componentData.cbegin(),
                                        componentData.cend(),
                                        [&equalFun](const auto &dataSeriesIt, const auto &expectedValue) {
                                            return equalFun(dataSeriesIt, expectedValue);
                                        }));
                 };
                 for (auto i = 0; i < expectedData.size(); ++i) {
                     verifyComponent(expectedData.at(i), [i](const auto &seriesIt, const auto &value) {
                         return seriesIt.at(i) == value;
                     });
                 }
             }
             } // namespace
             class TestTwoDimArrayData : public QObject {
                 Q_OBJECT
             private slots:
                 /// Tests @sa ArrayData ctor
                 void testCtor_data();
                 void testCtor();
                 /// Tests @sa ArrayData::add()
                 void testAdd_data();
                 void testAdd();
                 /// Tests @sa ArrayData::clear()
                 void testClear_data();
                 void testClear();
                 /// Tests @sa ArrayData::size()
                 void testSize_data();
                 void testSize();
                 /// Tests @sa ArrayData::sort()
                 void testSort_data();
                 void testSort();
             };
             void TestTwoDimArrayData::testCtor_data()
             {
                 // Test structure
                 QTest::addColumn<InputData>("inputData");    // array data's input
                 QTest::addColumn<bool>("success");           // array data has been successfully constructed
                 QTest::addColumn<Container>("expectedData"); // expected array data (when success)
                 // Test cases
                 QTest::newRow("validInput") << flatten(Container{{1., 2., 3., 4., 5.},
                                                                  {6., 7., 8., 9., 10.},
                                                                  {11., 12., 13., 14., 15.}})
                                             << true << Container{{1., 2., 3., 4., 5.},
                                                                  {6., 7., 8., 9., 10.},
                                                                  {11., 12., 13., 14., 15.}};
                 QTest::newRow("invalidInput (invalid data size")
                     << InputData{{1., 2., 3., 4., 5., 6., 7.}, 3} << false << Container{{}, {}, {}};
                 QTest::newRow("invalidInput (less than two components")
                     << flatten(Container{{1., 2., 3., 4., 5.}}) << false << Container{{}, {}, {}};
             }
             void TestTwoDimArrayData::testCtor()
             {
                 QFETCH(InputData, inputData);
                 QFETCH(bool, success);
                 if (success) {
                     QFETCH(Container, expectedData);
                     ArrayData<2> arrayData{inputData.first, inputData.second};
                     verifyArrayData(arrayData, expectedData);
                 }
                 else {
                     QVERIFY_EXCEPTION_THROWN(ArrayData<2>(inputData.first, inputData.second),
                                              std::invalid_argument);
                 }
             }
             void TestTwoDimArrayData::testAdd_data()
             {
                 // Test structure
                 QTest::addColumn<InputData>("inputData");    // array's data input
                 QTest::addColumn<InputData>("otherData");    // array data's input to merge with
                 QTest::addColumn<bool>("prepend");           // prepend or append merge
                 QTest::addColumn<Container>("expectedData"); // expected data after merge
                 // Test cases
                 auto inputData = flatten(
                     Container{{1., 2., 3., 4., 5.}, {11., 12., 13., 14., 15.}, {21., 22., 23., 24., 25.}});
                 auto vectorContainer = flatten(Container{{6., 7., 8.}, {16., 17., 18.}, {26., 27., 28}});
                 auto tensorContainer = flatten(Container{{6., 7., 8.},
                                                          {16., 17., 18.},
                                                          {26., 27., 28},
                                                          {36., 37., 38.},
                                                          {46., 47., 48.},
                                                          {56., 57., 58}});
                 QTest::newRow("appendMerge") << inputData << vectorContainer << false
                                              << Container{{1., 2., 3., 4., 5., 6., 7., 8.},
                                                           {11., 12., 13., 14., 15., 16., 17., 18.},
                                                           {21., 22., 23., 24., 25., 26., 27., 28}};
                 QTest::newRow("prependMerge") << inputData << vectorContainer << true
                                               << Container{{6., 7., 8., 1., 2., 3., 4., 5.},
                                                            {16., 17., 18., 11., 12., 13., 14., 15.},
                                                            {26., 27., 28, 21., 22., 23., 24., 25.}};
                 QTest::newRow("invalidMerge") << inputData << tensorContainer << false
                                               << Container{{1., 2., 3., 4., 5.},
                                                            {11., 12., 13., 14., 15.},
                                                            {21., 22., 23., 24., 25.}};
             }
             void TestTwoDimArrayData::testAdd()
             {
                 QFETCH(InputData, inputData);
                 QFETCH(InputData, otherData);
                 QFETCH(bool, prepend);
                 QFETCH(Container, expectedData);
                 ArrayData<2> arrayData{inputData.first, inputData.second};
                 ArrayData<2> other{otherData.first, otherData.second};
                 arrayData.add(other, prepend);
                 verifyArrayData(arrayData, expectedData);
             }
             void TestTwoDimArrayData::testClear_data()
             {
                 // Test structure
                 QTest::addColumn<InputData>("inputData"); // array data's input
                 // Test cases
                 QTest::newRow("data1") << flatten(
                     Container{{1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.}, {11., 12., 13., 14., 15.}});
             }
             void TestTwoDimArrayData::testClear()
             {
                 QFETCH(InputData, inputData);
                 ArrayData<2> arrayData{inputData.first, inputData.second};
                 arrayData.clear();
-                auto emptyData = Container(inputData.second, QVector<double>{});
+                auto emptyData = Container(inputData.second, DataContainer{});
                 verifyArrayData(arrayData, emptyData);
             }
             void TestTwoDimArrayData::testSize_data()
             {
                 // Test structure
                 QTest::addColumn<InputData>("inputData"); // array data's input
                 QTest::addColumn<int>("expectedSize");    // expected array data size
                 // Test cases
                 QTest::newRow("data1") << flatten(Container{{1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.}}) << 5;
                 QTest::newRow("data2") << flatten(Container{{1., 2., 3., 4., 5.},
                                                             {6., 7., 8., 9., 10.},
                                                             {11., 12., 13., 14., 15.}})
                                        << 5;
             }
             void TestTwoDimArrayData::testSize()
             {
                 QFETCH(InputData, inputData);
                 QFETCH(int, expectedSize);
                 ArrayData<2> arrayData{inputData.first, inputData.second};
                 QVERIFY(arrayData.size() == expectedSize);
             }
             void TestTwoDimArrayData::testSort_data()
             {
                 // Test structure
                 QTest::addColumn<InputData>("inputData");               // array data's input
                 QTest::addColumn<std::vector<int> >("sortPermutation"); // permutation used to sort data
                 QTest::addColumn<Container>("expectedData");            // expected data after sorting
                 // Test cases
                 QTest::newRow("data1")
                     << flatten(
                            Container{{1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.}, {11., 12., 13., 14., 15.}})
                     << std::vector<int>{0, 2, 3, 1, 4}
                     << Container{{1., 3., 4., 2., 5.}, {6., 8., 9., 7., 10.}, {11., 13., 14., 12., 15.}};
                 QTest::newRow("data2")
                     << flatten(
                            Container{{1., 2., 3., 4., 5.}, {6., 7., 8., 9., 10.}, {11., 12., 13., 14., 15.}})
                     << std::vector<int>{2, 4, 3, 0, 1}
                     << Container{{3., 5., 4., 1., 2.}, {8., 10., 9., 6., 7.}, {13., 15., 14., 11., 12.}};
             }
             void TestTwoDimArrayData::testSort()
             {
                 QFETCH(InputData, inputData);
                 QFETCH(std::vector<int>, sortPermutation);
                 QFETCH(Container, expectedData);
                 ArrayData<2> arrayData{inputData.first, inputData.second};
                 auto sortedArrayData = arrayData.sort(sortPermutation);
                 QVERIFY(sortedArrayData != nullptr);
                 verifyArrayData(*sortedArrayData, expectedData);
             }
             QTEST_MAIN(TestTwoDimArrayData)
             #include "TestTwoDimArrayData.moc"

plugins/amda/src/AmdaResultParser.cpp +8 -7

             #include "AmdaResultParser.h"
             #include <Common/DateUtils.h>
             #include <Data/ScalarSeries.h>
             #include <Data/VectorSeries.h>
             #include <QDateTime>
             #include <QFile>
             #include <QRegularExpression>
             #include <cmath>
             Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
             namespace {
             /// Message in result file when the file was not found on server
             const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
             /// Format for dates in result files
             const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
             /// Separator between values in a result line
             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
             /// Regex to find unit in a line. Examples of valid lines:
             /// ... - Units : nT - ...
             /// ... -Units:nT- ...
             /// ... -Units:   m²- ...
             /// ... - Units : m/s - ...
             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
             /// Converts a string date to a double date
             /// @return a double that represents the date in seconds, NaN if the string date can't be converted
             double doubleDate(const QString &stringDate) noexcept
             {
                 auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
                 dateTime.setTimeSpec(Qt::UTC);
                 return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
                                           : std::numeric_limits<double>::quiet_NaN();
             }
             /// Checks if a line is a comment line
             bool isCommentLine(const QString &line)
             {
                 return line.startsWith("#");
             }
             /// @return the number of lines to be read depending on the type of value passed in parameter
             int nbValues(AmdaResultParser::ValueType valueType) noexcept
             {
                 switch (valueType) {
                     case AmdaResultParser::ValueType::SCALAR:
                         return 1;
                     case AmdaResultParser::ValueType::VECTOR:
                         return 3;
                     case AmdaResultParser::ValueType::UNKNOWN:
                         // Invalid case
                         break;
                 }
                 // Invalid cases
                 qCCritical(LOG_AmdaResultParser())
                     << QObject::tr("Can't get the number of values to read: unsupported type");
                 return 0;
             }
             /**
              * Reads stream to retrieve x-axis unit
              * @param stream the stream to read
              * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
              * error occured during reading
              */
             Unit readXAxisUnit(QTextStream &stream)
             {
                 QString line{};
                 // Searches unit in the comment lines
                 while (stream.readLineInto(&line) && isCommentLine(line)) {
                     auto match = UNIT_REGEX.match(line);
                     if (match.hasMatch()) {
                         return Unit{match.captured(1), true};
                     }
                 }
                 qCWarning(LOG_AmdaResultParser()) << QObject::tr("The unit could not be found in the file");
                 // Error cases
                 return Unit{{}, true};
             }
             /**
              * Reads stream to retrieve results
              * @param stream the stream to read
              * @return the pair of vectors x-axis data/values data that has been read in the stream
              */
             QPair<QVector<double>, QVector<QVector<double> > >
             readResults(QTextStream &stream, AmdaResultParser::ValueType valueType)
             {
                 auto expectedNbValues = nbValues(valueType);
                 auto xData = QVector<double>{};
                 auto valuesData = QVector<QVector<double> >(expectedNbValues);
                 QString line{};
                 while (stream.readLineInto(&line)) {
                     // Ignore comment lines
                     if (!isCommentLine(line)) {
                         auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
                         if (lineData.size() == expectedNbValues + 1) {
                             // X : the data is converted from date to double (in secs)
                             auto x = doubleDate(lineData.at(0));
                             // Adds result only if x is valid. Then, if value is invalid, it is set to NaN
                             if (!std::isnan(x)) {
                                 xData.push_back(x);
                                 // Values
                                 for (auto valueIndex = 0; valueIndex < expectedNbValues; ++valueIndex) {
                                     auto column = valueIndex + 1;
                                     bool valueOk;
                                     auto value = lineData.at(column).toDouble(&valueOk);
                                     if (!valueOk) {
                                         qCWarning(LOG_AmdaResultParser())
                                             << QObject::tr(
                                                    "Value from (line %1, column %2) is invalid and will be "
                                                    "converted to NaN")
                                                    .arg(line, column);
                                         value = std::numeric_limits<double>::quiet_NaN();
                                     }
                                     valuesData[valueIndex].append(value);
                                 }
                             }
                             else {
                                 qCWarning(LOG_AmdaResultParser())
                                     << QObject::tr("Can't retrieve results from line %1: x is invalid")
                                            .arg(line);
                             }
                         }
                         else {
                             qCWarning(LOG_AmdaResultParser())
                                 << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
                         }
                     }
                 }
                 return qMakePair(std::move(xData), std::move(valuesData));
             }
             } // namespace
             std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath,
                                                                    ValueType valueType) noexcept
             {
                 if (valueType == ValueType::UNKNOWN) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data: the type of values to be read is unknown");
                     return nullptr;
                 }
                 QFile file{filePath};
                 if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data from file %1: %2")
                                .arg(filePath, file.errorString());
                     return nullptr;
                 }
                 QTextStream stream{&file};
                 // Checks if the file was found on the server
                 auto firstLine = stream.readLine();
                 if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
                                .arg(filePath);
                     return nullptr;
                 }
                 // Reads x-axis unit
                 stream.seek(0); // returns to the beginning of the file
                 auto xAxisUnit = readXAxisUnit(stream);
                 // Reads results
                 stream.seek(0); // returns to the beginning of the file
                 auto results = readResults(stream, valueType);
                 // Creates data series
                 switch (valueType) {
                     case ValueType::SCALAR:
                         Q_ASSERT(results.second.size() == 1);
                         return std::make_shared<ScalarSeries>(
-                            std::move(results.first), std::move(results.second.takeFirst()), xAxisUnit, Unit{});
+                            std::move(results.first.toStdVector()),
+                            std::move(results.second.takeFirst().toStdVector()), xAxisUnit, Unit{});
                     case ValueType::VECTOR: {
                         Q_ASSERT(results.second.size() == 3);
-                        auto xValues = results.second.takeFirst();
+                        auto xValues = results.second.takeFirst().toStdVector();
-                        auto yValues = results.second.takeFirst();
+                        auto yValues = results.second.takeFirst().toStdVector();
-                        auto zValues = results.second.takeFirst();
+                        auto zValues = results.second.takeFirst().toStdVector();
-                        return std::make_shared<VectorSeries>(std::move(results.first), std::move(xValues),
+                        return std::make_shared<VectorSeries>(std::move(results.first.toStdVector()),
-                                                              std::move(yValues), std::move(zValues), xAxisUnit,
+                                                              std::move(xValues), std::move(yValues),
-                                                              Unit{});
+                                                              std::move(zValues), xAxisUnit, Unit{});
                     }
                     case ValueType::UNKNOWN:
                         // Invalid case
                         break;
                 }
                 // Invalid cases
                 qCCritical(LOG_AmdaResultParser())
                     << QObject::tr("Can't create data series: unsupported value type");
                 return nullptr;
             }

plugins/mockplugin/src/CosinusProvider.cpp +5 -5

             #include "CosinusProvider.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
             #include <cmath>
             #include <QFuture>
             #include <QThread>
             #include <QtConcurrent/QtConcurrent>
             Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
             std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier,
                                                                        const SqpRange &dataRangeRequested)
             {
                 // TODO: Add Mutex
                 auto dataIndex = 0;
                 // Gets the timerange from the parameters
-                double freq = 1.0;
+                double freq = 100.0;
                 double start = std::ceil(dataRangeRequested.m_TStart * freq); // 100 htz
                 double end = std::floor(dataRangeRequested.m_TEnd * freq);    // 100 htz
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second)
                 auto dataCount = end - start;
-                auto xAxisData = QVector<double>{};
+                auto xAxisData = std::vector<double>{};
                 xAxisData.resize(dataCount);
-                auto valuesData = QVector<double>{};
+                auto valuesData = std::vector<double>{};
                 valuesData.resize(dataCount);
                 int progress = 0;
                 auto progressEnd = dataCount;
                 for (auto time = start; time < end; ++time, ++dataIndex) {
                     auto it = m_VariableToEnableProvider.find(acqIdentifier);
                     if (it != m_VariableToEnableProvider.end() && it.value()) {
                         const auto timeOnFreq = time / freq;
-                        xAxisData.replace(dataIndex, timeOnFreq);
+                        xAxisData[dataIndex] = timeOnFreq;
-                        valuesData.replace(dataIndex, std::cos(timeOnFreq));
+                        valuesData[dataIndex] = std::cos(timeOnFreq);
                         // progression
                         int currentProgress = (time - start) * 100.0 / progressEnd;
                         if (currentProgress != progress) {
                             progress = currentProgress;
                             emit dataProvidedProgress(acqIdentifier, progress);
                         }
                     }
                     else {
                         if (!it.value()) {
                             qCDebug(LOG_CosinusProvider())
                                 << "CosinusProvider::retrieveData: ARRET De l'acquisition detecté"
                                 << end - time;
                         }
                     }
                 }
                 emit dataProvidedProgress(acqIdentifier, 0.0);
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
                                                       Unit{QStringLiteral("t"), true}, Unit{});
             }
             void CosinusProvider::requestDataLoading(QUuid acqIdentifier,
                                                      const DataProviderParameters &parameters)
             {
                 // TODO: Add Mutex
                 m_VariableToEnableProvider[acqIdentifier] = true;
                 qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::requestDataLoading"
                                                << QThread::currentThread()->objectName();
                 // NOTE: Try to use multithread if possible
                 const auto times = parameters.m_Times;
                 for (const auto &dateTime : qAsConst(times)) {
                     if (m_VariableToEnableProvider[acqIdentifier]) {
                         auto scalarSeries = this->retrieveData(acqIdentifier, dateTime);
                         qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided";
                         emit dataProvided(acqIdentifier, scalarSeries, dateTime);
                     }
                 }
             }
             void CosinusProvider::requestDataAborting(QUuid acqIdentifier)
             {
                 // TODO: Add Mutex
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << acqIdentifier
                                                << QThread::currentThread()->objectName();
                 auto it = m_VariableToEnableProvider.find(acqIdentifier);
                 if (it != m_VariableToEnableProvider.end()) {
                     it.value() = false;
                 }
                 else {
                     qCWarning(LOG_CosinusProvider())
                         << tr("Aborting progression of inexistant identifier detected !!!");
                 }
             }

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