From 09db2d1144f040c8920020e2e6c1b4cc102481fc 2017-08-31 10:28:46
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-08-31 10:28:46
Subject: [PATCH] Adapts SqpIterator to make non-const iterators

---

diff --git a/core/include/Data/ArrayData.h b/core/include/Data/ArrayData.h
index 6a149e2..db0677b 100644
--- a/core/include/Data/ArrayData.h
+++ b/core/include/Data/ArrayData.h
@@ -39,19 +39,49 @@ struct Sort<1> {
     }
 };
 
+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;
+};
+
 template <int Dim>
+struct IteratorValueBuilder<Dim, false> {
+    using DataContainerIterator = DataContainer::iterator;
+};
+
+template <int Dim, bool IsConst>
 class IteratorValue : public ArrayDataIteratorValue::Impl {
 public:
+    friend class ArrayData<Dim>;
+    friend class IteratorValueBuilder<Dim, IsConst>;
+
+    using DataContainerIterator =
+        typename IteratorValueBuilder<Dim, IsConst>::DataContainerIterator;
+
+    template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
     explicit IteratorValue(const DataContainer &container, int nbComponents, bool begin)
             : m_It{begin ? container.cbegin() : container.cend()}, m_NbComponents{nbComponents}
     {
     }
 
+    template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
+    explicit IteratorValue(DataContainer &container, int nbComponents, bool begin)
+            : m_It{begin ? container.begin() : container.end()}, m_NbComponents{nbComponents}
+    {
+    }
+
     IteratorValue(const IteratorValue &other) = default;
 
     std::unique_ptr<ArrayDataIteratorValue::Impl> clone() const override
     {
-        return std::make_unique<IteratorValue<Dim> >(*this);
+        return std::make_unique<IteratorValue<Dim, IsConst> >(*this);
     }
 
     bool equals(const ArrayDataIteratorValue::Impl &other) const override try {
@@ -98,7 +128,7 @@ public:
     }
 
 private:
-    DataContainer::const_iterator m_It;
+    DataContainerIterator m_It;
     int m_NbComponents;
 };
 
@@ -223,15 +253,31 @@ public:
     // 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> >(m_Data, m_NbComponents, true)}};
+        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> >(
+            ArrayDataIteratorValue{std::make_unique<arraydata_detail::IteratorValue<Dim, true> >(
                 m_Data, m_NbComponents, false)}};
     }
 
diff --git a/core/include/Data/DataSeries.h b/core/include/Data/DataSeries.h
index bfa12c9..9433ebd 100644
--- a/core/include/Data/DataSeries.h
+++ b/core/include/Data/DataSeries.h
@@ -27,20 +27,31 @@ class DataSeries;
 
 namespace dataseries_detail {
 
-template <int Dim>
+template <int Dim, bool IsConst>
 class IteratorValue : public DataSeriesIteratorValue::Impl {
 public:
+    friend class DataSeries<Dim>;
+
+    template <bool IC = IsConst, typename = std::enable_if_t<IC == false> >
+    explicit IteratorValue(DataSeries<Dim> &dataSeries, bool begin)
+            : m_XIt(begin ? dataSeries.xAxisData()->begin() : dataSeries.xAxisData()->end()),
+              m_ValuesIt(begin ? dataSeries.valuesData()->begin() : dataSeries.valuesData()->end())
+    {
+    }
+
+    template <bool IC = IsConst, typename = std::enable_if_t<IC == true> >
     explicit IteratorValue(const DataSeries<Dim> &dataSeries, bool begin)
             : m_XIt(begin ? dataSeries.xAxisData()->cbegin() : dataSeries.xAxisData()->cend()),
               m_ValuesIt(begin ? dataSeries.valuesData()->cbegin()
                                : dataSeries.valuesData()->cend())
     {
     }
+
     IteratorValue(const IteratorValue &other) = default;
 
     std::unique_ptr<DataSeriesIteratorValue::Impl> clone() const override
     {
-        return std::make_unique<IteratorValue<Dim> >(*this);
+        return std::make_unique<IteratorValue<Dim, IsConst> >(*this);
     }
 
     bool equals(const DataSeriesIteratorValue::Impl &other) const override try {
@@ -149,16 +160,28 @@ public:
     // Iterators //
     // ///////// //
 
+    DataSeriesIterator begin() override
+    {
+        return DataSeriesIterator{DataSeriesIteratorValue{
+            std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, true)}};
+    }
+
+    DataSeriesIterator end() override
+    {
+        return DataSeriesIterator{DataSeriesIteratorValue{
+            std::make_unique<dataseries_detail::IteratorValue<Dim, false> >(*this, false)}};
+    }
+
     DataSeriesIterator cbegin() const override
     {
         return DataSeriesIterator{DataSeriesIteratorValue{
-            std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, true)}};
+            std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, true)}};
     }
 
     DataSeriesIterator cend() const override
     {
         return DataSeriesIterator{DataSeriesIteratorValue{
-            std::make_unique<dataseries_detail::IteratorValue<Dim> >(*this, false)}};
+            std::make_unique<dataseries_detail::IteratorValue<Dim, true> >(*this, false)}};
     }
 
     /// @sa IDataSeries::minXAxisData()
diff --git a/core/include/Data/IDataSeries.h b/core/include/Data/IDataSeries.h
index 33fc095..8414af8 100644
--- a/core/include/Data/IDataSeries.h
+++ b/core/include/Data/IDataSeries.h
@@ -69,6 +69,8 @@ public:
 
     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
diff --git a/core/include/Data/SqpIterator.h b/core/include/Data/SqpIterator.h
index 8b51389..b1d5cc3 100644
--- a/core/include/Data/SqpIterator.h
+++ b/core/include/Data/SqpIterator.h
@@ -38,8 +38,10 @@ public:
         return *this;
     }
 
-    pointer operator->() const { return &m_CurrentValue; }
-    reference operator*() const { return 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; }
 
     bool operator==(const SqpIterator &other) const
     {