GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r864:551a1137cf04

Minor changes...

Alexandre Leroux -

r864:551a1137cf04

parent child

Context file:

r864:551a1137cf04

Collapse all files

core/include/Data/Unit.h created 644 +23 0

@@ -0,0 +1,23
	1	#ifndef SCIQLOP_UNIT_H
	2	#define SCIQLOP_UNIT_H
	3
	4	#include <QString>
	5	#include <tuple>
	6
	7	struct Unit {
	8	explicit Unit(const QString &name = {}, bool timeUnit = false)
	9	: m_Name{name}, m_TimeUnit{timeUnit}
	10	{
	11	}
	12
	13	inline bool operator==(const Unit &other) const
	14	{
	15	return std::tie(m_Name, m_TimeUnit) == std::tie(other.m_Name, other.m_TimeUnit);
	16	}
	17	inline bool operator!=(const Unit &other) const { return !(*this == other); }
	18
	19	QString m_Name; ///< Unit name
	20	bool m_TimeUnit; ///< The unit is a unit of time (UTC)
	21	};
	22
	23	#endif // SCIQLOP_UNIT_H

core/include/Data/ArrayData.h 0 -1

             #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 = 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();
                     result->next(offset);
                     return result;
                 }
                 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;
                     }
                     insert(other.cbegin(), other.cend(), prepend);
                 }
                 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;
                 }
                 /// @return the total size (i.e. number of values) of the array data
                 int totalSize() const
                 {
                     QReadLocker locker{&m_Lock};
                     return m_Data.size();
                 }
                 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);
                     }
                 }
                 void insert(ArrayDataIterator first, ArrayDataIterator last, bool prepend = false)
                 {
                     auto firstImpl = dynamic_cast<arraydata_detail::IteratorValue<Dim, true> *>(first->impl());
                     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> >
                 DataContainer cdata() const noexcept
                 {
                     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/DataSeries.h +1 -1

             #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();
                     result->next(offset);
                     return result;
                 }
                 void next(int offset) override
                 {
                     m_XIt->next(offset);
                     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:
                 /// @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; }
-                int nbPoints() const override { return m_XAxisData->totalSize() + m_ValuesData->totalSize(); }
+                int nbPoints() const override { return m_ValuesData->totalSize(); }
                 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(
                         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(); }
             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/IDataSeries.h +1 -16

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

core/tests/Variable/TestVariable.cpp +5 -5

             #include <Variable/Variable.h>
             #include <Data/ScalarSeries.h>
             #include <QObject>
             #include <QtTest>
             #include <memory>
             namespace {
             /// Generates a date in double
             auto date = [](int year, int month, int day, int hours, int minutes, int seconds) {
                 return DateUtils::secondsSinceEpoch(
                     QDateTime{{year, month, day}, {hours, minutes, seconds}, Qt::UTC});
             };
             /// Generates a series of test data for a range
             std::shared_ptr<ScalarSeries> dataSeries(const SqpRange &range)
             {
                 auto xAxisData = std::vector<double>{};
                 auto valuesData = std::vector<double>{};
                 auto value = 0;
                 for (auto x = range.m_TStart; x <= range.m_TEnd; ++x, ++value) {
                     xAxisData.push_back(x);
                     valuesData.push_back(value);
                 }
                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), Unit{},
                                                       Unit{});
             }
             } // namespace
             Q_DECLARE_METATYPE(std::shared_ptr<ScalarSeries>)
             class TestVariable : public QObject {
                 Q_OBJECT
             private slots:
                 void testClone_data();
                 void testClone();
                 void testNotInCacheRangeList();
                 void testInCacheRangeList();
                 void testNbPoints_data();
                 void testNbPoints();
                 void testRealRange_data();
                 void testRealRange();
             };
             void TestVariable::testClone_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 QTest::addColumn<QString>("name");
                 QTest::addColumn<QVariantHash>("metadata");
                 QTest::addColumn<SqpRange>("range");
                 QTest::addColumn<SqpRange>("cacheRange");
                 QTest::addColumn<std::shared_ptr<ScalarSeries> >("dataSeries");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 13, 0, 0)};
                 QTest::newRow("clone1") << QStringLiteral("var1")
                                         << QVariantHash{{"data1", 1}, {"data2", "abc"}}
                                         << SqpRange{date(2017, 1, 1, 12, 30, 0), (date(2017, 1, 1, 12, 45, 0))}
                                         << cacheRange << dataSeries(cacheRange);
             }
             void TestVariable::testClone()
             {
                 // Creates variable
                 QFETCH(QString, name);
                 QFETCH(QVariantHash, metadata);
                 QFETCH(SqpRange, range);
                 QFETCH(SqpRange, cacheRange);
                 QFETCH(std::shared_ptr<ScalarSeries>, dataSeries);
                 Variable variable{name, metadata};
                 variable.setRange(range);
                 variable.setCacheRange(cacheRange);
                 variable.mergeDataSeries(dataSeries);
                 // Clones variable
                 auto clone = variable.clone();
                 // Checks cloned variable's state
                 QCOMPARE(clone->name(), name);
                 QCOMPARE(clone->metadata(), metadata);
                 QCOMPARE(clone->range(), range);
                 QCOMPARE(clone->cacheRange(), cacheRange);
                 // Compares data series
                 if (dataSeries != nullptr) {
                     QVERIFY(clone->dataSeries() != nullptr);
                     QVERIFY(std::equal(dataSeries->cbegin(), dataSeries->cend(), clone->dataSeries()->cbegin(),
                                        clone->dataSeries()->cend(), [](const auto &it1, const auto &it2) {
                                            return it1.x() == it2.x() && it1.value() == it2.value();
                                        }));
                 }
                 else {
                     QVERIFY(clone->dataSeries() == nullptr);
                 }
             }
             void TestVariable::testNotInCacheRangeList()
             {
                 auto varRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 auto varRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 40, 0}};
                 auto sqpR = SqpRange{DateUtils::secondsSinceEpoch(varRS), DateUtils::secondsSinceEpoch(varRE)};
                 auto varCRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto varCRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqpCR
                     = SqpRange{DateUtils::secondsSinceEpoch(varCRS), DateUtils::secondsSinceEpoch(varCRE)};
                 Variable var{"Var test"};
                 var.setRange(sqpR);
                 var.setCacheRange(sqpCR);
                 // 1: [ts,te] < varTS
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 auto sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 auto notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 auto notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 2: ts < varTS < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRS));
                 // 3: varTS < ts < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 4: varTS < ts < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRE));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 5: varTS < varTE < ts < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 6: ts <varTS < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideNotInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 2);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRS));
                 notInCachRange = notInCach[1];
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRE));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
             }
             void TestVariable::testInCacheRangeList()
             {
                 auto varRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 auto varRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 40, 0}};
                 auto sqpR = SqpRange{DateUtils::secondsSinceEpoch(varRS), DateUtils::secondsSinceEpoch(varRE)};
                 auto varCRS = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto varCRE = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto sqpCR
                     = SqpRange{DateUtils::secondsSinceEpoch(varCRS), DateUtils::secondsSinceEpoch(varCRE)};
                 Variable var{"Var test"};
                 var.setRange(sqpR);
                 var.setCacheRange(sqpCR);
                 // 1: [ts,te] < varTS
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 auto sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 auto notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 2: ts < varTS < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 auto notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRS));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 3: varTS < ts < te < varTE
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(te));
                 // 4: varTS < ts < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(ts));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRE));
                 // 5: varTS < varTE < ts < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 20, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 0);
                 // 6: ts <varTS < varTE < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 sqp = SqpRange{DateUtils::secondsSinceEpoch(ts), DateUtils::secondsSinceEpoch(te)};
                 notInCach = var.provideInCacheRangeList(sqp);
                 QCOMPARE(notInCach.size(), 1);
                 notInCachRange = notInCach.first();
                 QCOMPARE(notInCachRange.m_TStart, DateUtils::secondsSinceEpoch(varCRS));
                 QCOMPARE(notInCachRange.m_TEnd, DateUtils::secondsSinceEpoch(varCRE));
             }
             namespace {
             /// Struct used to represent an operation for @sa TestVariable::testNbPoints()
             struct NbPointsOperation {
                 SqpRange m_CacheRange;                      /// Range to set for the variable
                 std::shared_ptr<ScalarSeries> m_DataSeries; /// Series to merge in the variable
                 int m_ExpectedNbPoints; /// Number of points in the variable expected after operation
             };
             using NbPointsOperations = std::vector<NbPointsOperation>;
             } // namespace
             Q_DECLARE_METATYPE(NbPointsOperations)
             void TestVariable::testNbPoints_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 QTest::addColumn<NbPointsOperations>("operations");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 NbPointsOperations operations{};
-                // Sets cache range (expected nb points = series xAxis data + series values data)
+                // Sets cache range (expected nb points = values data)
                 auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 9)};
-                operations.push_back({cacheRange, dataSeries(cacheRange), 20});
+                operations.push_back({cacheRange, dataSeries(cacheRange), 10});
                 // Doubles cache but don't add data series (expected nb points don't change)
                 cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 19)};
-                operations.push_back({cacheRange, dataSeries(INVALID_RANGE), 20});
+                operations.push_back({cacheRange, dataSeries(INVALID_RANGE), 10});
                 // Doubles cache and data series (expected nb points change)
                 cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 12, 0, 19)};
-                operations.push_back({cacheRange, dataSeries(cacheRange), 40});
+                operations.push_back({cacheRange, dataSeries(cacheRange), 20});
                 // Decreases cache (expected nb points decreases as the series is purged)
                 cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 5), date(2017, 1, 1, 12, 0, 9)};
-                operations.push_back({cacheRange, dataSeries(INVALID_RANGE), 10});
+                operations.push_back({cacheRange, dataSeries(INVALID_RANGE), 5});
                 QTest::newRow("nbPoints1") << operations;
             }
             void TestVariable::testNbPoints()
             {
                 // Creates variable
                 Variable variable{"var"};
                 QCOMPARE(variable.nbPoints(), 0);
                 QFETCH(NbPointsOperations, operations);
                 for (const auto &operation : operations) {
                     // Sets cache range and merge data series
                     variable.setCacheRange(operation.m_CacheRange);
                     if (operation.m_DataSeries != nullptr) {
                         variable.mergeDataSeries(operation.m_DataSeries);
                     }
                     // Checks nb points
                     QCOMPARE(variable.nbPoints(), operation.m_ExpectedNbPoints);
                 }
             }
             namespace {
             /// Struct used to represent a range operation on a variable
             /// @sa TestVariable::testRealRange()
             struct RangeOperation {
                 SqpRange m_CacheRange;                      /// Range to set for the variable
                 std::shared_ptr<ScalarSeries> m_DataSeries; /// Series to merge in the variable
                 SqpRange m_ExpectedRealRange; /// Real Range expected after operation on the variable
             };
             using RangeOperations = std::vector<RangeOperation>;
             } // namespace
             Q_DECLARE_METATYPE(RangeOperations)
             void TestVariable::testRealRange_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 QTest::addColumn<RangeOperations>("operations");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 RangeOperations operations{};
                 // Inits cache range and data series (expected real range = cache range)
                 auto cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 13, 0, 0)};
                 operations.push_back({cacheRange, dataSeries(cacheRange), cacheRange});
                 // Changes cache range and updates data series (expected real range = cache range)
                 cacheRange = SqpRange{date(2017, 1, 1, 14, 0, 0), date(2017, 1, 1, 15, 0, 0)};
                 operations.push_back({cacheRange, dataSeries(cacheRange), cacheRange});
                 // Changes cache range and update data series but with a lower range (expected real range =
                 // data series range)
                 cacheRange = SqpRange{date(2017, 1, 1, 12, 0, 0), date(2017, 1, 1, 16, 0, 0)};
                 auto dataSeriesRange = SqpRange{date(2017, 1, 1, 14, 0, 0), date(2017, 1, 1, 15, 0, 0)};
                 operations.push_back({cacheRange, dataSeries(dataSeriesRange), dataSeriesRange});
                 // Changes cache range but DON'T update data series (expected real range = cache range
                 // before operation)
                 cacheRange = SqpRange{date(2017, 1, 1, 10, 0, 0), date(2017, 1, 1, 17, 0, 0)};
                 operations.push_back({cacheRange, nullptr, dataSeriesRange});
                 QTest::newRow("realRange1") << operations;
             }
             void TestVariable::testRealRange()
             {
                 // Creates variable (real range is invalid)
                 Variable variable{"var"};
                 QCOMPARE(variable.realRange(), INVALID_RANGE);
                 QFETCH(RangeOperations, operations);
                 for (const auto &operation : operations) {
                     // Sets cache range and merge data series
                     variable.setCacheRange(operation.m_CacheRange);
                     if (operation.m_DataSeries != nullptr) {
                         variable.mergeDataSeries(operation.m_DataSeries);
                     }
                     // Checks real range
                     QCOMPARE(variable.realRange(), operation.m_ExpectedRealRange);
                 }
             }
             QTEST_MAIN(TestVariable)
             #include "TestVariable.moc"

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