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.

Sign up for GitHub

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

Jump to bottom

Prepare next release #13

Open
wants to merge 363 commits into
base: main
Choose a base branch
from
Open

Prepare next release #13

wants to merge 363 commits into from

Conversation

hsonne
Copy link
Member

@hsonne hsonne commented Nov 17, 2023

No description provided.

hsonne and others added 30 commits February 26, 2024 13:15
@hsonne
Change interface to columns_with()
a15caf1
@hsonne
Consider new column "block_type" in unit test
5b60aaf
@hsonne
Extract get_block_type()
c881366 
and integrate read_abimo_berlin_metadata()
into that function
@hsonne
Fix warning, shorten the code by pasting ".csv"
52253db
@hsonne
Merge pull request #18 from KWB-R/continue-restructuring
7f99ec9 
Continue restructuring
@hsonne
Rewrite in_range() to accept a tolerance
462b499
@hsonne
Remove extra small summand
1a8411f
@hsonne
Add rescale_to_row_sum()
d09e1a9
@hsonne
Make R-Abimo run with 2019 and 2020 data
6a36a30
@hsonne
Prepare Excel file for Dominik
397234f
@hsonne
Rename main argument of run_rabimo() to "data"
561abd2
@hsonne
Rename argument "input_data" to "data"
3779a5e
@hsonne
Rename usage_is_*() to land_type_is_*()
3a69aea
@hsonne
Rename "usage.R" to "land_type_is.R"
df24cce
@hsonne
Add dummy test functions
613e28c
@hsonne
Finish renaming of "usage.R" to "land_type_is.R"
1c90ebf
@hsonne
Remove suffix letter from land type keywords
7ab2c4f
@hsonne
Rename _is_agricultural() to _is_urban()
aa1e50e
@hsonne
Rename "is_agri" to "is_urban"
e605a89
@hsonne
Rename "ep_year" to "epot_year"
20c51df
@hsonne
Rename "yield" to "veg_class"
ab6b990
@hsonne
Rename BERLIN_TYPES_TO_USAGE_YIELD_IRRIGATION
bd5c660 
to BERLIN_TYPES_TO_LAND_TYPE_VEG_CLASS_IRRIGATION
@hsonne
Use land_type, veg_class consistently
feb5dd1
@hsonne
Slightly improve argument description
df57255
@hsonne
Rename stop_on_invalid_input() to ..._data()
b2a1eed
@hsonne
Do not check for a specific column any more
e5a2cba
@hsonne
Slightly improve documentation, add example
dd9a0d5
@hsonne
Rename fetch_input() to fetch_data()
80e2865
@hsonne
Use helper variable "rpot"
7b515c4
@f-delpu
Calculate DeltaW for clickdummy
2ba649c
f-delpu and others added 30 commits August 12, 2024 17:14
@f-delpu
Round expressions to make them work with tiny deltas
3b3e428
@f-delpu
Add equation for max allowed unpaved value
3061db1
@hsonne
Improve comments
8ca2299
@hsonne
Move get_measure_stats_new() into the package
74919f3 
and rename it to get_measure_stats()
@hsonne
Cross check results of different calculations
433b64d
@f-delpu
Add argument sheet for xls table
77918c5
@f-delpu
Add manual for run_rabimo_with_measures()
2636c59
@f-delpu
Resolve merge conflict
078f308 
Merge branch 'dev' into rescale_and_distribute

# Conflicts:
#	inst/scripts/distribute-measures.R
@f-delpu
Update DESCRIPTION and NAMESPACE
2015e74
@f-delpu
Add new calibration script and comparison function
ea63b35
@hsonne
Fix documentation or run_rabimo_with_measures()
3d8b2e6
@hsonne
Extend API function /run_rabimo
ba26238 
Call run_rabimo_with_measures() if measures are
given
@hsonne
Add test_api() to run swagger via plumber
222d162
@hsonne
Rename output columns
25b8d67 
and simplify the creation of the result data frame!
@hsonne
Let get_measure_stats() return a list of lists
b35b2cd
@hsonne
Test slightly smaller values that max values
5c35c21 
to prevent from errors
@hsonne
Add "weighted_means" to output
331925c
@hsonne
Downgrade Roxygen
9fb70ae
@hsonne
Use helper variables "zeros", "tot_area"
877b01c
@hsonne
Fix test
9154254
@hsonne
Merge pull request #32 from KWB-R/rescale_and_distribute
906b15e 
Rescale and distribute
@hsonne
Use "safety factor" to diminish max values
ac5836b
@hsonne
Add plot_triangle_of_fractions()
31b2f47
@hsonne
Use axis functions, add tick marks
b4cf7b4
@hsonne
Add endpoint /triangle to plumber API
0bd3907
@hsonne
Fix 🐛
a04f1bc
@hsonne
Visualise 2nd water balance and diff in triangle
b1b482e
@hsonne
Extend example
6fd7268
@hsonne
Make arrows slightly transparent, update API
05d83a8
@hsonne
Fix bug in extimate_water_holding_capacity()
615ee31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hsonne @f-delpu @pmoevius