コミット: d94ec06c0778d08c3606b1b0475ad2c1e8fce5e0 - myprojects-hg-reborn (hg)

コミットメタ情報

• リビジョン: d94ec06c0778d08c3606b1b0475ad2c1e8fce5e0 (tree)
• 日時: 2023-03-03 00:20:30
• 作者: Lorenzo Isella <lorenzo.isella@gmai...>
• コミッター: Lorenzo Isella

ログメッセージ

I modified the na_to_pattern functions because they do not work well with the new dplyr.

変更サマリ

• modified: R-codes/process_covid_tracker.R

差分

diff -r 849a316bc8eb -r d94ec06c0778 R-codes/process_covid_tracker.R
--- a/R-codes/process_covid_tracker.R	Tue Feb 28 14:56:22 2023 +0100
+++ b/R-codes/process_covid_tracker.R	Thu Mar 02 16:20:30 2023 +0100
@@ -1,6 +1,6 @@
 rm(list=ls())
 
-## last saved on  Time-stamp: "2023-01-04 11:51:52 lorenzo"
+## last saved on  Time-stamp: "2023-03-02 15:27:42 lorenzo"
 
 
 library(tidyverse)
@@ -307,9 +307,9 @@
                      adorn_totals("row")) %>%
     ungroup %>%
     complete(member_state_2_letter_code, type_of_aid) %>%
-    na_to_pattern(0) %>% 
+    na_num_to_pattern(0) %>% 
     mutate(name=type_of_aid) %>% 
-    na_to_pattern("Total") %>%
+    na_char_to_pattern("Total") %>%
     arrange(member_state_2_letter_code,desc(budget))
 
 
@@ -340,7 +340,7 @@
     ungroup %>%
     complete(member_state_2_letter_code,
              type_of_measure) %>%
-    na_to_pattern(0)%>%
+    na_num_to_pattern(0)%>%
     filter(type_of_measure !=" ", type_of_measure!=0)
 
 
@@ -403,7 +403,7 @@
                      adorn_totals("row"))  %>% 
     ungroup%>%
     complete(member_state_2_letter_code,beneficary_sector) %>%
-    na_to_pattern(0) %>%
+    na_num_to_pattern(0) %>%
     filter(beneficary_sector!=" ", beneficary_sector!=0)
 
 saveRDS(budget_by_beneficiary_sector_ms, "./intermediate_files/budget_sector_MS.RDS")
@@ -437,7 +437,7 @@
                      adorn_totals("row"))  %>% 
     ungroup%>%
     complete(member_state_2_letter_code,beneficary_type) %>%
-    na_to_pattern(0)%>%
+    na_num_to_pattern(0)%>%
     filter(beneficary_type!=" ", beneficary_type!=0)
 
 saveRDS(budget_by_beneficiary_type_ms, "./intermediate_files/budget_type_MS.RDS")
@@ -507,7 +507,7 @@
                      adorn_totals("row"))  %>% 
     ungroup() %>%
     complete(member_state_2_letter_code,legal_basis) %>%
-    na_to_pattern(0) %>%
+    na_num_to_pattern(0) %>%
     filter(legal_basis!="0")
 
 
@@ -530,7 +530,7 @@
     mutate(decision_date=excel_numeric_to_date(decision_date))  %>%
     select(case_reference,member_state_2_letter_code,
            decision_date,confirmed_budgets) %>%
-    na_to_pattern(0) %>%   #### I added these line because of decisions without budget.
+    na_num_to_pattern(0) %>%   #### I added these line because of decisions without budget.
     mutate(year=year(decision_date),
            month=month(decision_date)) %>%
     group_by(member_state_2_letter_code, year, month) %>%
@@ -559,7 +559,7 @@
     mutate(decision_date=excel_numeric_to_date(decision_date))  %>%
     select(case_reference,member_state_2_letter_code,
            decision_date,confirmed_budgets) %>%
-    na_to_pattern(0) %>%   #### I added these line because of decisions without budget.
+    na_num_to_pattern(0) %>%   #### I added these line because of decisions without budget.
     ## mutate(year=year(decision_date),
     ##        month=month(decision_date)) %>%
     group_by(decision_date) %>%
@@ -588,7 +588,7 @@
     mutate(decision_date=excel_numeric_to_date(decision_date))  %>%
     select(case_reference,member_state_2_letter_code,
            decision_date,confirmed_budgets) %>%
-    na_to_pattern(0)
+    na_num_to_pattern(0)
 
 saveRDS(rep1_cleaned, "./intermediate_files/rep1_cleaned.RDS")
 
@@ -1002,7 +1002,7 @@
 
 ungroup()%>%
 complete(member_state_2_letter_code,legal_basis) %>%
-na_to_pattern(0) %>%
+na_num_to_pattern(0) %>%
 filter(legal_basis!="0")
 
 
@@ -1033,7 +1033,7 @@
 
     ungroup()%>%
     complete(member_state_2_letter_code,decided) %>%
-    na_to_pattern(0)
+    na_num_to_pattern(0)
 
 
 
@@ -1057,7 +1057,7 @@
     summarise(nn=n()) %>%
     ungroup()                   %>%
     mutate(year=as.character(year)) %>%
-    na_to_pattern("Undecided") %>%
+    na_char_to_pattern("Undecided") %>%
     make_wide_with_total("year", "nn") 
     
 
@@ -1088,7 +1088,7 @@
     
     ungroup()%>%
     complete(member_state_2_letter_code,responsible_unit) %>%
-    na_to_pattern(0)
+    na_num_to_pattern(0)
 
 
 
@@ -1202,7 +1202,7 @@
     tabyl(member_state_code, TF) %>%
     pivot_longer(cols=(TF1:TF9),names_to="TF_chapter" ) %>%
     complete(member_state_code, TF_chapter) %>%
-    na_to_pattern(0) %>%
+    na_num_to_pattern(0) %>%
     group_by(member_state_code) %>%
     group_modify(~ .x %>%
                      adorn_totals("row"))  %>% 
@@ -1409,7 +1409,7 @@
         filter(confirmed_budgets>0) %>%
         arrange(decision_date) %>%
         left_join(y=df_am_sel, by=c("case_reference"="case_number_key")) %>%
-        na_to_pattern("")
+        na_char_to_pattern("")
 
 
 fn <- paste("./intermediate_files/table_data_word_", sel_ms, ".RDS", sep="")