Change metric names on tables in restoration.py for clarity

dpinney · Jan 10, 2025 · 30df43e · 30df43e
1 parent 736e842
commit 30df43e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/omf/models/restoration.html b/omf/models/restoration.html
@@ -253,11 +253,11 @@
 		<div id="outageCostCalc" class="tightContent sorttable" style="max-height:500px; overflow-y:scroll">
 			{{ allOutputDataDict['timelineStatsHtml'] }}
 		</div>
-		<p class="reportTitle" style="page-break-before:always">Simulation time-span SAIDI, SAIFI, CAIDI, and CAIFI</p>
+		<p class="reportTitle" style="page-break-before:always">Simulation-Constrained Metrics by Microgrid</p>
 		<div id="tradMetricsCalc" class="tightContent sorttable" style="max-height:500px; overflow-y:scroll">
 			{{ allOutputDataDict['tradMetricsHtml'] }}
 		</div>
-		<p class="reportTitle" style="page-break-before:always">Metrics by CCI Quartiles</p>
+		<p class="reportTitle" style="page-break-before:always">Simulation-Constrained Metrics by CCI Quartiles</p>
 		<div id="cciQuartTradMetricsCalc" class="tightContent sorttable" style="max-height:500px; overflow-y:scroll">
 			{{ allOutputDataDict['cciQuartTradMetricsHtml'] }}
 		</div>

diff --git a/omf/models/restoration.py b/omf/models/restoration.py
@@ -512,10 +512,10 @@ def calcTradMetrics(outputTimeline, loadList, startTime, numTimeSteps):
 			<thead>
 				<tr>
 					<th>Microgrid</th>
-					<th>Event SAIDI</th>
-					<th>Event SAIFI</th>
-					<th>Event CAIDI</th>
-					<th>Event CAIFI</th>
+					<th>SC-SAIDI</th>
+					<th>SC-SAIFI</th>
+					<th>SC-CAIDI</th>
+					<th>SC-CAIFI</th>
 					<th>Loads Served</th>
 					<th>Est. People Served</th>
 					<th>CCI of Average Customer</th>
@@ -572,14 +572,14 @@ def calcTradMetrics(outputTimeline, loadList, startTime, numTimeSteps):
 		<table class="sortable" cellpadding="0" cellspacing="0">
 			<thead>
 				<tr>
-					<th>Microgrid</th>
-					<th>Event SAIDI</th>
-					<th>Event SAIFI</th>
-					<th>Event CAIDI</th>
-					<th>Event CAIFI</th>
+					<th>CCI Quartile</th>
+					<th>SC-SAIDI</th>
+					<th>SC-SAIFI</th>
+					<th>SC-CAIDI</th>
+					<th>SC-CAIFI</th>
 					<th>Loads Served</th>
 					<th>Est. People Served</th>
-					<th>Average CCI</th>
+					<th>CCI of Average Customer</th>
 					<th>Ave. CCI merged w/ Load Priorities</th>
 				</tr>
 			</thead>