Merge pull request #160 from BenjaminHsieh/dev

Added paperfig command (A BUG)

.travis.yml

@@ -16,6 +16,7 @@ install:
   - source venv/bin/activate
   - python --version # just to check
   - retry pip install nose # always
+  - sudo apt-get update
   - sudo apt-get install libblas-dev liblapack-dev libatlas3gf-base
   - wheelhouse_pip_install ${DEPENDS}
   - if [ "${COVERAGE}" == "1" ]; then

code/Makefile

@@ -24,3 +24,18 @@ all:
 	cd scripts && make bncorrelates
 	cd scripts && make mixedmodel
 
+
+paperfig:
+# Goes to results/figures and updates files that already exist in figures, figures/Regression1/, and figures/Regression2/
+	rsync -av --existing ../results/figures/ ../paper/figures/
+	rsync -av --existing ../results/figures/ ../paper/figures/Regression1/
+	rsync -av --existing ../results/figures/ ../paper/figures/Regression2/
+
+
+
+# Old version [not working]
+#	cd ../results && find -name 'anova_prop.png' -o -name 'processing.png' -o -name 'smoothed_images.png' -o -name 'dvars_sub2run2.png' -o -name 'qqplot.png'-o -name 'sub002_lme_beta_gain.png' -o -name 'fd_sub2run2.png' -o -name 'sub2diff_heatmap.png' -o -name 'mean_hists.png' -o -name 'sub2gain_heatmap.png' -o -name 'mean_sub2run2.png' -o -name 'sub2loss_heatmap.png' -exec cp {} ../paper/figures \;	
+#	cd ../results && find -name 'logistic_summary.png' -o -name 'roc_curve.png' -exec cp {} ../paper/figures/Regression1 \;	
+#	cd ../results && find -name 'beta_gain_cluster.png' -o -name  'diagnosis.png' -o -name 't_loss_standard_sub2.png' -o -name 'beta_loss_cluster.png' -o -name 't_gain_standard_sub2.png' -exec cp {} ../paper/figures/Regression2 \;	
+#	cd ../results && find -name 'corr_neu_bah.png' -o -name 'sig_cor_y_neural_aversion.png' -o -name 'Orig_sig_cor_z_gain.png' -o -name 'sig_cor_z_gain.png' -o -name 'Orig_sig_cor_z_loss.png'-o -name 'sig_cor_z_loss.png' -o -name 'Orig_sig_cor_z_neural_aversion.png' -o -name 'sig_cor_z_neural_aversion.png' -exec cp {} ../paper/figures/Regression3 \;	
+

code/README.md

@@ -19,6 +19,11 @@ a 1 day. Please run with caution! For updating individual analysis. We recommend
 nagivating to `project-theta/code/scripts` and running the respective make 
 commands. 
 
+- `make paperfig`: Moves any (updated) figures strictly related to paper 
+results to `project-theta/paper/figures` for inclusion in final paper/slides.
+Note: Only updates the files currently existing in `paper/figures` that are 
+new in `results/figures`. See files transfered in bash output of this command.
+
 Other utility make commands include: `clean`, `test`, `verbose` and `coverage`:
 
 - `make test`: Runs function tests in utils/tests on functions that are