X-Git-Url: https://code.communitydata.science/ml_measurement_error_public.git/blobdiff_plain/e41d11afb9a80180feff844666e3ee463d20a7cd..588bdd7ed74cf8fe8fd0f15df58a6a40c26ebae5:/simulations/Makefile?ds=inline

diff --git a/simulations/Makefile b/simulations/Makefile
index 264b408..01c34fc 100644
--- a/simulations/Makefile
+++ b/simulations/Makefile
@@ -1,28 +1,28 @@
 
 SHELL=bash
 
-Ns=[1000,10000,25000]
+Ns=[500,1000,10000,25000]
 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 simulation_base.R grid_sweep.py
+	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