Refactor to not store a graph reference in FallbackExpr

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

src/graph/formulas/fallback.rs

@@ -25,39 +25,35 @@ where
         FallbackExpr {
             prefer_meters,
             meter_fallback_for_meters,
-            graph: self,
         }
-        .generate(BTreeSet::from_iter(component_ids))
+        .generate(self, BTreeSet::from_iter(component_ids))
     }
 }
 
-struct FallbackExpr<'a, N, E>
-where
-    N: Node,
-    E: Edge,
-{
+struct FallbackExpr {
     pub(crate) prefer_meters: bool,
     pub(crate) meter_fallback_for_meters: bool,
-    pub(crate) graph: &'a ComponentGraph<N, E>,
 }
 
-impl<N, E> FallbackExpr<'_, N, E>
-where
-    N: Node,
-    E: Edge,
-{
-    fn generate(&self, mut component_ids: BTreeSet<u64>) -> Result<Expr, Error> {
+impl FallbackExpr {
+    fn generate<N: Node, E: Edge>(
+        &self,
+        graph: &ComponentGraph<N, E>,
+        mut component_ids: BTreeSet<u64>,
+    ) -> Result<Expr, Error> {
         let mut formula = None::<Expr>;
-        if self.graph.config.disable_fallback_components {
+        if graph.config.disable_fallback_components {
             while let Some(component_id) = component_ids.pop_first() {
                 formula = Self::add_to_option(formula, Expr::component(component_id));
             }
             return formula.ok_or(Error::internal("No components to generate formula."));
         }
         while let Some(component_id) = component_ids.pop_first() {
-            if let Some(expr) = self.meter_fallback(component_id)? {
+            if let Some(expr) = self.meter_fallback(graph, component_id)? {
                 formula = Self::add_to_option(formula, expr);
-            } else if let Some(expr) = self.component_fallback(&mut component_ids, component_id)? {
+            } else if let Some(expr) =
+                self.component_fallback(graph, &mut component_ids, component_id)?
+            {
                 formula = Self::add_to_option(formula, expr);
             } else {
                 formula = Self::add_to_option(formula, Expr::component(component_id));
@@ -68,23 +64,26 @@ where
     }
 
     /// Returns a fallback expression for a meter component.
-    fn meter_fallback(&self, component_id: u64) -> Result<Option<Expr>, Error> {
-        let component = self.graph.component(component_id)?;
+    fn meter_fallback<N: Node, E: Edge>(
+        &self,
+        graph: &ComponentGraph<N, E>,
+        component_id: u64,
+    ) -> Result<Option<Expr>, Error> {
+        let component = graph.component(component_id)?;
         if !component.is_meter() {
             return Ok(None);
         }
-        let has_successor_meters = self.graph.has_meter_successors(component_id)?;
+        let has_successor_meters = graph.has_meter_successors(component_id)?;
 
         if !self.meter_fallback_for_meters && has_successor_meters {
             return Ok(Some(Expr::component(component_id)));
         }
 
-        if !self.graph.has_successors(component_id)? {
+        if !graph.has_successors(component_id)? {
             return Ok(Some(Expr::component(component_id)));
         }
 
-        let (sum_of_successors, sum_of_coalesced_successors) = self
-            .graph
+        let (sum_of_successors, sum_of_coalesced_successors) = graph
             .successors(component_id)?
             .map(|node| {
                 (
@@ -136,13 +135,14 @@ where
     /// - Battery Inverter
     /// - PV Inverter
     /// - EV Charger
-    fn component_fallback(
+    fn component_fallback<N: Node, E: Edge>(
         &self,
+        graph: &ComponentGraph<N, E>,
         component_ids: &mut BTreeSet<u64>,
         component_id: u64,
     ) -> Result<Option<Expr>, Error> {
-        let component = self.graph.component(component_id)?;
-        if !component.is_battery_inverter(&self.graph.config)
+        let component = graph.component(component_id)?;
+        if !component.is_battery_inverter(&graph.config)
             && !component.is_chp()
             && !component.is_pv_inverter()
             && !component.is_ev_charger()
@@ -152,8 +152,7 @@ where
 
         // If predecessors have other successors that are not in the list of
         // component ids, the predecessors can't be used as fallback.
-        let siblings = self
-            .graph
+        let siblings = graph
             .siblings_from_predecessors(component_id)?
             .filter(|sibling| sibling.component_id() != component_id)
             .collect::<Vec<_>>();
@@ -168,8 +167,7 @@ where
         }
 
         // Collect predecessor meter ids.
-        let predecessor_ids: BTreeSet<u64> = self
-            .graph
+        let predecessor_ids: BTreeSet<u64> = graph
             .predecessors(component_id)?
             .filter(|x| x.is_meter())
             .map(|x| x.component_id())
@@ -186,7 +184,7 @@ where
             component_ids.remove(&sibling.component_id());
         }
 
-        Ok(Some(self.generate(predecessor_ids)?))
+        Ok(Some(self.generate(graph, predecessor_ids)?))
     }
 
     fn add_to_option(expr: Option<Expr>, other: Expr) -> Option<Expr> {