Fix sorting in ISA scoring (#245)

edgeandnode · Nov 10, 2022 · 482671a · 482671a
1 parent 4ffbb06
commit 482671a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/indexer-selection/Cargo.toml b/indexer-selection/Cargo.toml
@@ -14,6 +14,7 @@ itertools = "0.10"
 lazy_static = "1.4"
 num-traits = "0.2"
 ordered-float = "3.0"
+permutation = "0.4"
 prelude = { path = "../prelude" }
 prometheus = { version = "0.13", default-features = false }
 rand_distr = "0.4"

diff --git a/indexer-selection/src/score.rs b/indexer-selection/src/score.rs
@@ -138,18 +138,11 @@ impl MetaIndexer<'_> {
         let mut perf_success: V<f64> = self.0.iter().map(|f| f.perf_success).collect();
         let mut slashable_usd: V<f64> = self.0.iter().map(|f| f.slashable_usd).collect();
 
-        let mut order = (0..perf_success.len()).collect::<V<usize>>();
-        order.sort_unstable_by_key(|i| NotNan::try_from(perf_success[*i]).unwrap());
-        macro_rules! sort_by_perf_success {
-            ($v:ident) => {
-                for i in 0..$v.len() {
-                    $v.swap(i, order[i]);
-                }
-            };
-        }
-        sort_by_perf_success!(reliability);
-        sort_by_perf_success!(perf_success);
-        sort_by_perf_success!(slashable_usd);
+        let mut permutation =
+            permutation::sort_unstable_by_key(&perf_success, |n| NotNan::try_from(*n).unwrap());
+        permutation.apply_slice_in_place(&mut reliability);
+        permutation.apply_slice_in_place(&mut perf_success);
+        permutation.apply_slice_in_place(&mut slashable_usd);
 
         // BQN: pf ← ×`1-r
         let pf = reliability