COMPMID-415: Cleanup framework

Change-Id: Ibd5a95a8337ac96bdc1b61af29efa430b4abe2b6
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80938
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

3 files changed, 30 insertions, 23 deletions

diff --git a/framework/datasets/ContainerDataset.h b/framework/datasets/ContainerDataset.h
index af685439b5..bdca97cbac 100644
--- a/framework/datasets/ContainerDataset.h
+++ b/framework/datasets/ContainerDataset.h
@@ -55,7 +55,7 @@ struct is_container<std::vector<V, A>> : public std::true_type
 
 /** Implementation of a dataset created from a container. */
 template <typename T>
-class ContainerDataset final : public NamedDataset
+class ContainerDataset : public NamedDataset
 {
 private:
     using container_value_type     = typename T::value_type;
@@ -68,7 +68,7 @@ public:
      * @param[in] container Values for the dataset.
      */
     ContainerDataset(std::string name, T &&container)
-        : NamedDataset{ std::move(name) }, _container{ std::forward<T>(container) }
+        : NamedDataset{ std::move(name) }, _container(std::forward<T>(container))
     {
     }
 
diff --git a/framework/datasets/RangeDataset.h b/framework/datasets/RangeDataset.h
index 2489405ff7..637abe0a83 100644
--- a/framework/datasets/RangeDataset.h
+++ b/framework/datasets/RangeDataset.h
@@ -40,7 +40,10 @@ namespace framework
 {
 namespace dataset
 {
-/** Implementation of a dataset created from a range of values. */
+/** Implementation of a dataset created from a range of values.
+ *
+ * The range is inclusive of the first value but exclusive of the last, i.e. [start, end).
+ */
 template <typename T>
 class RangeDataset final : public NamedDataset
 {
@@ -48,47 +51,49 @@ public:
     /** Construct dataset with given name and values in the specified range.
      *
      * @param[in] name  Description of the values.
-     * @param[in] first Iterator to the first value.
-     * @param[in] last  Iterator behind the last value.
+     * @param[in] start Begin of the range.
+     * @param[in] end   End of the range.
+     * @param[in] step  Step size.
      */
-    RangeDataset(std::string name, T &&first, T &&last)
-        : NamedDataset{ std::move(name) }, _first{ std::forward<T>(first) }, _last{ std::forward<T>(last) }
+    RangeDataset(std::string name, T start, T end, T step = 1)
+        : NamedDataset{ std::move(name) }, _start{ start }, _end{ end }, _step{ step }
     {
     }
 
     RangeDataset(RangeDataset &&) = default;
 
     /** Type of the dataset. */
-    using type = std::tuple<typename std::iterator_traits<T>::value_type>;
+    using type = std::tuple<T>;
 
     /** Iterator for the dataset. */
     struct iterator
     {
-        iterator(std::string name, T iterator)
-            : _name{ name }, _iterator{ iterator }
+        iterator(std::string name, T start, T step)
+            : _name{ name }, _value{ start }, _step{ step }
         {
         }
 
         std::string description() const
         {
             using support::cpp11::to_string;
-            return _name + "=" + to_string(*_iterator);
+            return _name + "=" + to_string(_value);
         }
 
         RangeDataset::type operator*() const
         {
-            return std::make_tuple(*_iterator);
+            return std::make_tuple(_value);
         }
 
         iterator &operator++()
         {
-            ++_iterator;
+            _value += _step;
             return *this;
         }
 
     private:
         std::string _name;
-        T           _iterator;
+        T           _value;
+        T           _step;
     };
 
     /** Iterator pointing at the begin of the dataset.
@@ -97,7 +102,7 @@ public:
      */
     iterator begin() const
     {
-        return iterator(name(), _first);
+        return iterator(name(), _start, _step);
     }
 
     /** Size of the dataset.
@@ -106,26 +111,28 @@ public:
      */
     int size() const
     {
-        return std::distance(_first, _last);
+        return (_end - _start) / std::abs(_step);
     }
 
 private:
-    T _first;
-    T _last;
+    T _start;
+    T _end;
+    T _step;
 };
 
 /** Helper function to create a @ref RangeDataset.
  *
  * @param[in] name  Name of the dataset.
- * @param[in] first Iterator to the first value.
- * @param[in] last  Iterator behind the last value.
+ * @param[in] start Begin of the range.
+ * @param[in] end   End of the range.
+ * @param[in] step  Step size.
  *
  * @return A range dataset.
  */
 template <typename T>
-RangeDataset<T> make(std::string name, T &&first, T &&last)
+RangeDataset<T> make(std::string name, T start, T end, T step = 1)
 {
-    return RangeDataset<T>(std::move(name), std::forward<T>(first), std::forward<T>(last));
+    return RangeDataset<T>(std::move(name), start, end, step);
 }
 } // namespace dataset
 } // namespace framework
diff --git a/framework/datasets/SingletonDataset.h b/framework/datasets/SingletonDataset.h
index 4b71631d92..1acb5765e5 100644
--- a/framework/datasets/SingletonDataset.h
+++ b/framework/datasets/SingletonDataset.h
@@ -43,7 +43,7 @@ namespace dataset
 {
 /** Implementation of a dataset holding a single value. */
 template <typename T>
-class SingletonDataset final : public NamedDataset
+class SingletonDataset : public NamedDataset
 {
 public:
     /** Construct dataset with given name and value.