diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml index 50058a1a6..4d545887e 100644 --- a/docs/tutorial-code/0-new-decision-metric/settings.toml +++ b/docs/tutorial-code/0-new-decision-metric/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml index ae6e00b27..ffce678be 100644 --- a/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml +++ b/docs/tutorial-code/1-add-new-technology/1-introduction/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml index ae6e00b27..ffce678be 100644 --- a/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml +++ b/docs/tutorial-code/1-add-new-technology/2-scenario/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml index ae6e00b27..ffce678be 100644 --- a/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/1-single-objective/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml index ae6e00b27..ffce678be 100644 --- a/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/2-add-agent/2-multiple-objective/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/3-add-region/1-new-region/settings.toml b/docs/tutorial-code/3-add-region/1-new-region/settings.toml index 39bad6de0..f20a25609 100644 --- a/docs/tutorial-code/3-add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/3-add-region/1-new-region/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml index 407798c8d..7dc8dbe56 100644 --- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml +++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml index 177256be2..faf5e9d39 100644 --- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml +++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml index 407798c8d..7dc8dbe56 100644 --- a/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml +++ b/docs/tutorial-code/5-add-service-demand/1-exogenous-demand/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml index 5d841a5fd..66bccf257 100644 --- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml +++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml index 29622f6ba..8271924e4 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml +++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/settings.toml @@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml index 29622f6ba..8271924e4 100644 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml +++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/settings.toml @@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py index efd7056fd..64150ec81 100644 --- a/src/muse/agents/factories.py +++ b/src/muse/agents/factories.py @@ -394,7 +394,7 @@ def _standardize_inputs( def _standardize_investing_inputs( search_rules: Optional[Union[str, Sequence[str]]] = None, - investment: Union[Callable, str, Mapping] = "adhoc", + investment: Union[Callable, str, Mapping] = "scipy", constraints: Optional[ Union[Callable, str, Mapping, Sequence[Union[str, Mapping]]] ] = None, diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index ea55d7112..7f34fb9c9 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/settings.toml @@ -53,7 +53,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index 29622f6ba..8271924e4 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/settings.toml @@ -55,7 +55,7 @@ commodities_out = '{path}/technodata/residential/CommOut.csv' [sectors.residential.subsectors.retro_and_new] agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/residential/ExistingCapacity.csv' -lpsolver = "scipy" # Optional, defaults to "adhoc" +lpsolver = "scipy" # Optional, defaults to "scipy" constraints = [ # Optional, defaults to the constraints below "max_production", diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py index 846b379f5..533906cf7 100644 --- a/src/muse/sectors/subsector.py +++ b/src/muse/sectors/subsector.py @@ -182,7 +182,7 @@ def factory( year=current_year or int(technologies.year.min()), asset_threshhold=getattr(settings, "asset_threshhold", 1e-12), # only used by self-investing agents - investment=getattr(settings, "lpsolver", "adhoc"), + investment=getattr(settings, "lpsolver", "scipy"), forecast=getattr(settings, "forecast", 5), constraints=getattr(settings, "constraints", ()), )