From ea8f83405b08bac541192106d869c3fa7ce0869d Mon Sep 17 00:00:00 2001 From: Clementine de Montgolfier Date: Thu, 23 Feb 2023 20:16:48 +0100 Subject: [PATCH 1/2] Add no_mes to tree_data With previous script I had NA for some no_mes in tree_data ( could find them back with id_pe_mes) but figured it would be easier to keep them. --- scripts/1_tree_pep.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/1_tree_pep.R b/scripts/1_tree_pep.R index afac642..840508a 100644 --- a/scripts/1_tree_pep.R +++ b/scripts/1_tree_pep.R @@ -85,7 +85,7 @@ id_pe_aband <- pep_mes %>% pep_mes <- pep_mes %>% filter(!(id_pe %in% id_pe_aband$id_pe)) %>% - select(id_pe, id_pe_mes, year_measured) + select(id_pe, no_mes, id_pe_mes, year_measured) pep_xy <- pep_xy %>% filter(id_pe %in% pep_mes$id_pe) %>% @@ -115,7 +115,7 @@ length(unique(pert2$id_pe)) tree_data0 <- pep_mes %>% filter(!(id_pe %in% pert2$id_pe)) %>% - left_join(tree_mes, by = c("id_pe", "id_pe_mes"), multiple = "all") + left_join(tree_mes, by = c("id_pe", "no_mes", "id_pe_mes"), multiple = "all") added_id <- tree_data0 %>% filter(!(id_pe_mes %in% tree_mes$id_pe_mes)) From 61dbec92fc689893f5680e0b2291adba376e1b90 Mon Sep 17 00:00:00 2001 From: Clementine de Montgolfier Date: Thu, 23 Feb 2023 20:43:50 +0100 Subject: [PATCH 2/2] Update 1_tree_pep.R missed a no_mes to have them all --- scripts/1_tree_pep.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/1_tree_pep.R b/scripts/1_tree_pep.R index 840508a..2d8e04a 100644 --- a/scripts/1_tree_pep.R +++ b/scripts/1_tree_pep.R @@ -370,7 +370,7 @@ pe_mes_deleted <- setdiff(unique(tree_data0$id_pe_mes), unique(tree_data$id_pe_m pe_deleted <- tree_data0 %>% filter(id_pe_mes %in% pe_mes_deleted) %>% mutate(state = "AllDead") %>% - distinct(id_pe, id_pe_mes, year_measured, state) + distinct(id_pe, no_mes, id_pe_mes, year_measured, state) ### Add missing PE MES