Update the core 4 simulations.

[ml_measurement_error_public.git] / simulations / Makefile

diff --git a/simulations/Makefile b/simulations/Makefile
index dec7889db143e7738293e5825094d7ccc9cac2df..d278c8c2aeb8f0bfc2e7482bdb9b538491a1fd16 100644 (file)
--- a/simulations/Makefile
+++ b/simulations/Makefile
@@ -1,9 +1,9 @@
 
 SHELL=bash
 
 
 SHELL=bash
 

-Ns=[1000,3600,14400]
-ms=[75,150,300]
-seeds=[$(shell seq -s, 1 250)]
+Ns=[1000, 2000, 4000, 8000]
+ms=[100, 200, 400, 800]
+seeds=[$(shell seq -s, 1 100)]

 explained_variances=[0.1]
 
 all:remembr.RDS
 explained_variances=[0.1]
 
 all:remembr.RDS


@@ -31,7 +31,7 @@ example_1.feather: example_1_jobs
 #      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs
 
 example_2_jobs: 02_indep_differential.R simulation_base.R
 #      sbatch --wait --verbose --array=3001-6001 run_simulation.sbatch 0 example_1_jobs
 
 example_2_jobs: 02_indep_differential.R simulation_base.R

-       grid_sweep.py --command "Rscript 02_indep_differential.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_2.feather"],"y_explained_variance":${explained_variances}, "accuracy_imbalance_difference":[0.3], "Bzy":[0.3]}' --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"],"y_explained_variance":${explained_variances},  "Bzy":[-0.3],"Bxy":[0.3],"Bzx":[0.3], "outcome_formula":["y~x+z"], "proxy_formula":["w_pred~y*z*x"], "truth_formula":["x~z"]}' --outfile example_2_jobs

 
 example_2.feather: example_2_jobs 
        rm -f example_2.feather
 
 example_2.feather: example_2_jobs 
        rm -f example_2.feather


@@ -45,19 +45,26 @@ example_2.feather: example_2_jobs
 #      rm -f example_2_B.feather
 #      sbatch --wait --verbose --array=1-3000 run_simulation.sbatch 0 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: 03_depvar_differential.R simulation_base.R
-       grid_sweep.py --command "Rscript 03_depvar_differential.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_3.feather"], "y_explained_variance":${explained_variances}}' --outfile example_3_jobs
+example_3_jobs: 03_depvar.R simulation_base.R
+       grid_sweep.py --command "Rscript 03_depvar.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_3.feather"], "y_explained_variance":${explained_variances}}' --outfile example_3_jobs

 
 example_3.feather: example_3_jobs
        rm -f example_3.feather 
        sbatch --wait --verbose --array=1-$(shell cat example_3_jobs | wc -l)  run_simulation.sbatch 0 example_3_jobs
 
 
 example_3.feather: example_3_jobs
        rm -f example_3.feather 
        sbatch --wait --verbose --array=1-$(shell cat example_3_jobs | wc -l)  run_simulation.sbatch 0 example_3_jobs
 

+example_4_jobs: 04_depvar_differential.R simulation_base.R
+       grid_sweep.py --command "Rscript 04_depvar_differential.R" --arg_dict '{"N":${Ns},"m":${ms}, "seed":${seeds}, "outfile":["example_4.feather"], "y_explained_variance":${explained_variances}}' --outfile example_4_jobs

 
 

-remembr.RDS:example_1.feather example_2.feather example_3.feather plot_example.R plot_dv_example.R
+example_4.feather: example_4_jobs
+       rm -f example_4.feather 
+       sbatch --wait --verbose --array=1-$(shell cat example_4_jobs | wc -l)  run_simulation.sbatch 0 example_4_jobs
+
+remembr.RDS:example_1.feather example_2.feather example_3.feather example_4.feather plot_example.R plot_dv_example.R

        rm -f remembr.RDS
        ${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_dv_example.R --infile example_3.feather --name "plot.df.example.3"
        rm -f remembr.RDS
        ${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_dv_example.R --infile example_3.feather --name "plot.df.example.3"

+       ${srun} Rscript plot_dv_example.R --infile example_4.feather --name "plot.df.example.4"

 
 clean:
        rm *.feather
 
 clean:
        rm *.feather