Remove forecast settings

tsmbland · tsmbland · commit 6e25b504f56f · 2025-01-27T14:41:22.000Z
diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst
@@ -581,7 +581,6 @@ function of macro-economic data, i.e. population and gdp.
     macrodrivers_path = '{path}/technodata/Macrodrivers.csv'
     regression_path = '{path}/technodata/regressionparameters.csv'
     timeslices_levels = {'day': ['all-day']}
-    forecast = [0, 5]
 
 The following attributes are accepted:
 
diff --git a/docs/tutorial-code/add-agent/1-single-objective/settings.toml b/docs/tutorial-code/add-agent/1-single-objective/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-region/1-new-region/settings.toml b/docs/tutorial-code/add-region/1-new-region/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml
@@ -65,7 +65,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 2  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
@@ -67,7 +66,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'
 lpsolver = "scipy"
 demand_share = "standard_demand"
-forecast = 2
 
 [sectors.gas]
 type = 'default'
@@ -82,7 +80,6 @@ agents = '{path}/technodata/Agents.csv'
 existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv'
 lpsolver = "scipy"
 demand_share = "standard_demand"
-forecast = 2
 
 [sectors.residential_presets]
 type = 'presets'
diff --git a/docs/tutorial-code/modify-timing-data/generate_models.py b/docs/tutorial-code/modify-timing-data/generate_models.py
@@ -6,7 +6,7 @@
 from tomlkit import dumps, parse
 
 from muse import examples
-from muse.wizard import add_timeslice, get_sectors, modify_toml
+from muse.wizard import add_timeslice, modify_toml
 
 parent_path = Path(__file__).parent
 
@@ -81,11 +81,6 @@ def generate_model_2():
     time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040]
     modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework}))
     modify_toml(settings_file, lambda x: x.update({"foresight": 2}))
-    for sector in get_sectors(model_path):
-        modify_toml(
-            settings_file,
-            lambda x: x["sectors"][sector]["subsectors"]["all"].update({"forecast": 2}),
-        )
 
 
 if __name__ == "__main__":
diff --git a/docs/tutorial-code/new-decision-metric/settings.toml b/docs/tutorial-code/new-decision-metric/settings.toml
@@ -50,7 +50,6 @@ constraints = [
     "search_space"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "new_and_retro"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [[sectors.residential.interactions]]
 net = 'new_to_retro'
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
@@ -52,7 +52,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.power]
 type = 'default'
diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml
@@ -58,7 +58,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "standard_demand"  # Optional, default to standard_demand
-forecast = 5  # Optional, defaults to 5
 
 [sectors.industry_presets]
 type = 'presets'
diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml
@@ -59,7 +59,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "new_and_retro"
-forecast = 5
 asset_threshold = 1e-4
 
 [[sectors.residential.interactions]]
@@ -91,7 +90,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "unmet_forecasted_demand"
-forecast = 5
 asset_threshold = 1e-4
 
 [sectors.gas]
@@ -119,7 +117,6 @@ constraints = [
     "demand_limiting_capacity"
 ]
 demand_share = "unmet_forecasted_demand"
-forecast = 5
 asset_threshold = 1e-4
 
 [timeslices]
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
@@ -257,7 +257,7 @@ def sector_fuel_costs(
     agent_market = market.copy()
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year - a.forecast
+            output_year = a.year
             agent_market["consumption"] = (market.consumption * a.quantity).sel(
                 year=output_year
             )
@@ -315,7 +315,7 @@ def sector_capital_costs(
 
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year - a.forecast
+            output_year = a.year
             capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
             data = a.filter_input(
                 technologies[["cap_par", "cap_exp"]],
@@ -362,7 +362,7 @@ def sector_emission_costs(
     agent_market = market.copy()
     if len(technologies) > 0:
         for a in agents:
-            output_year = a.year - a.forecast
+            output_year = a.year
             agent_market["consumption"] = (market.consumption * a.quantity).sel(
                 year=output_year
             )
@@ -427,7 +427,7 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
-            output_year = agent.year - agent.forecast
+            output_year = agent.year
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = agent_market.consumption * agent.quantity
             included = [
@@ -510,7 +510,7 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF
     agents = retro if len(retro) > 0 else new
     if len(technologies) > 0:
         for agent in agents:
-            output_year = agent.year - agent.forecast
+            output_year = agent.year
             agent_market = market.sel(year=output_year).copy()
             agent_market["consumption"] = agent_market.consumption * agent.quantity
             included = [

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ constraints = [`
`52`	`52`	`"demand_limiting_capacity"`
`53`	`53`	`]`
`54`	`54`	`demand_share = "standard_demand" # Optional, default to standard_demand`
`55`		`-forecast = 5 # Optional, defaults to 5`
`56`	`55`
`57`	`56`	`[sectors.power]`
`58`	`57`	`type = 'default'`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ constraints = [`
`65`	`65`	`"demand_limiting_capacity"`
`66`	`66`	`]`
`67`	`67`	`demand_share = "standard_demand" # Optional, default to standard_demand`
`68`		`-forecast = 5 # Optional, defaults to 5`
`69`	`68`
`70`	`69`	`[sectors.power]`
`71`	`70`	`type = 'default'`