Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
1a755c3
makes soon to be old `measures` module a legacy
spjuhel Apr 2, 2026
ceaf479
Oups these shouldn't be here!
spjuhel Apr 2, 2026
c176e80
Forgotten places
spjuhel Apr 2, 2026
4010812
Adds cost income
spjuhel Apr 7, 2026
2c0dffa
Introduces measure config dataclasses
spjuhel Apr 7, 2026
e9f4831
Cleans-up, Docstringfies
spjuhel Apr 7, 2026
bcf6811
Better to_dict, color parser, and post_inits
spjuhel Apr 7, 2026
2718c84
Unit tests
spjuhel Apr 7, 2026
c5345fb
Removes duplicate docstring
spjuhel Apr 7, 2026
3883cc4
Merge remote-tracking branch 'origin/develop' into feature/option-app…
spjuhel Apr 7, 2026
c93ba6f
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 7, 2026
4551e3c
Forgotten places
spjuhel Apr 2, 2026
78c4968
tests again
spjuhel Apr 7, 2026
3cae5d7
Merge branch 'feature/option-appraisal-dataclasses' of github.com:CLI…
spjuhel Apr 7, 2026
14899d6
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 7, 2026
2580d07
Adds main file
spjuhel Apr 8, 2026
108bcb2
Updates changelog
spjuhel Apr 8, 2026
c96a061
Adds freq modifiers
spjuhel Apr 8, 2026
4e416bc
Improves __repr__
spjuhel Apr 8, 2026
30bdce6
Tutorial first draft
spjuhel Apr 8, 2026
ff6733e
Docstringyfies and cleans up a bit
spjuhel Apr 9, 2026
66a3f70
Fix resampling issues, few docstring adjustments
spjuhel Apr 9, 2026
1a1c97d
Removes periodic income from implementation period for consistency
spjuhel Apr 9, 2026
5822a69
Removes discount rate logic (to be handled in StaticAppraiser)
spjuhel Apr 9, 2026
971a772
Adds unit tests
spjuhel Apr 9, 2026
243cbac
Adds nice __repr__
spjuhel Apr 9, 2026
a17f2e2
Improves freq handling, nicer plot
spjuhel Apr 9, 2026
abe1fdf
Adds test for freq manipulations
spjuhel Apr 9, 2026
1513c11
Adds tutorial file
spjuhel Apr 9, 2026
bc5fefc
Adds future documentation placeholders, warnings in legacy guides
spjuhel Apr 9, 2026
3725078
This one does not exist yet
spjuhel Apr 9, 2026
5c80864
Merge branch 'feature/option-appraisal-split-make-legacy' into featur…
spjuhel Apr 9, 2026
cc70476
Includes guide in documentation index
spjuhel Apr 9, 2026
7a74b51
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 9, 2026
53ccaf7
Includes notebook in documentation index
spjuhel Apr 9, 2026
a9fd1c6
Updates changelog
spjuhel Apr 10, 2026
44a36d4
Updates changelog
spjuhel Apr 10, 2026
f7b86a7
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 10, 2026
ff91b04
Merge branch 'feature/option-appraisal-costincome' into feature/optio…
spjuhel Apr 10, 2026
1c55e44
Adds `types.py`
spjuhel Apr 10, 2026
7f72bd4
Adds and improves docstrings
spjuhel Apr 10, 2026
e4d7fc4
Updates rst files
spjuhel Apr 10, 2026
5634482
Merge branch 'feature/option-appraisal-split-make-legacy' into featur…
spjuhel Apr 10, 2026
8a09101
Adds new class to API ref
spjuhel Apr 10, 2026
42876fa
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 10, 2026
d787844
Adds class to rst index
spjuhel Apr 10, 2026
775c621
Fixes wrong filename
spjuhel Apr 10, 2026
a2b5d09
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 10, 2026
3ddf2b4
Revert "Fixes wrong filename"
spjuhel Apr 10, 2026
5b11b68
Correct rename
spjuhel Apr 10, 2026
cfd7c0a
Merge branch 'feature/option-appraisal-dataclasses' into feature/opti…
spjuhel Apr 10, 2026
c888844
Merge branch 'feature/option-appraisal-costincome' into feature/optio…
spjuhel Apr 10, 2026
ef39bde
Adds class to rst index
spjuhel Apr 10, 2026
d386972
Merge branch 'feature/option-appraisal-costincome' into feature/optio…
spjuhel Apr 10, 2026
89fd015
Adds modules to rst index
spjuhel Apr 10, 2026
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ Code freeze date: YYYY-MM-DD

### Added

- Better type hints and overloads signatures for ImpactFuncSet [#1250](https://github.com/CLIMADA-project/climada_python/pull/1250)
- Better type hints and overloads signatures for `ImpactFuncSet` [#1250](https://github.com/CLIMADA-project/climada_python/pull/1250)
- Adds `CostIncome` class and related tutorial for future new `Measure` class. [#1277](https://github.com/CLIMADA-project/climada_python/pull/1277)
- Adds `MeasureConfig` and related dataclasses for new `Measure` object retrocompatibility and (de)serialization capabilities [#1276](https://github.com/CLIMADA-project/climada_python/pull/1276)

### Changed
- Updated Impact Calculation Tutorial (`doc.climada_engine_Impact.ipynb`) [#1095](https://github.com/CLIMADA-project/climada_python/pull/1095).
- Makes current `measure` module a legacy module, moving it to `_legacy_measure`, to retain compatibility with `CostBenefit` class and various tests. [#1274](https://github.com/CLIMADA-project/climada_python/pull/1274)

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions climada/engine/test/test_cost_benefit.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
risk_rp_100,
risk_rp_250,
)
from climada.entity._legacy_measures import Measure
from climada.entity._legacy_measures.base import LOGGER as ILOG
from climada.entity.disc_rates import DiscRates
from climada.entity.entity_def import Entity
from climada.entity.measures import Measure
from climada.entity.measures.base import LOGGER as ILOG
from climada.hazard.base import Hazard
from climada.test import get_test_file
from climada.util.api_client import Client
Expand Down
4 changes: 2 additions & 2 deletions climada/engine/unsequa/input_var.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ def ent(
exp_list : [climada.entity.exposures.base.Exposure]
The list of base exposure. Can be one or many to uniformly sample
from.
meas_set : climada.entity.measures.measure_set.MeasureSet
meas_set : climada.entity._legacy_measures.measure_set.MeasureSet
The base measures.
haz_id_dict : dict
Dictionary of the impact functions affected by uncertainty.
Expand Down Expand Up @@ -660,7 +660,7 @@ def entfut(
exp_list : [climada.entity.exposures.base.Exposure]
The list of base exposure. Can be one or many to uniformly sample
from.
meas_set : climada.entity.measures.measure_set.MeasureSet
meas_set : climada.entity._legacy_measures.measure_set.MeasureSet
The base measures.
haz_id_dict : dict
Dictionary of the impact functions affected by uncertainty.
Expand Down
2 changes: 1 addition & 1 deletion climada/entity/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
init entity
"""

from ._legacy_measures import *
from .disc_rates import *
from .entity_def import *
from .exposures import *
from .impact_funcs import *
from .measures import *
Loading
Loading