Skip to content

Delete interest_rate parameter from settings file #679

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

Merged
tsmbland merged 3 commits into from
Mar 17, 2025
Merged

Delete interest_rate parameter from settings file #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a463314
Delete interest_rate parameter from settings file
tsmbland Mar 17, 2025
fd7d2a8
Link PR
tsmbland Mar 17, 2025
0a0eccd
Remove from test fixture
tsmbland Mar 17, 2025
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
1 change: 0 additions & 1 deletion docs/inputs/toml.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ a whole.

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["USA"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'

Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-agent/1-single-objective/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-agent/2-multiple-objective/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-new-technology/1-introduction/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind", "solar"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-new-technology/2-scenario/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind", "solar"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-region/1-new-region/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1", "R2"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial-code/new-decision-metric/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins = "{path}/new_decision.py"
# Global settings - most REQUIRED
time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind", "solar"]
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/default_settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = 'REQUIRED'
regions = 'REQUIRED'
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
# Convergence parameters
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/example/default/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/example/default_retro/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/example/default_timeslice/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/example/minimum_service/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2010, 2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050]
regions = ["R1"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["fuel1", "fuel2", "fuel3"]
Expand Down
1 change: 0 additions & 1 deletion src/muse/data/example/trade/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

time_framework = [2020, 2025, 2030, 2035]
regions = ["R1", "R2"]
interest_rate = 0.1
interpolation_mode = 'linear'
log_level = 'info'
excluded_commodities = ["wind"]
Expand Down
19 changes: 10 additions & 9 deletions src/muse/mca.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA:

extras = {
"regions",
"interest_rate",
"log_level",
"interpolation_mode",
"timeslices",
Expand All @@ -94,14 +93,16 @@ def factory(cls, settings: str | Path | Mapping | Any) -> MCA:
if not hasattr(v, "_asdict") and k not in extras
}

# Legacy: warn user about deprecation of "foresight" parameter (#641)
if "foresight" in global_kw:
msg = (
"The `foresight` parameter has been deprecated. "
"Please remove from your settings file."
)
getLogger(__name__).warning(msg)
global_kw.pop("foresight")
# Legacy: warn user about deprecated parameters (#641, #679)
deprecated_params = ["foresight", "interest_rate"]
for param in deprecated_params:
if param in global_kw:
msg = (
f"The `{param}` parameter has been deprecated. "
"Please remove it from your settings file."
)
getLogger(__name__).warning(msg)
global_kw.pop(param)

carbon_kw = {
k: v._asdict() if hasattr(v, "_asdict") else v
Expand Down
1 change: 0 additions & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,6 @@ def drop_optionals(settings):
required = {
"time_framework": [2010, 2015, 2020],
"regions": ["MEX"],
"interest_rate": 0.1,
"equilibrium": False,
"maximum_iterations": 3,
"tolerance": 0.1,
Expand Down
Loading