update plotting code and makefile

[ml_measurement_error_public.git] / simulations / Makefile

diff --git a/simulations/Makefile b/simulations/Makefile
index 264b4082c1aee42bea6e716714f761a40a6be78e..6f6ff5b25df946a1efca8d83ae238416db1a4dc2 100644 (file)
--- a/simulations/Makefile
+++ b/simulations/Makefile
@@ -1,51 +1,53 @@
 
 SHELL=bash
 
-Ns=[1000,10000,25000]
+Ns=[500,1000,10000]
 ms=[50, 100, 250, 500]
 seeds=[$(shell seq -s, 1 250)]
 all:remembr.RDS
 
 srun=srun -A comdata -p compute-bigmem --time=10:00:00 --mem 4G -c 1
 
-example_1_jobs: example_1.R
-       grid_sweep.py --command "Rscript example_1.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_1.feather"]}' --outfile example_1_jobs
+example_1_jobs: 01_two_covariates.R
+       grid_sweep.py --command "Rscript 01_two_covariates.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_1.feather"]}' --outfile example_1_jobs
 
 example_1.feather: example_1_jobs
        rm -f example_1.feather
        sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_1_jobs
-#      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs
+       sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs
 
 example_2_jobs: example_2.R
-       grid_sweep.py --command "Rscript example_2.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2.feather"]}' --outfile example_2_jobs
+       grid_sweep.py --command "Rscript 02_indep_differential.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2.feather"]}' --outfile example_2_jobs
 
 example_2.feather: example_2_jobs
        rm -f example_2.feather
        sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_2_jobs
-#      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_2_jobs
+       sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_2_jobs
 
-example_2_B_jobs: example_2_B.R
-       grid_sweep.py --command "Rscript example_2_B.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2_B.feather"]}' --outfile example_2_B_jobs
+# example_2_B_jobs: example_2_B.R
+#      grid_sweep.py --command "Rscript example_2_B.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2_B.feather"]}' --outfile example_2_B_jobs
 
-example_2_B.feather: example_2_B_jobs
-       rm -f example_2_B.feather
-       sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_2_B_jobs
+# example_2_B.feather: example_2_B_jobs
+#      rm -f example_2_B.feather
+#      sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_2_B_jobs
 
-example_3_jobs: example_3.R
-       grid_sweep.py --command "Rscript example_3.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_3.feather"]}' --outfile example_3_jobs
+example_3_jobs: 03_depvar_differential.R
+       grid_sweep.py --command "Rscript 03_depvar_differential.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_3.feather"]}' --outfile example_3_jobs
 
 example_3.feather: example_3_jobs
        rm -f example_3.feather
        sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 example_3_jobs
-
+       sbatch --wait --verbose --array=3001-6000 run_simulation.sbatch 0 example_3_jobs
 
 remembr.RDS:example_2_B.feather example_1.feather example_2.feather example_3.feather
        ${srun} Rscript plot_example.R --infile example_1.feather --name "plot.df.example.1"
        ${srun} Rscript plot_example.R --infile example_2.feather --name "plot.df.example.2"
-       ${srun} Rscript plot_example.R --infile example_2_B.feather --name "plot.df.example.2B"
-       ${srun} Rscript plot_example.R --infile example_3.feather --name "plot.df.example.3"
-
+       ${srun} Rscript plot_dv_example.R --infile example_3.feather --name "plot.df.example.3"
+#      ${srun} Rscript plot_example.R --infile example_2_B.feather --name "plot.df.example.2B"
 
+clean:
+       rm *.feather
+       rm remembr.RDS
 
 #      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_2_B_jobs