global: snap

crates/brk_computer/src/internal/per_block/computed/distribution.rs

@@ -267,7 +267,7 @@ impl<T: NumericValue + JsonSchema> PerBlockDistribution<T> {
                         vec.push(zero);
                     }
                 } else {
-                    weighted.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+                    weighted.sort_unstable_by_key(|a| a.0);
 
                     max.push(weighted.last().unwrap().0);
                     pct90.push(get_weighted_percentile(&weighted, 0.90));

crates/brk_computer/src/internal/transform/mod.rs

@@ -24,9 +24,9 @@ pub use derived::{
     RatioCents64, TimesSqrt,
 };
 pub use ratio::{
-    RatioCentsBp32, RatioCentsSignedCentsBps32, RatioCentsSignedDollarsBps32, RatioDiffCentsBps32,
-    RatioDiffDollarsBps32, RatioDiffF32Bps32, RatioDollarsBp16, RatioDollarsBp32,
-    RatioDollarsBps32, RatioSatsBp16, RatioU64Bp16, RatioU64F32,
+    RatioCentsBp16, RatioCentsBp32, RatioCentsSignedCentsBps32, RatioCentsSignedDollarsBps32,
+    RatioDiffCentsBps32, RatioDiffDollarsBps32, RatioDiffF32Bps32, RatioDollarsBp16,
+    RatioDollarsBp32, RatioDollarsBps32, RatioSatsBp16, RatioU64Bp16, RatioU64F32,
 };
 pub use specialized::{
     BlockCountTarget1m, BlockCountTarget1w, BlockCountTarget1y, BlockCountTarget24h,

crates/brk_computer/src/internal/transform/ratio.rs

@@ -43,6 +43,19 @@ impl BinaryTransform<Cents, Cents, BasisPoints32> for RatioCentsBp32 {
     }
 }
 
+pub struct RatioCentsBp16;
+
+impl BinaryTransform<Cents, Cents, BasisPoints16> for RatioCentsBp16 {
+    #[inline(always)]
+    fn apply(numerator: Cents, denominator: Cents) -> BasisPoints16 {
+        if denominator == Cents::ZERO {
+            BasisPoints16::ZERO
+        } else {
+            BasisPoints16::from(numerator.inner() as f64 / denominator.inner() as f64)
+        }
+    }
+}
+
 pub struct RatioDollarsBp16;
 
 impl BinaryTransform<Dollars, Dollars, BasisPoints16> for RatioDollarsBp16 {

crates/brk_computer/src/internal/with_addr_types.rs

@@ -17,6 +17,8 @@ use super::{
     WindowStartVec, Windows,
 };
 
+use crate::distribution::metrics::AvgAmountMetrics;
+
 /// `all` aggregate plus per-`AddrType` breakdown.
 #[derive(Clone, Traversable)]
 pub struct WithAddrTypes<T> {
@@ -246,6 +248,42 @@ impl WithAddrTypes<AmountPerBlock> {
     }
 }
 
+impl WithAddrTypes<AvgAmountMetrics> {
+    pub(crate) fn forced_import(
+        db: &Database,
+        version: Version,
+        indexes: &indexes::Vecs,
+    ) -> Result<Self> {
+        let all = AvgAmountMetrics::forced_import(db, "", version, indexes)?;
+        let by_addr_type = ByAddrType::new_with_name(|type_name| {
+            AvgAmountMetrics::forced_import(db, type_name, version, indexes)
+        })?;
+        Ok(Self { all, by_addr_type })
+    }
+
+    pub(crate) fn collect_vecs_mut(&mut self) -> Vec<&mut dyn AnyStoredVec> {
+        let mut vecs = self.all.collect_vecs_mut();
+        for v in self.by_addr_type.values_mut() {
+            vecs.extend(v.collect_vecs_mut());
+        }
+        vecs
+    }
+
+    pub(crate) fn par_iter_height_mut(
+        &mut self,
+    ) -> impl ParallelIterator<Item = &mut dyn AnyStoredVec> {
+        self.collect_vecs_mut().into_par_iter()
+    }
+
+    pub(crate) fn reset_height(&mut self) -> Result<()> {
+        self.all.reset_height()?;
+        for v in self.by_addr_type.values_mut() {
+            v.reset_height()?;
+        }
+        Ok(())
+    }
+}
+
 impl<B: BpsType> WithAddrTypes<PercentPerBlock<B>> {
     pub(crate) fn forced_import(
         db: &Database,