Skip to content

Commit ae7a8f0

Browse files
fix incorrect parameter dict declaration
1 parent c3fd03d commit ae7a8f0

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
@@ -572,19 +572,19 @@ def assertHasLogRecordWithMessage(logs_, message):
572572
with self.assertLogs(level='INFO') as logs:
573573
result = client.get_geophires_result(input_params(discount_rate='0.042'))
574574

575-
assert result is not None
576-
assert result.result['ECONOMIC PARAMETERS']['Interest Rate']['value'] == 4.2
577-
assert result.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'] == '%'
575+
self.assertIsNotNone(result)
576+
self.assertEqual(4.2, result.result['ECONOMIC PARAMETERS']['Interest Rate']['value'])
577+
self.assertEqual('%', result.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'])
578578
assertHasLogRecordWithMessage(
579579
logs, 'Set Fixed Internal Rate to 4.2 percent because Discount Rate was provided (0.042)'
580580
)
581581

582582
with self.assertLogs(level='INFO') as logs2:
583583
result2 = client.get_geophires_result(input_params(fixed_internal_rate='4.2'))
584584

585-
assert result2 is not None
586-
assert result2.result['ECONOMIC PARAMETERS']['Interest Rate']['value'] == 4.2
587-
assert result2.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'] == '%'
585+
self.assertIsNotNone(result2)
586+
self.assertEqual(4.2, result2.result['ECONOMIC PARAMETERS']['Interest Rate']['value'])
587+
self.assertEqual('%', result2.result['ECONOMIC PARAMETERS']['Interest Rate']['unit'])
588588

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

0 commit comments

Comments
 (0)