Browse Source

[DATALAD] Recorded changes

Lucas Gautheron 2 months ago
parent
commit
5ebf28fa24

+ 2 - 1
code/models/blocks/behavior_model_parameters_adu.stan

@@ -9,7 +9,8 @@ vector<lower=0>[n_classes] alpha_child; // variance across recordings for a give
 vector<lower=0>[n_corpora] mu_corpus_och;
 vector<lower=0>[n_corpora] mu_corpus_adu;
 
-matrix<lower=0>[n_corpora,2] corpus_fem_share; // beta parameters for the expected share of female speech
+//matrix<lower=0>[n_corpora,2] corpus_fem_share; // beta parameters for the expected share of female speech
+vector<lower=0>[2] corpus_fem_share;
 
 vector<lower=0>[n_classes-1] mu_pop; // population level averages (chi, adu, och)
 //vector<lower=0>[n_classes-1] alpha_pop; // mean child-level variance

+ 4 - 3
code/models/blocks/behavior_model_priors_adu.stan

@@ -12,9 +12,10 @@ mu_pop ~ exponential(4); // 250 vocs/hour
 mu_corpus_och ~ gamma(alpha_pop_och,alpha_pop_och/mu_pop[2]);
 mu_corpus_adu ~ gamma(alpha_pop_adu,alpha_pop_adu/mu_pop[3]);
 
-for (gender in 1:2) {
-    corpus_fem_share[:,gender] ~ exponential(1);
-}
+// for (gender in 1:2) {
+//     corpus_fem_share[:,gender] ~ exponential(1);
+// }
+corpus_fem_share ~ exponential(1);
 
 has_siblings ~ binomial(has_siblings+no_siblings, p_sib);
 p_sib ~ uniform(0, 1);

+ 2 - 2
code/models/blocks/human_annotations_adu.stan

@@ -30,8 +30,8 @@ speech_rates[:,4] ~ poisson(speech_rate_mal.*durations*1000);
 
 for (c in 1:n_speech_rate_children) {
     speech_rate_child_fem_share[speech_rate_child_corpus[c]] ~ beta(
-        corpus_fem_share[speech_rate_child_corpus[c],1],
-        corpus_fem_share[speech_rate_child_corpus[c],2]
+        corpus_fem_share[1],
+        corpus_fem_share[2]
     );
 
     int distrib = child_siblings[c]==0?2:1;