Merge pull request #75 from poldrack/develop

Develop
poldrack · Mar 12, 2020 · 0a9d71a · 0a9d71a
2 parents d6a6e4c + ece401e
commit 0a9d71a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ImageAnalyses/AnalyzeMaps.py b/ImageAnalyses/AnalyzeMaps.py
@@ -381,6 +381,14 @@ def mk_correlation_maps_unthresh(
                 membership[str(hyp)][str(cl)] = []
             membership[str(hyp)][str(cl)].append(labels[j])
 
+        # save reordered correlation map
+        reord_idx = cm.dendrogram_row.reordered_ind
+        reordered_df = df.iloc[reord_idx, :]
+        reordered_df = reordered_df.iloc[:, reord_idx]
+        reordered_df.to_csv(os.path.join(
+            output_dir,
+            '%s_unthresh_hyp%d_reordered.csv' % (corr_type, hyp)))
+
     # save cluster data to file so that we don't have to rerun everything
     with open(os.path.join(
               output_dir,

diff --git a/PredictionMarketAnalyses/PM_Figures.Rmd b/PredictionMarketAnalyses/PM_Figures.Rmd
@@ -70,6 +70,9 @@ plotDataWide <- reshape(plotDataWide,
 plotDataWide <- plotDataWide[order(plotDataWide$fv),]
 plotDataWide$id <- 1:9
 
+write.csv(plotDataWide,
+          file=paste(figdir,'Figure1_data.csv',sep='/'))
+
 ```
 
 ```{r mainPanel}
@@ -112,7 +115,7 @@ A <- ggplot() +
   theme(panel.border = element_rect(colour = "black", 
                                     fill=NA, size=1)) + scale_fill_discrete(name = NULL, labels = c("Fundamental value", "Non-team Members", "Team members"))
 
-ggsave(paste(figdir,'PMbeliefs_Figure3.pdf',sep='/'),
+ggsave(paste(figdir,'Figure1_PMbeliefs.pdf',sep='/'),
        width=7,height = 5)
 
 ```