global: snapshot

crates/brk_computer/src/indicators/import.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use brk_error::Result;
 use brk_types::Version;
 
-use super::{Vecs, thermometer::Thermometer};
+use super::{Vecs, realized_envelope::RealizedEnvelope};
 use crate::{
     indexes,
     internal::{PerBlock, PercentPerBlock, RatioPerBlock, db_utils::{finalize_db, open_db}},
@@ -38,7 +38,7 @@ impl Vecs {
         let seller_exhaustion =
             PerBlock::forced_import(&db, "seller_exhaustion", v, indexes)?;
 
-        let thermometer = Thermometer::forced_import(&db, v, indexes)?;
+        let realized_envelope = RealizedEnvelope::forced_import(&db, v, indexes)?;
 
         let this = Self {
             db,
@@ -52,7 +52,7 @@ impl Vecs {
             dormancy,
             stock_to_flow,
             seller_exhaustion,
-            thermometer,
+            realized_envelope,
         };
         finalize_db(&this.db, &this)?;
         Ok(this)

crates/brk_computer/src/indicators/mod.rs

@@ -1,7 +1,7 @@
 mod compute;
 mod gini;
 mod import;
-pub mod thermometer;
+pub mod realized_envelope;
 mod vecs;
 
 pub use vecs::Vecs;

crates/brk_computer/src/indicators/realized_envelope.rs

@@ -12,7 +12,7 @@ use crate::{
 };
 
 #[derive(Traversable)]
-pub struct Thermometer<M: StorageMode = Rw> {
+pub struct RealizedEnvelope<M: StorageMode = Rw> {
     pub pct0_5: Price<PerBlock<Cents, M>>,
     pub pct1: Price<PerBlock<Cents, M>>,
     pub pct2: Price<PerBlock<Cents, M>>,
@@ -21,13 +21,13 @@ pub struct Thermometer<M: StorageMode = Rw> {
     pub pct98: Price<PerBlock<Cents, M>>,
     pub pct99: Price<PerBlock<Cents, M>>,
     pub pct99_5: Price<PerBlock<Cents, M>>,
-    pub zone: PerBlock<StoredI8, M>,
+    pub index: PerBlock<StoredI8, M>,
     pub score: PerBlock<StoredI8, M>,
 }
 
-const VERSION: Version = Version::new(2);
+const VERSION: Version = Version::new(3);
 
-impl Thermometer {
+impl RealizedEnvelope {
     pub(crate) fn forced_import(
         db: &Database,
         version: Version,
@@ -35,16 +35,16 @@ impl Thermometer {
     ) -> Result<Self> {
         let v = version + VERSION;
         Ok(Self {
-            pct0_5: Price::forced_import(db, "thermometer_pct0_5", v, indexes)?,
-            pct1: Price::forced_import(db, "thermometer_pct01", v, indexes)?,
-            pct2: Price::forced_import(db, "thermometer_pct02", v, indexes)?,
-            pct5: Price::forced_import(db, "thermometer_pct05", v, indexes)?,
-            pct95: Price::forced_import(db, "thermometer_pct95", v, indexes)?,
-            pct98: Price::forced_import(db, "thermometer_pct98", v, indexes)?,
-            pct99: Price::forced_import(db, "thermometer_pct99", v, indexes)?,
-            pct99_5: Price::forced_import(db, "thermometer_pct99_5", v, indexes)?,
-            zone: PerBlock::forced_import(db, "thermometer_zone", v, indexes)?,
-            score: PerBlock::forced_import(db, "thermometer_score", v, indexes)?,
+            pct0_5: Price::forced_import(db, "realized_envelope_pct0_5", v, indexes)?,
+            pct1: Price::forced_import(db, "realized_envelope_pct01", v, indexes)?,
+            pct2: Price::forced_import(db, "realized_envelope_pct02", v, indexes)?,
+            pct5: Price::forced_import(db, "realized_envelope_pct05", v, indexes)?,
+            pct95: Price::forced_import(db, "realized_envelope_pct95", v, indexes)?,
+            pct98: Price::forced_import(db, "realized_envelope_pct98", v, indexes)?,
+            pct99: Price::forced_import(db, "realized_envelope_pct99", v, indexes)?,
+            pct99_5: Price::forced_import(db, "realized_envelope_pct99_5", v, indexes)?,
+            index: PerBlock::forced_import(db, "realized_envelope_index", v, indexes)?,
+            score: PerBlock::forced_import(db, "realized_envelope_score", v, indexes)?,
         })
     }
 
@@ -96,7 +96,7 @@ impl Thermometer {
         let spot = &prices.spot.cents.height;
 
         // Zone: spot vs own envelope bands (-4 to +4)
-        self.compute_zone(spot, starting_indexes, exit)?;
+        self.compute_index(spot, starting_indexes, exit)?;
 
         // Temperature: per-model band crossings (-40 to +40)
         self.compute_score(&models, spot, starting_indexes, exit)?;
@@ -104,7 +104,7 @@ impl Thermometer {
         Ok(())
     }
 
-    fn compute_zone(
+    fn compute_index(
         &mut self,
         spot: &EagerVec<PcoVec<Height, Cents>>,
         starting_indexes: &Indexes,
@@ -123,10 +123,10 @@ impl Thermometer {
 
         let dep_version: Version = bands.iter().map(|b| b.version()).sum::<Version>() + spot.version();
 
-        self.zone.height.validate_computed_version_or_reset(dep_version)?;
-        self.zone.height.truncate_if_needed(starting_indexes.height)?;
+        self.index.height.validate_computed_version_or_reset(dep_version)?;
+        self.index.height.truncate_if_needed(starting_indexes.height)?;
 
-        self.zone.height.repeat_until_complete(exit, |vec| {
+        self.index.height.repeat_until_complete(exit, |vec| {
             let skip = vec.len();
             let source_end = bands.iter().map(|b| b.len()).min().unwrap().min(spot.len());
             let end = vec.batch_end(source_end);

crates/brk_computer/src/indicators/vecs.rs

@@ -2,7 +2,7 @@ use brk_traversable::Traversable;
 use brk_types::{BasisPoints16, BasisPoints32, StoredF32};
 use vecdb::{Database, Rw, StorageMode};
 
-use super::thermometer::Thermometer;
+use super::realized_envelope::RealizedEnvelope;
 use crate::internal::{PerBlock, PercentPerBlock, RatioPerBlock};
 
 #[derive(Traversable)]
@@ -25,5 +25,5 @@ pub struct Vecs<M: StorageMode = Rw> {
     pub dormancy: DormancyVecs<M>,
     pub stock_to_flow: PerBlock<StoredF32, M>,
     pub seller_exhaustion: PerBlock<StoredF32, M>,
-    pub thermometer: Thermometer<M>,
+    pub realized_envelope: RealizedEnvelope<M>,
 }

crates/brk_computer/src/lib.rs

@@ -512,7 +512,7 @@ impl Computer {
             Ok(())
         })?;
 
-        self.indicators.thermometer.compute(
+        self.indicators.realized_envelope.compute(
             &self.distribution,
             &self.cointime,
             &self.prices,