Address TODOs to use parameterized contingency in tooltip text (NREL#383)

softwareengineerprogrammer · softwareengineerprogrammer · commit 1a3db8822923 · 2025-07-27T10:26:07.000-07:00
diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py
@@ -1714,7 +1714,7 @@ def __init__(self, model: Model):
         )
 
         stimulation_contingency_and_indirect_costs_tooltip = (
-            f'plus 15% contingency '  # TODO https://github.com/NREL/GEOPHIRES-X/issues/383
+            f'plus {self.contingency_percentage.quantity().to(convertible_unit("%")).magnitude:g}% contingency '
             f'plus {self.stimulation_indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% '
             f'indirect costs'
         )
@@ -1736,8 +1736,9 @@ def __init__(self, model: Model):
         )
 
         contingency_and_indirect_costs_tooltip = (
-            f'plus 15% contingency '  # TODO https://github.com/NREL/GEOPHIRES-X/issues/383
-            f'plus {self.indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% indirect costs'
+            f'plus {self.contingency_percentage.quantity().to(convertible_unit("%")).magnitude:g}% contingency '
+            f'plus {self.indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% '
+            f'indirect costs'
         )
 
         self.Cexpl = self.OutputParameterDict[self.Cexpl.Name] = OutputParameter(

Original file line number	Diff line number	Diff line change
`@@ -1714,7 +1714,7 @@ def __init__(self, model: Model):`
`1714`	`1714`	`)`
`1715`	`1715`
`1716`	`1716`	`stimulation_contingency_and_indirect_costs_tooltip = (`
`1717`		`- f'plus 15% contingency ' # TODO https://github.com/NREL/GEOPHIRES-X/issues/383`
	`1717`	`+ f'plus {self.contingency_percentage.quantity().to(convertible_unit("%")).magnitude:g}% contingency '`
`1718`	`1718`	`f'plus {self.stimulation_indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% '`
`1719`	`1719`	`f'indirect costs'`
`1720`	`1720`	`)`
`@@ -1736,8 +1736,9 @@ def __init__(self, model: Model):`
`1736`	`1736`	`)`
`1737`	`1737`
`1738`	`1738`	`contingency_and_indirect_costs_tooltip = (`
`1739`		`- f'plus 15% contingency ' # TODO https://github.com/NREL/GEOPHIRES-X/issues/383`
`1740`		`- f'plus {self.indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% indirect costs'`
	`1739`	`+ f'plus {self.contingency_percentage.quantity().to(convertible_unit("%")).magnitude:g}% contingency '`
	`1740`	`+ f'plus {self.indirect_capital_cost_percentage.quantity().to(convertible_unit("%")).magnitude}% '`
	`1741`	`+ f'indirect costs'`
`1741`	`1742`	`)`
`1742`	`1743`
`1743`	`1744`	`self.Cexpl = self.OutputParameterDict[self.Cexpl.Name] = OutputParameter(`