diff --git a/initialize.jl b/initialize.jl index 795c7a5225a6ac5c614d6aa026f9c5c1987335a1..791ce0df274c808e0499d6c5469403178fb5c5b8 100644 --- a/initialize.jl +++ b/initialize.jl @@ -3,6 +3,25 @@ name = "earliest_pickup_testing_phase" include(settings_name) + +map_folder = "./example_map/map/" +dispatcher_folder = "./example_map/delays_wt1reldelta1/" + +for name in readdir(map_folder, join=false) + try + cp(map_folder*"/"*name, paths[:map]*"/"*name) +catch e +println(e) +end +end +for name in readdir(dispatcher_folder, join=false) + try + cp(dispatcher_folder*"/"*name, paths[:dispatcher]*"/"*name) +catch e +println(e) +end +end + for (name, path) in paths try mkpath(path) @@ -11,15 +30,9 @@ for (name, path) in paths end end -map_folder = "./example_map/map/*" -dispatcher_folder = "/example_map/delays_wt1reldelta1/*" - -run(`cp -r $(map_folder) $(paths[:map])/`) -run(`cp -r $(dispatcher_folder) $(paths[:dispatcher])/`) -#cp("./example_map/delays_wt1reldelta1/*", paths[:dispatcher]*"/", force=true) N=1 SGE_TASK_ID=12 JOB_NAME=name -run("/usr/ds/bin/julia sim_temp.jl $N $SGE_TASK_ID $JOB_NAME") +run(`/usr/ds/bin/julia sim.jl $SGE_TASK_ID $settings_name $JOB_NAME`) diff --git a/standard_settings.jl b/standard_settings.jl index 4199b305321cac0bb3942d90982638384926c8a6..5aed6ace0709438ed4ea36baaadea923f97492d8 100644 --- a/standard_settings.jl +++ b/standard_settings.jl @@ -12,9 +12,9 @@ path="/scratch01.local/rhaag/$(String(request_type))/$name/" # Path were everyt # Simulation Settings -N=1 #Number of Busses -requested = 1 * N # Number of requests, that need to be made -served = 1 * N # Number of requests, that need to be served +N=10 #Number of Busses +requested = 200 * N # Number of requests, that need to be made +served = 200 * N # Number of requests, that need to be served #Random Generator rng_type = :notRandom diff --git a/submit.sh b/submit.sh index bd4f72ea6796e1d2e138e74f4ff96c6a6c28071d..b80bf54f35077fbd2a3f29674787a34e67d37835 100644 --- a/submit.sh +++ b/submit.sh @@ -2,12 +2,13 @@ #$ -S /bin/bash #$ -cwd -#$ -q grotrian.q +#$ -q titan.q #$ -j yes #$ -N earliest_pickup_testing_phase #$ -t 1-1600 +#$ -tc 500 +SETTINGS_NAME="./standard_settings.jl" - -/usr/ds/bin/julia sim.jl $N $SGE_TASK_ID $JOB_NAME +/usr/ds/bin/julia sim.jl $SGE_TASK_ID $SETTINGS_NAME $JOB_NAME