-
Notifications
You must be signed in to change notification settings - Fork 0
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
Reg al #100
Closed
Closed
Reg al #100
Changes from 40 commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
eaa8dc8
regeneration: toevoeging van mean_nr_of_trees_ha
leymanan 81bf81a
calc_reg_corte_area_XX:
leymanan 32934b7
load_data_regeneration: naam subplot ook inladen
leymanan 650340f
load_veg en load_herblayer: subplot-naam toegevoegd
leymanan f38d0d0
calc_veg_CA_species: correctie percentage plots met vegetatie (n_subp…
leymanan 3ea45ae
calc_veg_plot:
leymanan 1cbfbc8
calc_reg en calc_veg functies: subplot bij documentatie toegevoegd
leymanan 02765da
calc_veg_ca_species: aanpassing browseindex (gewijzigde LU-list)
leymanan f579319
calc_veg_core_area_species: data_vegetation toegevogd bij argument
leymanan 75d9833
load_plotinfo uitgebreid (+ manual)
leymanan eb9680b
load_plotinfo uitgebreid (+ manual)
leymanan 83616a9
calc_veg_core_area: foutje (data_veg_CA vergeten)
leymanan 2cfb7ef
problem
leymanan 08469b5
problem
leymanan 3617bb8
load_plotinfo: '-' vergeten
leymanan 7184e01
read_forresdat:
leymanan 520d2e4
read_forresdat
leymanan d5aed27
load_forresdat: aanpassing documentatie nalv uitbreiding plotinfo
leymanan c03a744
calc_veg_plot: variabele "cumm_herb_coverage_class_average_perc" teru…
leymanan 93c7824
load-data_dendro: oldid toegevoegd
leymanan 1d8ad15
create_unique_tree_id: periode 1 géén old_id's anders werkt code niet…
leymanan 4e9e2d3
load_data_shoots: mogelijkheid om extra variables toe te voegen
leymanan bee94a6
load_data_dendrometry: "Trees." vergeten
leymanan 78f05c6
load_data_shoots: extra "_shoots" toegeveogd bij iufro klasses: makke…
leymanan caf8d29
load_data_reg/veg/herbl: subplot_name verwijderd
leymanan 2df7c3d
Update R/calculate_regeneration_core_area_height_species.R
leymanan 9a99dd0
calc_reg_core_area: aanpassingen cfr Els (mutate ipv left_join)
leymanan 2725cc7
calc_veg_core_area: cfr regeneration ook left_join vervangen door mutate
leymanan c1dce72
Update R/create_unique_tree_id.R
leymanan b4dbd4e
Update R/calculate_regeneration_plot_height.R
leymanan 8d5ee21
Update R/calculate_regeneration_plot_height_species.R
leymanan 70adc6e
Update R/calculate_vegetation_plot.R
leymanan 04e1684
Update R/calculate_regeneration_plot.R
leymanan 1efc593
fixes issue #90
ElsLommelen ab720a6
update documentation
ElsLommelen 6fe8868
Merge pull request #93 from inbo/issue90
leymanan 9c28d4d
Merge branch 'master' of https://github.com/inbo/forrescalc into reg_AL
leymanan abe2e4e
Merge branch 'statistics-and-other-issues' into reg_AL
leymanan 3fb6815
na vgl van branch reg_Al en branch statistics nog 4 files aangepast:
leymanan a25d5d7
compose_stem_data: ook info mbt "remark" meenemen van layer shoots
leymanan d0be3a8
add height models to script Main.R
ElsLommelen 2f8b2fc
Merge pull request #101 from inbo/update-Main-script
leymanan 86340ce
Update R/read_forresdat.R
leymanan 618bce4
Update R/read_forresdat.R
leymanan c144e8f
load & calc_veg_plot:
leymanan 9e47057
compose_stem_data:
leymanan c430e85
Main.R: verwijderen code voor niet opgemeten deadwood.
leymanan afd79e7
aanpassingen nalv lint_package, vooral inkorten van lijnen
leymanan 923ae6a
load_data_veg: dubbele aanmaak mid_cover
leymanan 7ec13e6
load_data_veg, load_data_herblayer, calc_veg_plot:
leymanan b3767ac
load_data_veg: typo
leymanan 04e28fd
calc_veg_plot: "date_vegetation" toegevoegd
leymanan 92b2190
load_data_herblayer: typo
leymanan 4afcf78
DAS_indicator.Rmd: verwijderen van blanco's op einde regels (cfr lint)
leymanan e9c6067
load_data_reg: "year_main_survey" verwijderd om verwarring te voorkomen.
leymanan 7806699
load_data_veg: year_main_survey bij voorkeur obv data_vegetation, enk…
leymanan acbf7c9
load_plotinfo: date_dendro_1986 toegevoegd
leymanan 0200341
calc_var_stem_level: height trees minimaal 1.3m
leymanan 18f1758
removal of variable "nr_of_regeneration_ha" (or "nr_established_ha" a…
leymanan c3759ee
calc_reg_plot: error: "mean" instead of "sum" used
leymanan 20901af
calc_regeneration_functions: extra info about confidence interval
leymanan 0dba594
5 calc_reg_functions: info on "return" adjusted for the removal of nr…
leymanan 7d3f221
sum_intervals: uci was NaN ipv 0 daar waar mean en lci wél 0 waren.
leymanan af84947
calculate_regeneration_plot &
leymanan a4ee087
calc_reg_plot_corearea_species: klein foutje (mean ipv sum)
leymanan 3dbef1a
Update R/calc_variables_stem_level.R
leymanan a7c6e73
Update R/compose_stem_data.R
leymanan de4b312
Update R/compose_stem_data.R
leymanan 22c606a
compose_stem_data: uitleg ivm parameter "extra variables" aangepast c…
leymanan 2cdc15a
Merge branch 'reg_AL' of github.com:inbo/forrescalc into reg_AL
leymanan 4fab058
remove mid_cover from load_data_vegetation()
ElsLommelen File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ElsLommelen : hier nog een foutje ontdekt:
n_subplots
zou moeten bepaald worden obvdata_vegetation
, want indata_herblayer
zitten enkel de subplots waar minimum één soort waargenomen werd. Indata_vegetation
zitten alle subplots.(Bij regeneration wordt
n_subplots
bepaald obv de regeneration layer, wat wel correct is)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
idem dito in
calc_veg_core_area_height_species
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Euh, dit is een vreemde situatie die je best nog even bekijkt, @leymanan :
Blijkbaar heb je in deze functie het argument data_vegetation toegevoegd zonder het te gebruiken (zie hier), en ook zonder de documentatie hieraan aan te passen. Maar dit argument lijkt me niet nodig te zijn? Mag dit terug weg? (Zie eerst hieronder.)
De
subplot_id
die opgehaald wordt inload_data_herblayer()
, is afkomstig uit tabel Vegetation uit de databank (zie hier), dus ik ga ervan uit dat dit wel in orde is?Functie
calc_veg_core_area_height_species()
zie ik nergens staan, kan het zijn dat die nooit toegevoegd is? Moet die toegevoegd worden?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in deze commit zie ik anders wel gebruik van data_vegetation?
ik denk nog steeds dat dit nodig is.
daar wordt een inner-join gemaakt tss Herblayer en Vegetation: dus als er een bepaald record niet aanwezig is in Herblayer (wegens geen enkele soort aanwezig), dan wordt die
subplot_id
niet opgepikt ...Height wordt enkel bij regeneration gebruikt (calculate_regeneration_core_area_height_species.R bestaat)
calc_veg_core_area_height_species()
niet nodig ;-)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dat is een commit van meer dan 2 jaar geleden, en intussen is de code blijkbaar veranderd en is het inladen van
data_vegetation
overbodig geworden. Ik heb even gezocht waar diedata_vegetation
gewist is, maar ik kan het niet terugvinden. Ik vermoed dat we dat we op een bepaald moment beslist hebben om diesubplot_id
inload_data_herblayer()
op te halen om gebruikers niet te verplichten om voorcalculate_vegetation_core_area_species()
behalveload_data_herblayer()
ookload_data_vegetation()
te moeten opladen enkel om dat ene itemsubplot_id
op te laden. Maar blijkbaar zijn we daarbij vergeten om de join inload_data_herblayer()
aan te passen.Zal ik er daar een left join van maken? Dus Plots inner join Vegetation LEFT JOIN Herblayer. (Vermits het access is, zal ik ook nog met de haakjes moeten spelen enz., maar ik neem aan dat je wel weet wat ik bedoel.) Dit lijkt me een veel minder ingrijpende aanpassing als het functioneel toevoegen van
data_vegetation
incalculate_vegetation_core_area_species()
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ja, dat is inderdaad betere oplossing (left join bij load data herblayer)
Maar indien mogelijk misschien wel survey_veg = TRUE ergens meenemen?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, opgelost in commit cf90684 (left join in Access ziet er wel iets complexer uit dan gewone SQL omdat hier de mix van inner join en left join in Access niet kan zonder met een subquery te werken).
Die selectie survey_veg = TRUE gebeurt blijkbaar hier in
load_data_herblayer()
, dus dat zou ook in orde moeten zijn.