Commit: d253bdeb31b3f2c3d652f353954c619e3128eb9d - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revision: d253bdeb31b3f2c3d652f353954c619e3128eb9d (tree)
• Zeit: 2021-09-16 18:50:16
• Autor: Lorenzo Isella <lorenzo.isella@gmai...>
• Commiter: Lorenzo Isella

Log Message

I modified both codes to deal better with NACE 1-digit categories.

Ändern Zusammenfassung

• modified: R-codes/prepare_tam_data.R
• modified: R-codes/shiny_report_tam.R

Diff

diff -r 3fa1d9b66ed0 -r d253bdeb31b3 R-codes/prepare_tam_data.R
--- a/R-codes/prepare_tam_data.R	Thu Sep 16 09:34:57 2021 +0200
+++ b/R-codes/prepare_tam_data.R	Thu Sep 16 11:50:16 2021 +0200
@@ -4,6 +4,8 @@
 library(janitor)
 library(openxlsx)
 library(lubridate)
+library(stringr)
+library(stringi)
 
 source("/home/lorenzo/myprojects-hg/R-codes/stat_lib.R")
 
@@ -24,7 +26,13 @@
     
 }
 
-    
+
+
+
+nace <- read_excel("nace_codes.xlsx") %>%
+    mutate(code=substrLeft(description,1))
+
+
 
 df <- df_ini %>%
     clean_tam() %>%
@@ -58,7 +66,11 @@
     find_text_replace("\\(leasing subsidy","leasing subsidy") %>% 
     find_text_replace("leasing subsidy\\)","leasing subsidy")  %>%
     find_text_replace("feed-in tariffs","feed-in tariff")  %>%
-    find_text_replace("tarriif","tariff")
+    find_text_replace("tarriif","tariff") %>%
+    mutate(macro_sector=substrLeft(beneficiary_sector, 1)) %>%
+    left_join(y=nace, by=c("macro_sector"="code")) %>%
+    select(-macro_sector) %>%
+    rename("macro_sector"="description")
 
 
  

diff -r 3fa1d9b66ed0 -r d253bdeb31b3 R-codes/shiny_report_tam.R
--- a/R-codes/shiny_report_tam.R	Thu Sep 16 09:34:57 2021 +0200
+++ b/R-codes/shiny_report_tam.R	Thu Sep 16 11:50:16 2021 +0200
@@ -103,10 +103,16 @@
     unique %>%
     sort
 
-beneficiaries_sector <- df_ini$beneficiary_sector %>%
+## beneficiaries_sector <- df_ini$beneficiary_sector %>%
+##     unique %>%
+##     sort
+
+
+beneficiaries_sector <- df_ini$macro_sector %>%
     unique %>%
     sort
 
+
 truncated_beneficiaries_sector <- beneficiaries_sector %>%
     shiny_wrap(len_truncation)
     
@@ -250,13 +256,15 @@
     compound_data <- reactive({
 
 df_ini %>% filter(## is_co_finance %in% input$cofinanced,
-                  year %in% input$year_award,
-                  beneficiary_country %in% input$country ,
-                  beneficiary_type %in% input$beneficiary_type,
-                  beneficiary_sector %in% input$beneficiary_sector,
-                  instrument_type %in% input$instrument_type,
+               year %in% input$year_award,
+               beneficiary_country %in% input$country ,
+               beneficiary_type %in% input$beneficiary_type,
+               ## beneficiary_sector %in% input$beneficiary_sector,
+               macro_sector %in% input$beneficiary_sector,
+               
+               instrument_type %in% input$instrument_type,
                   ## main_procedure_type_code %in% input$procedure_code,
-                  aid_objective %in% input$objectives)  
+               aid_objective %in% input$objectives)  
         
         
     })
@@ -420,7 +428,7 @@
 output$downloadViz <- downloadHandler(
     filename = "plot.png" ,
     content = function(file) {
-     ggsave(myplot(), filename = file, width=12, height=6)
+     ggsave(myplot(), filename = file, width=12, height=12)
      
     })