Added SortedIterationKTypeVTypeHashMap: a sorted-iteration order view…

… over another key-value map.

Co-authored-by: Dawid Weiss <[email protected]>

CHANGES.txt

@@ -2,6 +2,10 @@
 [0.9.1-SNAPSHOT]
 
 ** New features and API changes
+
+   GH-28: Added SortedIterationKTypeVTypeHashMap: a sorted-iteration order view over
+   another key-value map. (Bruno Roustant)
+
 ** Improvements
 
    GH-25: Added addAll(KTypeContainer) on KTypeSet. (Erich Schubert, Dawid Weiss).

hppc-template-processor/src/main/java/com/carrotsearch/hppc/generator/intrinsics/Equals.java

@@ -30,8 +30,8 @@ public void invoke(
               arguments.size(), m.group(), arguments));
     }
 
-    String v1 = arguments.remove(arguments.size() - 1);
     String v2 = arguments.remove(arguments.size() - 1);
+    String v1 = arguments.remove(arguments.size() - 1);
 
     Type type = inferTemplateType(m, templateOptions, genericCast);
     switch (type) {

hppc/src/main/java/com/carrotsearch/hppc/sorting/IndirectSort.java

@@ -38,14 +38,21 @@ private IndirectSort() {
    */
   public static int[] mergesort(int start, int length, IntBinaryOperator comparator) {
     final int[] src = createOrderArray(start, length);
+    return mergesort(src, comparator);
+  }
 
-    if (length > 1) {
-      final int[] dst = (int[]) src.clone();
-      topDownMergeSort(src, dst, 0, length, comparator);
-      return dst;
+  /**
+   * Returns a sorted copy of the order array provided, using the given <code>comparator</code>.
+   *
+   * <p>This routine uses merge sort. It is guaranteed to be stable.
+   */
+  public static int[] mergesort(int[] orderArray, IntBinaryOperator comparator) {
+    if (orderArray.length <= 1) {
+      return orderArray;
     }
-
-    return src;
+    final int[] dst = orderArray.clone();
+    topDownMergeSort(orderArray, dst, 0, orderArray.length, comparator);
+    return dst;
   }
 
   /**