update models

FredericBlum · Apr 10, 2024 · 384b97a · 384b97a
1 parent e936827
commit 384b97a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/scripts/04_FinalModel.R b/scripts/04_FinalModel.R
@@ -15,7 +15,11 @@ data <- read_tsv('data.tsv') %>%
       ClusterInitial==1, 'initial', 'nonInitial')
     ))
   ) %>% 
-  left_join(langs, by = join_by(Language==ID))
+  left_join(langs, by = join_by(Language==ID)) %>% 
+  rename(
+    IPA = CLTS,
+    Family = name_macro_family
+  )
 
 # Read in phylogenetic control
 df_phylo <- read_rds("df-phylo.rds")

diff --git a/scripts/04_FinalModel_CLTS.R b/scripts/04_FinalModel_CLTS.R
@@ -8,19 +8,18 @@ library(ape)
 
 langs <- read_csv('languages.csv')
 data <- read_tsv('data.tsv') %>% 
-  rename(
-    IPA = CLTS,
-    Family = name_macro_family
-  ) %>% 
   mutate(
     word_initial = as.factor(word_initial),
     utt_initial = as.factor(utt_initial),
     cluster = as.factor(ifelse(InCluster==0, 'single', ifelse(
       ClusterInitial==1, 'initial', 'nonInitial')
     ))
   ) %>% 
-  left_join(langs, by = join_by(Language==ID))
-
+  left_join(langs, by = join_by(Language==ID)) %>% 
+  rename(
+    IPA = CLTS,
+    Family = name_macro_family
+  )
 
 # Read in phylogenetic control
 df_phylo <- read_rds("df-phylo.rds")

diff --git a/scripts/04_FinalModel_noCluster.R b/scripts/04_FinalModel_noCluster.R
@@ -12,7 +12,11 @@ data <- read_tsv('data.tsv') %>%
     word_initial = as.factor(word_initial),
     utt_initial = as.factor(utt_initial)) %>% 
   filter(InCluster==0) %>% 
-  left_join(langs, by = join_by(Language==ID))
+  left_join(langs, by = join_by(Language==ID)) %>% 
+  rename(
+    IPA = CLTS,
+    Family = name_macro_family
+  )
 
 
 # Read in phylogenetic control

diff --git a/scripts/04_FinalModel_speaker.R b/scripts/04_FinalModel_speaker.R
@@ -15,7 +15,11 @@ data <- read_tsv('data.tsv') %>%
       ClusterInitial==1, 'initial', 'nonInitial')
     ))
   ) %>% 
-  left_join(langs, by = join_by(Language==ID))
+  left_join(langs, by = join_by(Language==ID)) %>% 
+  rename(
+    IPA = CLTS,
+    Family = name_macro_family
+  )
 
 
 # Read in phylogenetic control