Skip to content

Commit cfd7c0a

Browse files
committed
Merge branch 'feature/option-appraisal-dataclasses' into feature/option-appraisal-costincome
2 parents a2b5d09 + 5b11b68 commit cfd7c0a

3 files changed

Lines changed: 17 additions & 25 deletions

File tree

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
climada\.trajectories\.impact_calc_strat module
2-
----------------------------------------
1+
climada\.entity\.measures package
2+
=================================
33

4-
.. automodule:: climada.trajectories.impact_calc_strat
4+
.. note::
5+
This package implements the new way of defining measures.
6+
For the previous way, see :ref:`climada.entity._legacy_measures`
7+
8+
climada\.entity\.measures\.measure_config module
9+
------------------------------------------------
10+
11+
.. automodule:: climada.entity.measures.measure_config
512
:members:
613
:undoc-members:
714
:show-inheritance:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
climada\.trajectories\.impact_calc_strat module
2+
----------------------------------------
3+
4+
.. automodule:: climada.trajectories.impact_calc_strat
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

doc/api/climada/measures.rst

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)