Skip to content

Replace bool and istruefalse with getboolean #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cormacmlynch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace bool and istruefalse with getboolean #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions SourceCode/model_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ class ModelRun:

def __init__(self):

istruefalse = lambda x: True if x == 'True' else False

# read in the arguments here
self.settingsini = False
if len(sys.argv) > 1:
Expand All @@ -219,24 +217,25 @@ def __init__(self):
# define years to run the model for
self.years = np.arange(self.model_start, self.model_end + 1)
# ! keep TRUE unless want to turn-off within year iter
self.SWITCH_WITHIN_YEAR_LOOP = bool(config.get('settings', 'SWITCH_WITHIN_YEAR_LOOP'))
self.mrio_inverse_recalculate = bool(config.get('settings', 'mrio_inverse_recalculate'))
self.SWITCH_WITHIN_YEAR_LOOP = config.getboolean('settings', 'SWITCH_WITHIN_YEAR_LOOP')
self.mrio_inverse_recalculate = config.getboolean('settings', 'mrio_inverse_recalculate')
# TODO these are possibilities to store tax_incidence or dL_ener in file if they are not changing between scenarios
# TODO these are NOT currently used
self.tax_incidence_file = str(config.get('settings', 'tax_incidence_file'))
self.dL_ener_file = str(config.get('settings', 'dL_ener_file'))
# TODO check whether / how this is still relevant?
self.bta = int(config.get('settings', 'bta'))
self.CALIBRATING = istruefalse(config.get('settings', 'CALIBRATING'))
self.ftt_run = istruefalse(config.get('settings', 'ftt_run'))
self.CALIBRATING = config.getboolean('settings', 'CALIBRATING')
self.ftt_run = config.getboolean('settings', 'ftt_run')
print(f"FTT run is set to {self.ftt_run}")

self.COND_LABOR = int(config.get('settings','COND_LABOR')) / 100
self.COND_TAX = int(config.get('settings','COND_TAX')) / 100
self.COND_TRADE = int(config.get('settings','COND_TRADE')) / 100
self.COND_PRICE = int(config.get('settings','COND_PRICE')) / 100
self.ITER_MAX = int(config.get('settings','ITER_MAX'))

self.WRITE_AT_END = bool(config.get('settings', 'WRITE_AT_END'))
self.WRITE_AT_END = config.getboolean('settings', 'WRITE_AT_END')

self.ftt_model = None

Expand Down