From 5ccc65b485995ae64700480d33f9b1e26e61d1e2 2017-08-24 14:53:19
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-08-24 14:53:19
Subject: [PATCH] Updates sort() method to be compatible with a single vector

---

diff --git a/core/include/Common/SortUtils.h b/core/include/Common/SortUtils.h
index 8afa3c8..0536439 100644
--- a/core/include/Common/SortUtils.h
+++ b/core/include/Common/SortUtils.h
@@ -37,7 +37,23 @@ struct SortUtils {
     }
 
     /**
-     * Sorts a container according to indices passed in parameter
+     * 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
@@ -45,18 +61,24 @@ struct SortUtils {
      * indices and its range is [0 ; vector.size()[ )
      */
     template <typename Container>
-    static Container sort(const Container &container, const std::vector<int> &sortPermutation)
+    static Container sort(const Container &container, int nbValues,
+                          const std::vector<int> &sortPermutation)
     {
-        if (container.size() != sortPermutation.size()) {
+        auto containerSize = container.size();
+        if (containerSize % nbValues != 0
+            || ((containerSize / nbValues) != sortPermutation.size())) {
             return Container{};
         }
 
         // Inits result
         auto sortedData = Container{};
-        sortedData.resize(container.size());
+        sortedData.reserve(containerSize);
 
-        std::transform(sortPermutation.cbegin(), sortPermutation.cend(), sortedData.begin(),
-                       [&container](int i) { return container.at(i); });
+        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));
+        }
 
         return sortedData;
     }
diff --git a/core/include/Data/ArrayData.h b/core/include/Data/ArrayData.h
index 23af219..82bae9c 100644
--- a/core/include/Data/ArrayData.h
+++ b/core/include/Data/ArrayData.h
@@ -20,27 +20,22 @@ namespace arraydata_detail {
 /// Struct used to sort ArrayData
 template <int Dim>
 struct Sort {
-    static std::shared_ptr<ArrayData<Dim> > sort(const DataContainer &data,
+    static std::shared_ptr<ArrayData<Dim> > sort(const DataContainer &data, int nbComponents,
                                                  const std::vector<int> &sortPermutation)
     {
-        auto nbComponents = data.size();
-        auto sortedData = DataContainer(nbComponents);
-
-        for (auto i = 0; i < nbComponents; ++i) {
-            sortedData[i] = SortUtils::sort(data.at(i), sortPermutation);
-        }
-
-        return std::make_shared<ArrayData<Dim> >(std::move(sortedData));
+        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,
+    static std::shared_ptr<ArrayData<1> > sort(const DataContainer &data, int nbComponents,
                                                const std::vector<int> &sortPermutation)
     {
-        return std::make_shared<ArrayData<1> >(SortUtils::sort(data.at(0), sortPermutation));
+        Q_UNUSED(nbComponents)
+        return std::make_shared<ArrayData<1> >(SortUtils::sort(data, 1, sortPermutation));
     }
 };