#167 more general solution to local renaming

IALSA · Feb 15, 2017 · 32f3ae1 · 32f3ae1
1 parent 01354aa
commit 32f3ae1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/reports/correlation-3/correlation-3-pc.R b/reports/correlation-3/correlation-3-pc.R
@@ -30,7 +30,11 @@ rm(path_input)
 # ---- tweak-data --------------------
 # catalog_pretty <- catalog %>% prettify_catalog(model_type_ = "aehplus",model_number_ = "b1")
 
-
+catalog <- catalog %>%
+  dplyr::mutate(
+    process_b = ifelse(study_name == "map"  & process_b == "matrices", "raven_standard", process_b),
+    process_b = ifelse(study_name == "lasa" & process_b == "raven",    "raven_color_ab", process_b)
+  )
 
 
 
@@ -121,10 +125,6 @@ d %>%
 # track = "pulmonary"
 data_forest <- get_forest_data(catalog,track = track) %>%
   rename_domains(track) %>%
-  dplyr::mutate(
-    cognitive = ifelse(study == "map"  & cognitive == "matrices", "raven_standard", cognitive),
-    cognitive = ifelse(study == "lasa" & cognitive == "raven",    "raven_color_ab", cognitive)
-  ) %>%
   dplyr::filter(
      model_number == "b1"
     ,model_type   == "aehplus"

diff --git a/reports/correlation-3/rename-domains-pulmonary.csv b/reports/correlation-3/rename-domains-pulmonary.csv
@@ -54,8 +54,8 @@ fluid reasoning,visualization,eas,pef,block
 fluid reasoning,visualization,octo,pef,block
 fluid reasoning,visualization,satsa,fev,block
 fluid reasoning,visualization,octo,pef,fig_logic
-fluid reasoning,visualization,map,fev,matrices
-fluid reasoning,visualization,lasa,pef,raven
+fluid reasoning,visualization,map,fev,raven_standard
+fluid reasoning,visualization,lasa,pef,raven_color_ab
 fluid reasoning,visualization,satsa,fev,rotate
 visual discrimination,visualization,map,fev,line
 visuospatial function,visualization,nas,fev,fig_copy