Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset records #40

Merged
merged 3 commits into from
Mar 9, 2023
Merged

Reset records #40

merged 3 commits into from
Mar 9, 2023

Conversation

spjuhel
Copy link
Owner

@spjuhel spjuhel commented Mar 9, 2023

No description provided.

@spjuhel spjuhel merged commit e7eb252 into master-testing Mar 9, 2023
spjuhel added a commit that referenced this pull request Mar 13, 2023
* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black
spjuhel added a commit that referenced this pull request Mar 13, 2023
* Doc testing merge: master testing (#41)

* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* Create static_html_deploy.yml

* Delete documentation.yaml
spjuhel added a commit that referenced this pull request Mar 13, 2023
* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* static doc

* Update actions (#42)

* Doc testing merge: master testing (#41)

* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* Create static_html_deploy.yml

* Delete documentation.yaml
spjuhel added a commit that referenced this pull request Apr 18, 2023
* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* static doc

* Update actions (#42)

* Doc testing merge: master testing (#41)

* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* Create static_html_deploy.yml

* Delete documentation.yaml

* Delete documentation.yaml

* fixed arguments

* better inv init

* better psi init

* black + privatisation

* size of stocks

* optional results_dir_name

* debug

* debug message

* better float management

* custom monetary_factor

* Added model/event monetary factor.

Note that default behavior is now to consider that the event impact is defined
with the same monetary factor as the model and not as unitary.

* added "step" axis name in dataframe

* fix

* event_monetary in subclasses

* stock crash better dumping

* fix wrong path

* try catch in next_step

* better logging

* differentiate k_stock to recover and rebuilding demand

* added separate household rebuilding demand (#45)

* small fix for array existence condition

* fixed households rebuilding demand

* better printing

* fixed indicators

* Circle-CI req
spjuhel added a commit that referenced this pull request Apr 26, 2023
* Master testing (#43)

* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* static doc

* Update actions (#42)

* Doc testing merge: master testing (#41)

* removed unused import

* Feature/dict for invs (#35)

* first implementation

Inventory restoration tau can now be given as a dict containing all sectors.

* formatting

* Code improving

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* wip

* black

* no-file-record indicators update

* black

* better names

* Reset records (#40)

* show git branch + clean and reset records

* black

* small docs changes

* removed docs submodule

* doc in master

* Create documentation.yaml

* Update documentation.yaml

* Update documentation.yaml

* black

* Create static_html_deploy.yml

* Delete documentation.yaml

* Delete documentation.yaml

* Update issue templates (#50)
spjuhel added a commit that referenced this pull request Jun 7, 2023
* Feature/dict for invs (#35)

Inventory restoration tau can now be given as a dict containing all sectors.

* Code improving (#36)

* Flood dottori (#37)

* fix problem in impact distrib

* fixed rebuilding sectors

* documentation update + small fixes

* Feature/no file records (#39)

* optional records

* no-file-record indicators update

* better names

* Reset records (#40)

* doc in master

* Feature/dict for invs (#35)

* better inv init

* better psi init

* better float management

* custom monetary_factor

* Added model/event monetary factor.

Note that default behavior is now to consider that the event impact is defined
with the same monetary factor as the model and not as unitary.

* added "step" axis name in dataframe

* stock crash better dumping

* try catch in next_step

* better logging

* differentiate k_stock to recover and rebuilding demand

* added separate household rebuilding demand (#45)

* small fix for array existence condition

* fix float comparison

* Feature/arbitrary shocks (#48)

* fix breaking error with multi events (?)

* Minor Upgrade

- :refactor: Switched back from "productive_capital_impact" to "impact" keyword
in events objects.
- :refactor: Put recovery functions in own file
- :refactor: Using CategoricalIndex for regions, sectors, ...
- :refactor: Switched events to fully keyword args
- :refactor: Switched None attributes to 0-length array/index/...
- :feat: ArbitraryProdEvent implemented !
- :fix: Fixed an error where model would take the minimum prod delta when
using both delta from capital destroyed and arbitrary decrease
- :style: Shorter pymrio MRIO printing in log
- :refactor: Cleanup of no longer used methods
- :feat: add_event*s* method !
- :test: initiating test directory

* ✅ Adding tests

* :build: poetry init

* ✅ working simulation test suite

* 📖 (manual sources) few updates + new chronology + ipynb

* 📖 (auto-source) update from code source

* ✅ init Event testing

* 🤖 📦 pyright conf update

* 🚑 print summary on empty list

* ✅ 🌟 additional checks on inputs + really abstract Event

* 📖 better literature chronology

* 📦 (poetry): ipykernel dependency

* ✅ (event) additionnal tests

* ✅ 🚧 (event) Better init tests + some simulation test

* ✅ 🚑 (event) Some test + trying to debug 'gdp' case

* 🚑 (Event) : Fix of CategoricalIndex with one region affected

* 🚑 (Event) trying to debug households impact

* 🚑 (Event) : Better regexp (not matching NPISH)

* downgraded numpy to <1.24 for climada

* 🚑 (Simulation) Case where n_temporal_units_to_sim is numpy int

* 🚧 (ArioPsiModel) : Changed default psi to 0.80

* 🚑 (Event) : trying to debug negative values with climada

* 🚑 (Event) Select != 0 values in impact Series
    - Also tries to squeeze dataframe to series early on.

* 🚑 (Event) : Fix a bug with the regexp for rebuilding demand cata

- Rebuilding demand category regexp matched two index in EORA26
- Added a warning for future cases

* 💄 (event) : Non hard threshold for demand values

* 🚑 (Event) : Fixed problem with index when "gdp" distrib.

* 🚑 (Model/Event) : Fix gva_df not set + better VA<0 warning

* 🚑 (model) : Small fixes/improvements

- Better warning for negatives in VA
- Better selection of the value_added for the Event cls init
- Fixed a problem raised by using older version of numpy when initializing matrix_stock_gap

* 🚑 (Events): Warning for too low damage events

* 🚧 (Simulation) : Better logging.

* 📖 (Simulation) : Doc update

* 🤖 (gitignore) : update

* 🚧 💄  📖 (Model) : Cleanup pre v0.5.0

* 🚑 fixes #57

* 🚑 (Event) Avoid uninformative by zero division error

* 💄 🚧 🚑 📖 pre 0.5.0 cleanup

- __init__ cleanup
- internal variables name improvement
- several type hint fixes
- (Event): documentation of new instantiating methods
- fix #53 (Not certain ?)
- some lsp #ignore
- better imports

* ✅ (Simulation) additionnal tests

* Pre-release

* 🤖 (Documentation build) vstudio esbonio compat ? + poetry dep

* 📖 Doc update for 0.5.0

* 📖 Doc update for v0.5.0 (2)
@spjuhel spjuhel deleted the BoARIOxClimada branch August 11, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant