remove TDM code (#228)

RMI-PACTA · Dec 18, 2023 · f7a49ba · f7a49ba
1 parent 29d2cfc
commit f7a49ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 104 deletions.
diff --git a/web_tool_script_2.R b/web_tool_script_2.R
@@ -115,53 +115,11 @@ if (inherits(port_raw_all_eq, "data.frame") && nrow(port_raw_all_eq) > 0) {
   if (data_check(company_all_eq)) {
     saveRDS(company_all_eq, file.path(pf_file_results_path, "Equity_results_company.rds"))
   }
-  if (data_check(port_all_eq)) {
-    port_all_eq_tdm <- port_all_eq %>%
-      filter(scenario_geography == "Global", equity_market == "GlobalMarket")
-
-    tdm_vars <- list(
-      t0 = start_year,
-      delta_t1 = 5,
-      delta_t2 = 9,
-      additional_groups = c(
-        "scenario_source",
-        "scenario",
-        "allocation",
-        "equity_market",
-        "scenario_geography"
-      ),
-      scenarios = "IPR FPS 2021"
-    )
-
-    if (
-      tdm_conditions_met(
-        port_all_eq_tdm,
-        t0 = tdm_vars$t0,
-        delta_t1 = tdm_vars$delta_t1,
-        delta_t2 = tdm_vars$delta_t2,
-        additional_groups = tdm_vars$additional_groups,
-        scenarios = tdm_vars$scenarios,
-        project_code = project_code
-      )
-    ) {
-
-      equity_tdm <-
-        calculate_tdm(
-          port_all_eq_tdm,
-          t0 = tdm_vars$t0,
-          delta_t1 = tdm_vars$delta_t1,
-          delta_t2 = tdm_vars$delta_t2,
-          additional_groups = tdm_vars$additional_groups,
-          scenarios = tdm_vars$scenarios
-        )
-
-      saveRDS(equity_tdm, file.path(pf_file_results_path, "Equity_tdm.rds"))
-
-      port_all_eq <- filter(port_all_eq, !scenario %in% tdm_vars$scenarios)
-    }
 
+  if (data_check(port_all_eq)) {
     saveRDS(port_all_eq, file.path(pf_file_results_path, "Equity_results_portfolio.rds"))
   }
+
   if (has_map) {
     if (data_check(map_eq)) {
       saveRDS(map_eq, file.path(pf_file_results_path, "Equity_results_map.rds"))
@@ -245,53 +203,11 @@ if (inherits(port_raw_all_cb, "data.frame") && nrow(port_raw_all_cb) > 0) {
   if (data_check(company_all_cb)) {
     saveRDS(company_all_cb, file.path(pf_file_results_path, "Bonds_results_company.rds"))
   }
-  if (data_check(port_all_cb)) {
-    port_all_cb_tdm <- port_all_cb %>%
-      filter(scenario_geography == "Global", equity_market == "GlobalMarket")
-
-    tdm_vars <- list(
-      t0 = start_year,
-      delta_t1 = 5,
-      delta_t2 = 9,
-      additional_groups = c(
-        "scenario_source",
-        "scenario",
-        "allocation",
-        "equity_market",
-        "scenario_geography"
-      ),
-      scenarios = "IPR FPS 2021"
-    )
-
-    if (
-      tdm_conditions_met(
-        port_all_cb_tdm,
-        t0 = tdm_vars$t0,
-        delta_t1 = tdm_vars$delta_t1,
-        delta_t2 = tdm_vars$delta_t2,
-        additional_groups = tdm_vars$additional_groups,
-        scenarios = tdm_vars$scenarios,
-        project_code = project_code
-      )
-    ) {
-
-      bonds_tdm <-
-        calculate_tdm(
-          port_all_cb_tdm,
-          t0 = tdm_vars$t0,
-          delta_t1 = tdm_vars$delta_t1,
-          delta_t2 = tdm_vars$delta_t2,
-          additional_groups = tdm_vars$additional_groups,
-          scenarios = tdm_vars$scenarios
-        )
-
-      saveRDS(bonds_tdm, file.path(pf_file_results_path, "Bonds_tdm.rds"))
-
-      port_all_cb <- filter(port_all_cb, !scenario %in% tdm_vars$scenarios)
-    }
 
+  if (data_check(port_all_cb)) {
     saveRDS(port_all_cb, file.path(pf_file_results_path, "Bonds_results_portfolio.rds"))
   }
+
   if (has_map) {
     if (data_check(map_cb)) {
       saveRDS(map_cb, file.path(pf_file_results_path, "Bonds_results_map.rds"))

diff --git a/web_tool_script_3.R b/web_tool_script_3.R
@@ -132,20 +132,6 @@ bonds_results_map <- readRDS_or_return_alt_data(
 )
 bonds_results_map <- add_inv_and_port_names_if_needed(bonds_results_map)
 
-equity_tdm <- readRDS_or_return_alt_data(
-  filepath = file.path(results_path, portfolio_name_ref_all, "Equity_tdm.rds"),
-  alt_return = NULL
-)
-
-equity_tdm <- add_inv_and_port_names_if_needed(equity_tdm)
-
-bonds_tdm <- readRDS_or_return_alt_data(
-  filepath = file.path(results_path, portfolio_name_ref_all, "Bonds_tdm.rds"),
-  alt_return = NULL
-)
-
-bonds_tdm <- add_inv_and_port_names_if_needed(bonds_tdm)
-
 peers_equity_results_portfolio <- readRDS_or_return_alt_data(
   filepath = file.path(analysis_inputs_path, paste0(project_code, "_peers_equity_results_portfolio.rds")),
   alt_return = empty_portfolio_results()
@@ -257,8 +243,6 @@ create_interactive_report(
   currency_exchange_value = currency_exchange_value,
   header_dictionary = header_dictionary,
   sector_order = sector_order,
-  equity_tdm = equity_tdm,
-  bonds_tdm = bonds_tdm,
   configs = configs
 )