Skip to content

Feedback na regionaal toepassen Mariska en Mark - #99

Merged
chrispijo merged 244 commits into
mainfrom
alpha
Jun 1, 2026
Merged

Feedback na regionaal toepassen Mariska en Mark#99
chrispijo merged 244 commits into
mainfrom
alpha

Conversation

@chrispijo

Copy link
Copy Markdown
Collaborator

No description provided.

chrispijo and others added 30 commits June 23, 2025 15:52
Start env, logging en geoprop_pipe package
* Tussenstand

* Tussenstand

* Added timestamps for the 3 limit states

* Some logging changes

* Problems tab weggewerkt voor quick overview possible issues

* Start exporteren en visualiseren van resultaten

* Beta grafiek, InputData-object en herstructureren geoprob_pipe-package

* First figure finished

* Finished first version of results overview flow chart

* Emptied output dir

* rm dir output

* Added output dir to gitignore

* Small TODOs

* Start comparison OT en ProbLib with first unit test

* Coverage issue?

* Coverage issue?

* Coverage issue?

* Fixed coverage issue

* Fixed coverage issue

* Solving checkout issue

* Solving checkout issue

* Testing and coverage

* Split unit testing workflows

* Fixed setup unit test and coverage workflows

* Start on BaseSystemRelibabilityCalculation

* Finished parallel system, idea for piping child in progress

* Finished parallel piping system child

* Reliability calculations package structure and test setup defined

* Asserts toegevoegd aan example system calculation

* Beetje opschonen

* Fixed assertions

* Piping test input, maar uitkomst klopt nog niet

* DeterministicSystemCalculation created + working example PipingSystemReliabilityCalculation. But unsure if input or piping models are correct

* Collecting to dataframe finished

* first readme to view

* Nieuwe weergave

* Nieuwe weergave

* Nieuwe weergave

* workflow added

* Fix path issue

* Prevent import

* Update of TODO items in README

* Naar single project (#10)

* Single project system builder implemented, now ready for testing

* nog niet volledig werkend

* Small change in collect_todos-script

* Small change in collect_todos-script

* Small change in collect_todos-script

* Small change in collect_todos-script

* Exporteren resultaten klaar, structuur verbetered. Verder opruimen nog wel nodig

* Voorlopig afgerond

* fixed some small mistakes

* Update of TODO items in README

* verplaatsing van 2 bestanden

* Update of TODO items in README

* hfreq en beta export graphs func! (#12)

* Aanpassing van Ardjan

* hfreq grafiek afgerond!

* hfreq en beta export graphs func!

* small fixes

* suggestie aanpassingen aan graphs

* verbeterd

* bijna afgerond

* Added some future todos

* Hfreq werkt en beta uittredenpunten grafiek

* only small changes

---------

Co-authored-by: ardjanmethorst <a.methorst@wsrl.nl>
Co-authored-by: chrispijo <chrispitzalis@gmail.com>

* Update of TODO items in README

* Change pull request testing workflow

---------

Co-authored-by: GitHub Actions <action@github.com>
Co-authored-by: Laura van der Doef <lvanderdoef@outlook.com>
Co-authored-by: ardjanmethorst <a.methorst@wsrl.nl>
* Tussenstand

* Tussenstand

* Added timestamps for the 3 limit states

* Some logging changes

* Problems tab weggewerkt voor quick overview possible issues

* Start exporteren en visualiseren van resultaten

* Beta grafiek, InputData-object en herstructureren geoprob_pipe-package

* First figure finished

* Finished first version of results overview flow chart

* Emptied output dir

* rm dir output

* Added output dir to gitignore

* Small TODOs

* Start comparison OT en ProbLib with first unit test

* Coverage issue?

* Coverage issue?

* Coverage issue?

* Fixed coverage issue

* Fixed coverage issue

* Solving checkout issue

* Solving checkout issue

* Testing and coverage

* Split unit testing workflows

* Fixed setup unit test and coverage workflows

* Start on BaseSystemRelibabilityCalculation

* Finished parallel system, idea for piping child in progress

* Finished parallel piping system child

* Reliability calculations package structure and test setup defined

* Asserts toegevoegd aan example system calculation

* Beetje opschonen

* Fixed assertions

* Piping test input, maar uitkomst klopt nog niet

* DeterministicSystemCalculation created + working example PipingSystemReliabilityCalculation. But unsure if input or piping models are correct

* Collecting to dataframe finished

* first readme to view

* Nieuwe weergave

* Nieuwe weergave

* Nieuwe weergave

* workflow added

* Fix path issue

* Prevent import

* Update of TODO items in README

* Naar single project (#10)

* Single project system builder implemented, now ready for testing

* nog niet volledig werkend

* Small change in collect_todos-script

* Small change in collect_todos-script

* Small change in collect_todos-script

* Small change in collect_todos-script

* Exporteren resultaten klaar, structuur verbetered. Verder opruimen nog wel nodig

* Voorlopig afgerond

* fixed some small mistakes

* Update of TODO items in README

* verplaatsing van 2 bestanden

* Update of TODO items in README

* hfreq en beta export graphs func! (#12)

* Aanpassing van Ardjan

* hfreq grafiek afgerond!

* hfreq en beta export graphs func!

* small fixes

* suggestie aanpassingen aan graphs

* verbeterd

* bijna afgerond

* Added some future todos

* Hfreq werkt en beta uittredenpunten grafiek

* only small changes

---------

Co-authored-by: ardjanmethorst <a.methorst@wsrl.nl>
Co-authored-by: chrispijo <chrispitzalis@gmail.com>

* plotly werkt niet

* interactive added

* hfreq oude reset

* tussenstand plotly betrouwbaarheidsindex

* Finished TrajectNormering

* Finished HFreq single interactive graph

* Oude betrouwbaarheidsfiguren tijdelijk teruggezet

---------

Co-authored-by: GitHub Actions <action@github.com>
Co-authored-by: Laura van der Doef <lvanderdoef@outlook.com>
Co-authored-by: ardjanmethorst <a.methorst@wsrl.nl>
* added geopackage

* First version of exporting spatial data (geopackage)

* Added exporting validation messages of calculations

* Finished exporting alphas, physical values and influence factors

* Added graph physical values buitenwaterstand

* Grotendeel feedback 2025-08-11 verwerkt

* Some small changes for release
* Kleine aanpassingen aan de figuren

* Small changes to gitignore

* Added 224 as system unit test

* 224 hrd excluded van gitignore

* Small change to readme

* Trigger toegevoegd voor bestanden bij unit tests

* Small change

* Figuur invloedsfactoren afgerond
VincentJilesen and others added 29 commits April 22, 2026 13:01
* Nvak en window voor vakken geimplementeerd

* Vak scaled per uittredepunt en alle opties voor traject

* fix if all vakken are run

* fix and docstring for functions

* docstring verduidelijkt

* minor fix

* pof begrensd

* fix

* Gecorrigeerde som

* print verwijderd

* upper and lower bounds

* Convergence alvast ingebouwd om merge problemen te voorkomen.

* betamap bugfix voor niet alle vakken runnen

* Icicleplot

* Icicle layout

* Merge fix en export

* Icicle layout fix

* Formatting changes

* vakken upgrade

* Icicle namen en sortering

* scaled

* Test, plot

* Merge fixes, sphinx missing requirements, gitignore new docs_build

* Excel updated

* betrouwbaarheidsindex leeg vak fix, test fix

* traject hovertemplate

* comparison update naar nieuwe dataframes

* Rename Excel export file for WBI vakken to df_beta_vakken.xlsx

* Update beta rounding precision and adjust parameter values in dataframes

* docstring

* Commentaar verwerkt

* Docstring Assemblage

* Docstring construct_dataframes

* Hernoeming map en disable export vakken map

* Added validation on scenario kans

* code ingekort

* Docsting correctie deel 1

* Spelling en docstring

* Small changes

* Improvement of readabiliity

* Improvement of readabiliity

* update of docstring

* Small change

* Smal lchange

* small changes to docstring combine_series function

* Anticipate empty vakken

* Small clarication in graph

* Version bump

* Tussenstand

---------

Co-authored-by: chrispijo <chrispitzalis@gmail.com>
Co-authored-by: Sander Kapinga <s.kapinga@wsrl.nl>
* Indices uit Excel exports

* buitenwaterstand, mv_exit, geom-lijnen uit initiele excel export gehaald

* Exports uitgebreid

* Latest changes

* Idee krijgt eerste vorm

* Export complete

* Small change

* Start with generic filters

* Filters finished

* Voorlopig afgerond

* Tussenstand

* Validatie gekoppeld

* Small changes

* Small fix

* Finished
* Idee krijgt eerste vorm

* Export complete

* Small change

* Start with generic filters

* Filters finished

* Voorlopig afgerond

* Tussenstand

* Validatie gekoppeld
* Start gemaakt

* tussenstand

* Expanding fixed

* Tussenstand

* Start afronden figuur

* Tussenstand

* Finished

* Finished
* change on parameters initial input

* changed scope_referentie and ondergrondscenario_naam to default value pd.NA to meet validation requirements

* fix crash in geoprob_pipe due to validation errors

* Validation issue fix

* Added new test

* Added new test

* Build and run test

* In progress: Vraag aan Sander

* Update

* Test Traject Normering

---------

Co-authored-by: chrispijo <chrispitzalis@gmail.com>
* Initial commit

* Initiatie workflow

* v6 test

* setup-python action update

* setup-python action update

* action update

* action update
* verduidelijking validatie bericht

* Assertion on geometry types from vakindeling projection

* Controle of vakindeling samenvoegbaar is tot één lijn

* Verduidelijking bericht

* Polderpeil validatie toevoegd

* gamma_korrel correctie

* Bugfix traject pof>1

* Version up
@chrispijo
chrispijo merged commit 04c66e0 into main Jun 1, 2026
1 check passed
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.

5 participants