Skip to content

Commit ad4d00b

Browse files
measrainseytgilon
andauthored
refac: remove cba.methods config option (#805)
* refac: remove `cba.methods` config option * docs: remove methods from `cba` config keys in doc/scenarios * docs: add PR #805 to doc/release_notes --------- Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
1 parent cedff48 commit ad4d00b

8 files changed

Lines changed: 2 additions & 38 deletions

File tree

config/config.default.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,8 +1621,6 @@ cba:
16211621
cba_scenario_input:
16221622
use_presolved: false
16231623
sb_version: latest
1624-
methods:
1625-
- toot
16261624
projects: []
16271625
area: tyndp
16281626
remove_noisy_costs: true

config/config.tyndp.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,6 @@ cba:
430430
cba_scenario_input:
431431
use_presolved: false
432432
sb_version: latest # use 'latest' or a supported version from data/versions.csv for pre-solved SB network input in CBA; only applies if use_presolved is true
433-
methods:
434-
- toot
435-
- pint
436433
projects:
437434
- t1-t35
438435
area: tyndp # options: tyndp (TODO: entso-e, eu27)

config/schema.default.json

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -496,17 +496,6 @@
496496
}
497497
}
498498
},
499-
"methods": {
500-
"description": "Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
501-
"items": {
502-
"enum": [
503-
"toot",
504-
"pint"
505-
],
506-
"type": "string"
507-
},
508-
"type": "array"
509-
},
510499
"projects": {
511500
"description": "List of project identifiers to evaluate (e.g., 't1-t35').",
512501
"items": {
@@ -15689,17 +15678,6 @@
1568915678
}
1569015679
}
1569115680
},
15692-
"methods": {
15693-
"description": "Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
15694-
"items": {
15695-
"enum": [
15696-
"toot",
15697-
"pint"
15698-
],
15699-
"type": "string"
15700-
},
15701-
"type": "array"
15702-
},
1570315681
"projects": {
1570415682
"description": "List of project identifiers to evaluate (e.g., 't1-t35').",
1570515683
"items": {

config/test/config.cyears.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,6 @@ cba:
440440
cba_scenario_input:
441441
use_presolved: false
442442
sb_version: latest # currently only latest is supported
443-
methods:
444-
- toot
445-
- pint
446443
projects:
447444
- t1-t35
448445
area: tyndp # options: tyndp (TODO: entso-e, eu27)

config/test/config.tyndp.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,6 @@ cba:
438438
cba_scenario_input:
439439
use_presolved: false
440440
sb_version: latest # use 'latest' or a supported version from data/versions.csv for pre-solved SB network input in CBA; only applies if use_presolved is true
441-
methods:
442-
- toot
443-
- pint
444441
projects:
445442
- t1-t35
446443
area: tyndp # options: tyndp (TODO: entso-e, eu27)

doc/release_notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
* Restore correct assigned countries for virtual TYNDP nodes ([#794](https://github.com/open-energy-transition/open-tyndp/pull/794)).
4747

48+
* Remove unused `cba.methods` config option ([#805](https://github.com/open-energy-transition/open-tyndp/pull/805)).
4849

4950
**Documentation**
5051

doc/scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ to form the two deviation scenarios are defined in `config/scenarios.tyndp.yaml`
8787
| `solving` | Solver selection and option set (uses HiGHS by default). |
8888
| `plotting` | Thresholds, map projection, balance map settings and factors. |
8989
| `benchmarking` | Enables benchmarking. |
90-
| `cba` | Cost-benefit analysis settings (hurdle costs, horizons, methods, projects, solver options). |
90+
| `cba` | Cost-benefit analysis settings (hurdle costs, horizons, projects, solver options). |
9191

9292
The base config is `config.tyndp.yaml`. The scenario file `scenarios.tyndp.yaml` defines per-scenario override blocks (e.g., NT, DE, GA).
9393
When a scenario is selected, its keys are merged onto the base config: matching keys override the base values,

scripts/lib/validation/config/cba.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ class CbaConfig(BaseModel):
157157
default_factory=_CbaSbToCbaConfig,
158158
description="Settings for using pre-solved SB networks as inputs to the CBA workflow.",
159159
)
160-
methods: list[Literal["toot", "pint"]] = Field(
161-
default_factory=lambda: ["toot"],
162-
description="Methodologies to apply: 'toot' (take one out at a time) and 'pint' (put in one at a time).",
163-
)
164160
projects: list[str] = Field(
165161
default_factory=list,
166162
description="List of project identifiers to evaluate (e.g., 't1-t35').",

0 commit comments

Comments
 (0)