From c7f385d1c80a6eb16a8b2b42a6cda1d26b878bcf Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 15 Apr 2019 17:15:56 +0200 Subject: [PATCH] Update HashSet to LinkedHashSet to keep order --- .../pokeranalytics/android/model/comparison/Comparator.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt b/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt index d75299a4..13264ad4 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt @@ -45,7 +45,7 @@ fun List.combined(): List> { this.forEach { comparatorList.add(it.queryConditions) } - return getCombinations(comparatorList) + return getCombinations(comparatorList) } inline fun List.query(realm: Realm): RealmQuery { @@ -57,7 +57,7 @@ inline fun List.query(realm: Realm): Re } fun getCombinations(lists: List>): List> { - var combinations: MutableSet> = HashSet() + var combinations: MutableSet> = LinkedHashSet() var newCombinations: MutableSet> var index = 0 @@ -69,10 +69,10 @@ fun getCombinations(lists: List>): List> { newList.add(i) combinations.add(newList) } - index++ + index++ while (index < lists.size) { val nextList = lists[index] - newCombinations = HashSet() + newCombinations = LinkedHashSet() for (first in combinations) { for (second in nextList) { val newList = ArrayList()