Small fixes (#15)

Author: shsms

Cargo.toml

@@ -16,14 +16,14 @@ frequenz-resampling = { git = "https://github.com/frequenz-floss/frequenz-resamp
 futures = "0.3.31"
 prost = "0.13"
 prost-types = "0.13"
-tokio = { version = "1.45", features = ["rt", "rt-multi-thread"] }
+tokio = { version = "1.48", features = ["rt", "rt-multi-thread"] }
 tonic = "0.13"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3" }
 
 [dev-dependencies]
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }
-tokio = { version = "1.45", features = ["test-util"] }
+tokio = { version = "1.48", features = ["test-util"] }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
 
 

examples/logical_meter.rs

@@ -27,11 +27,11 @@ async fn main() -> Result<(), Error> {
     )
     .await?;
 
-    // Create a formula that calculates `grid_power - battery_power`.
     let formula_grid = logical_meter.grid(metric::AcPowerActive)?;
     let formula_pv = logical_meter.pv(None, metric::AcPowerActive)?;
     let formula_consumer = logical_meter.consumer(metric::AcPowerActive)?;
 
+    // Create a formula that calculates `grid_power - pv_power + consumer_power + 100kW`.
     let formula = logical_meter.grid(metric::AcPowerActive)?
         - logical_meter.pv(None, metric::AcPowerActive)?
         + logical_meter.consumer(metric::AcPowerActive)?
@@ -68,6 +68,8 @@ async fn main() -> Result<(), Error> {
         );
     }
 
+    // Create a formula that calculates the grid voltage as:
+    // COALESCE(grid_voltage, AVG(grid_voltage_p1, grid_voltage_p2, grid_voltage_p3) * SQRT(3))
     let formula_grid_voltage = logical_meter.grid(metric::AcVoltage)?.coalesce(
         logical_meter.grid(metric::AcVoltagePhase1N)?.avg(vec![
             logical_meter.grid(metric::AcVoltagePhase2N)?,

src/logical_meter/formula/graph_formula_provider.rs

@@ -22,7 +22,7 @@ macro_rules! graph_formula_provider {
 
         fn $fnname(
             _graph: &ComponentGraph<ElectricalComponent, ElectricalComponentConnection>,
-            _metric: Self::MetricType,
+            metric: Self::MetricType,
             _instructions_tx: mpsc::Sender<logical_meter_actor::Instruction>,
             $($idsparam: Option<BTreeSet<u64>>,)?
             $($idparam: u64,)?
@@ -31,7 +31,7 @@ macro_rules! graph_formula_provider {
                 format!(
                     "The component graph does not support {} formula generation for {}.",
                     stringify!($fnname),
-                    _metric.to_string()
+                    metric.to_string()
                 )
             ));
         }
@@ -70,7 +70,7 @@ macro_rules! impl_graph_formula_provider {
 
         fn $fnname(
             graph: &ComponentGraph<ElectricalComponent, ElectricalComponentConnection>,
-            _metric: Self::MetricType,
+            metric: Self::MetricType,
             instructions_tx: mpsc::Sender<logical_meter_actor::Instruction>,
             $($idsparam: Option<BTreeSet<u64>>,)?
             $($idparam: u64,)?
@@ -80,7 +80,7 @@ macro_rules! impl_graph_formula_provider {
                     format!("Could not get {} formula: {e}", stringify!($fnname))
                 )
             })?;
-            Ok(FormulaParams::new(formula, _metric, instructions_tx).into())
+            Ok(FormulaParams::new(formula, metric, instructions_tx).into())
         }
 
     )+};

src/quantity/percentage.rs

@@ -4,7 +4,7 @@
 //! This module defines the `Percentage` quantity and its operations.
 
 qty_ctor! {
-    #[doc = "A quantity representing a percentage (0% to 100%)."]
+    #[doc = "A quantity representing a percentage (typically 0% to 100%)."]
     Percentage => {
         (from_percentage, as_percentage, "%", 1.0),
         (from_fraction, as_fraction, None, 100.0),
@@ -38,6 +38,15 @@ mod tests {
         assert_f32_eq(perc_2 / perc_1, 1.6);
 
         assert_f32_eq(Percentage::zero().as_percentage(), 0.0);
+
+        let perc_3 = Percentage::from_percentage(150.0);
+        assert_f32_eq(perc_3.as_fraction(), 1.5);
+        let perc_4 = Percentage::from_fraction(-0.1);
+        assert_f32_eq(perc_4.as_percentage(), -10.0);
+
+        assert!(perc_3 > Percentage::from_percentage(100.0));
+        assert!(perc_4 < Percentage::from_percentage(0.0));
+        assert!(perc_4 > Percentage::from_percentage(-20.0));
     }
 
     #[test]
@@ -50,5 +59,8 @@ mod tests {
         assert_eq!(p(12.3456, 4), "12.3456 %");
         assert_eq!(p(12.3456, 5), "12.3456 %");
         assert_eq!(s(100.0), "100 %");
+        assert_eq!(s(-5.5), "-5.5 %");
+        assert_eq!(s(1234.5678), "1234.568 %");
+        assert_eq!(p(-1234.5678, 1), "-1234.6 %");
     }
 }