diff --git a/files/version.py b/files/version.py index 98d739c..c4b0ef8 100644 --- a/files/version.py +++ b/files/version.py @@ -1 +1 @@ -__version__ = '6.0.0' +__version__ = '6.0.1' diff --git a/tests/test_pysam_all.py b/tests/test_pysam_all.py index 0c8b26e..057fa1d 100644 --- a/tests/test_pysam_all.py +++ b/tests/test_pysam_all.py @@ -189,16 +189,16 @@ def test_functionality(): # Test shared module (AdjustmentFactors) d = a.AdjustmentFactors - d.constant = 1 - assert(d.constant == 1) + d.adjust_constant = 1 + assert(d.adjust_constant == 1) n_tests_passed += 1 - d.hourly = (1, 2) - assert(d.hourly == (1, 2)) + d.adjust_hourly = (1, 2) + assert(d.adjust_hourly == (1, 2)) n_tests_passed += 1 - d.periods = ((1, 2), (3, 4)) - assert(d.periods == ((1, 2), (3, 4))) + d.adjust_periods = ((1, 2), (3, 4)) + assert(d.adjust_periods == ((1, 2), (3, 4))) n_tests_passed += 1 try: @@ -207,26 +207,26 @@ def test_functionality(): n_tests_passed += 1 ValDict = d.export() - assert(ValDict['constant'] == 1 and ValDict['hourly'] == (1, 2) and ValDict['periods'] == ((1, 2), (3, 4))) + assert(ValDict['adjust_constant'] == 1 and ValDict['adjust_hourly'] == (1, 2) and ValDict['adjust_periods'] == ((1, 2), (3, 4))) n_tests_passed += 1 - ValDict = {'constant': 10, "hourly": (10, 20), "periods": ((10, 20), (30, 40))} + ValDict = {'adjust_constant': 10, "adjust_hourly": (10, 20), "adjust_periods": ((10, 20), (30, 40))} d.assign(ValDict) - assert(ValDict['constant'] == 10 and ValDict['hourly'] == (10, 20) and ValDict['periods'] == ((10, 20), (30, 40))) + assert(ValDict['adjust_constant'] == 10 and ValDict['adjust_hourly'] == (10, 20) and ValDict['adjust_periods'] == ((10, 20), (30, 40))) n_tests_passed += 1 # Test nested dictionary assignment and export TechDict = {'Plant': {'derate': 100, 'energy_output_array': (100, 200)}, - 'AdjustmentFactors': {'constant': 100, "hourly": (100, 200), "periods": ((100, 200), (300, 400))}} + 'AdjustmentFactors': {'adjust_constant': 100, "adjust_hourly": (100, 200), "adjust_periods": ((100, 200), (300, 400))}} a.assign(TechDict) ValDict = a.Plant.export() assert (ValDict['derate'] == 100 and ValDict['energy_output_array'] == (100, 200)) n_tests_passed += 1 ValDict = a.AdjustmentFactors.export() - assert (ValDict['constant'] == 100 and ValDict['hourly'] == (100, 200) and ValDict['periods'] == ( + assert (ValDict['adjust_constant'] == 100 and ValDict['adjust_hourly'] == (100, 200) and ValDict['adjust_periods'] == ( (100, 200), (300, 400))) n_tests_passed += 1