rgreminger · rgreminger · Mar 4, 2020 · Mar 4, 2020 · Mar 4, 2020 · Mar 4, 2020
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 *.log
 *.aux
 *.Rhistory
+.RData
+**gen/
+**.Rout
diff --git a/gen/analysis/audit/.gitkeep b/gen/analysis/audit/.gitkeep
diff --git a/gen/analysis/input/.gitkeep b/gen/analysis/input/.gitkeep
diff --git a/gen/analysis/output/.gitkeep b/gen/analysis/output/.gitkeep
diff --git a/gen/analysis/output/model_results.RData b/gen/analysis/output/model_results.RData
diff --git a/gen/analysis/temp/.gitkeep b/gen/analysis/temp/.gitkeep
diff --git a/gen/data-preparation/audit/.gitkeep b/gen/data-preparation/audit/.gitkeep
diff --git a/gen/data-preparation/input/.gitkeep b/gen/data-preparation/input/.gitkeep
diff --git a/gen/data-preparation/output/.gitkeep b/gen/data-preparation/output/.gitkeep
diff --git a/gen/data-preparation/output/data_cleaned.RData b/gen/data-preparation/output/data_cleaned.RData
diff --git a/gen/data-preparation/temp/.gitkeep b/gen/data-preparation/temp/.gitkeep
diff --git a/gen/data-preparation/temp/data_merged.RData b/gen/data-preparation/temp/data_merged.RData
diff --git a/gen/paper/audit/.gitkeep b/gen/paper/audit/.gitkeep
diff --git a/gen/paper/input/.gitkeep b/gen/paper/input/.gitkeep
diff --git a/gen/paper/output/.gitkeep b/gen/paper/output/.gitkeep
diff --git a/gen/paper/output/paper.pdf b/gen/paper/output/paper.pdf
diff --git a/gen/paper/output/table1.tex b/gen/paper/output/table1.tex
diff --git a/gen/paper/temp/.gitkeep b/gen/paper/temp/.gitkeep
diff --git a/makefile b/makefile
@@ -2,11 +2,14 @@
 # - If run on unix system, use rm instead of del command in clean  
 # - Careful with spaces! If use \ to split to multiple lines, cannot have a space after \ 
 
-all: data_cleaned results paper clean 
+# OVERALL BUILD RULES
+all: data_cleaned results paper
 paper: gen/paper/output/paper.pdf
 data_cleaned: gen/data-preparation/output/data_cleaned.RData
 results: gen/analysis/output/model_results.RData
 
+# INDIVIDUAL RECIPES
+
 # Generate paper/text
 gen/paper/output/paper.pdf: gen/paper/output/table1.tex \
 				src/paper/paper.tex
@@ -35,6 +38,6 @@ gen/data-preparation/temp/data_merged.RData: data/dataset1/dataset1.csv \
 	R CMD BATCH src/data-preparation/merge_data.R
 
 clean: 
-	del /S *.log *.aux 
+	del /S *.log *.aux
 	del .RData
 
diff --git a/src/analysis/analyze.Rout b/src/analysis/analyze.Rout
diff --git a/src/data-preparation/clean_data.Rout b/src/data-preparation/clean_data.Rout
diff --git a/src/data-preparation/merge_data.Rout b/src/data-preparation/merge_data.Rout
diff --git a/src/paper/tables.Rout b/src/paper/tables.Rout