Skip to content

Commit a87e188

Browse files
fix incorrect parameter dict declaration
1 parent 37dde54 commit a87e188

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/geophires_x/Economics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,10 @@ def __init__(self, model: Model):
876876
)
877877

878878
# TODO add support for float values
879-
self.cashflow_series_start_year = self.ParameterDict[self.discountrate.Name] = intParameter(
879+
self.cashflow_series_start_year = self.ParameterDict[self.cashflow_series_start_year.Name] = intParameter(
880880
"Cashflow Series Start Year",
881881
DefaultValue=0,
882-
AllowableRange=[0,1],
882+
AllowableRange=[0, 1],
883883
UnitType=Units.NONE,
884884
ErrMessage=f'assume default Cashflow Series Start Year ({0})',
885885
ToolTipText="Cashflow Series Start Year used to calculate NPV"

tests/test_geophires_x.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,19 +566,19 @@ def assertHasLogRecordWithMessage(logs_, message):
566566
with self.assertLogs(level='INFO') as logs:
567567
result = client.get_geophires_result(input_params(discount_rate='0.042'))
568568

569-
assert result is not None
570-
assert result.result['ECONOMIC PARAMETERS']['Interest Rate']['value'] == 4.2
571-
assert result.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'] == '%'
569+
self.assertIsNotNone(result)
570+
self.assertEqual(4.2, result.result['ECONOMIC PARAMETERS']['Interest Rate']['value'])
571+
self.assertEqual('%', result.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'])
572572
assertHasLogRecordWithMessage(
573573
logs, 'Set Fixed Internal Rate to 4.2 percent because Discount Rate was provided (0.042)'
574574
)
575575

576576
with self.assertLogs(level='INFO') as logs2:
577577
result2 = client.get_geophires_result(input_params(fixed_internal_rate='4.2'))
578578

579-
assert result2 is not None
580-
assert result2.result['ECONOMIC PARAMETERS']['Interest Rate']['value'] == 4.2
581-
assert result2.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'] == '%'
579+
self.assertIsNotNone(result2)
580+
self.assertEqual(4.2, result2.result['ECONOMIC PARAMETERS']['Interest Rate']['value'])
581+
self.assertEqual('%', result2.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'])
582582

583583
assertHasLogRecordWithMessage(
584584
logs2, 'Set Discount Rate to 0.042 because Fixed Internal Rate was provided (4.2 percent)'

0 commit comments

Comments
 (0)