Fix Total Reported Demand for Tiered Service (#13)

dbeylkin · web-flow · commit 181e8409f8c4 · 2022-08-18T12:54:11.000-07:00
Fix total demand reporting value for teired service (when demand.num_sites &gt; 1).
diff --git a/terragraph_planner/optimization/topology_report.py b/terragraph_planner/optimization/topology_report.py
@@ -355,7 +355,9 @@ def get_topology_metrics(
             number_of_demands_with_disjoint_path / dems_nonzero_hops_away
         )
     total_demand = sum(
-        d.demand for d in topology.demand_sites.values() if d.demand is not None
+        d.demand * d.num_sites
+        for d in topology.demand_sites.values()
+        if d.demand is not None
     )
     demand_metrics = DemandMetrics(
         number_of_demands=number_of_demands,

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,9 @@ def get_topology_metrics(`
`355`	`355`	`number_of_demands_with_disjoint_path / dems_nonzero_hops_away`
`356`	`356`	`)`
`357`	`357`	`total_demand = sum(`
`358`		`- d.demand for d in topology.demand_sites.values() if d.demand is not None`
	`358`	`+ d.demand * d.num_sites`
	`359`	`+ for d in topology.demand_sites.values()`
	`360`	`+ if d.demand is not None`
`359`	`361`	`)`
`360`	`362`	`demand_metrics = DemandMetrics(`
`361`	`363`	`number_of_demands=number_of_demands,`