From 073fb61588df5814410ccf9cc5d9e7ed035089d2 Mon Sep 17 00:00:00 2001 From: poldrack Date: Thu, 12 Mar 2020 07:57:38 -0700 Subject: [PATCH 1/5] save figure 1 data to csv, rename figure 1 image --- PredictionMarketAnalyses/PM_Figures.Rmd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PredictionMarketAnalyses/PM_Figures.Rmd b/PredictionMarketAnalyses/PM_Figures.Rmd index 56f6486..93bda03 100644 --- 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) ``` From cac3e84656b57df1162f6b90ffd644580a01b409 Mon Sep 17 00:00:00 2001 From: poldrack Date: Thu, 12 Mar 2020 08:54:51 -0700 Subject: [PATCH 2/5] save reoedered corr matrices --- ImageAnalyses/AnalyzeMaps.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ImageAnalyses/AnalyzeMaps.py b/ImageAnalyses/AnalyzeMaps.py index 1f93dc9..fefd073 100644 --- a/ImageAnalyses/AnalyzeMaps.py +++ b/ImageAnalyses/AnalyzeMaps.py @@ -381,6 +381,13 @@ def mk_correlation_maps_unthresh( membership[str(hyp)][str(cl)] = [] membership[str(hyp)][str(cl)].append(labels[j]) + # save reordered correlation map + reordered_df = df.loc[cm.dendrogram_row.reordered_ind, :] + reordered_df = reordered_df.loc[:, cm.dendrogram_row.reordered_ind] + 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, From 65097064f17b1473860f8af8f3851cd9e5b0b59a Mon Sep 17 00:00:00 2001 From: poldrack Date: Thu, 12 Mar 2020 09:37:02 -0700 Subject: [PATCH 3/5] convert idx to list --- ImageAnalyses/AnalyzeMaps.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ImageAnalyses/AnalyzeMaps.py b/ImageAnalyses/AnalyzeMaps.py index fefd073..4db9095 100644 --- a/ImageAnalyses/AnalyzeMaps.py +++ b/ImageAnalyses/AnalyzeMaps.py @@ -382,8 +382,9 @@ def mk_correlation_maps_unthresh( membership[str(hyp)][str(cl)].append(labels[j]) # save reordered correlation map - reordered_df = df.loc[cm.dendrogram_row.reordered_ind, :] - reordered_df = reordered_df.loc[:, cm.dendrogram_row.reordered_ind] + reord_idx = [j for j in cm.dendrogram_row.reordered_ind] + reordered_df = df.loc[reord_idx, :] + reordered_df = reordered_df.loc[:, reord_idx] reordered_df.to_csv(os.path.join( output_dir, '%s_unthresh_hyp%d_reordered.csv' % (corr_type, hyp))) From 3e337da52ca14534fa2a3d9b6dbe64a68ce4fdf2 Mon Sep 17 00:00:00 2001 From: poldrack Date: Thu, 12 Mar 2020 12:37:25 -0700 Subject: [PATCH 4/5] fix indexing for reordering --- ImageAnalyses/AnalyzeMaps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ImageAnalyses/AnalyzeMaps.py b/ImageAnalyses/AnalyzeMaps.py index 4db9095..bcb0d41 100644 --- a/ImageAnalyses/AnalyzeMaps.py +++ b/ImageAnalyses/AnalyzeMaps.py @@ -382,9 +382,9 @@ def mk_correlation_maps_unthresh( membership[str(hyp)][str(cl)].append(labels[j]) # save reordered correlation map - reord_idx = [j for j in cm.dendrogram_row.reordered_ind] - reordered_df = df.loc[reord_idx, :] - reordered_df = reordered_df.loc[:, reord_idx] + 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))) From ece401eac99db566be4c5cf8cb382cc5e497df9b Mon Sep 17 00:00:00 2001 From: poldrack Date: Thu, 12 Mar 2020 12:52:47 -0700 Subject: [PATCH 5/5] fix style --- ImageAnalyses/AnalyzeMaps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ImageAnalyses/AnalyzeMaps.py b/ImageAnalyses/AnalyzeMaps.py index bcb0d41..182fee2 100644 --- a/ImageAnalyses/AnalyzeMaps.py +++ b/ImageAnalyses/AnalyzeMaps.py @@ -383,8 +383,8 @@ def mk_correlation_maps_unthresh( # 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 = 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)))