Updated Version for different cost function

Manifest.toml

 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.7.1"
+julia_version = "1.7.2"
 manifest_format = "2.0"
 
 [[deps.AbstractTrees]]
@@ -872,14 +872,15 @@ version = "1.1.3"
 
 [[deps.RidePooling]]
 deps = ["Agents", "BenchmarkTools", "DelimitedFiles", "Distributions", "LaTeXStrings", "LinearAlgebra", "Measurements", "Measures", "OpenStreetMapX", "OpenStreetMapXPlot", "Pkg", "PlotlyJS", "Plots", "PolygonOps", "PrettyTables", "Random", "Serialization", "SparseArrays"]
-git-tree-sha1 = "a738f7812e134ef9764b18d0dd7bb71f892604d7"
+git-tree-sha1 = "9a4d792640a0edf23011c195ecf2a3e5002a30e9"
 repo-rev = "myopic_earliest_pickup"
 repo-url = "https://gitlab.gwdg.de/smuehle1/RidePooling/"
 uuid = "2a705bf3-b16b-4235-81e9-bc2517364992"
 version = "0.9.1"
 
 [[deps.RidePooling_eval]]
-git-tree-sha1 = "ad8b082d4a7efc12882c781d0b85b3edc8f5435b"
+deps = ["Measurements", "RidePooling"]
+git-tree-sha1 = "59e0a5340eabaf2b54a954b2ea3f6b5d4c5cdee4"
 repo-rev = "main"
 repo-url = "https://gitlab.gwdg.de/ruben.haag/ridepooling_eval.git"
 uuid = "a85749bb-6262-47e7-a60c-182392a47c50"

init.ipynb

@@ -318,7 +318,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.7.1",
+   "display_name": "Julia 1.7.2",
    "language": "julia",
    "name": "julia-1.7"
   },
@@ -326,7 +326,7 @@
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.7.1"
+   "version": "1.7.2"
   },
   "orig_nbformat": 4
  },

make_folders.jl

 using Pkg
 Pkg.activate(".")
+Pkg.instantiate()
 
+
+#Pkg.add(url="https://gitlab.gwdg.de/smuehle1/RidePooling/", rev="myopic_earliest_pickup")
 Pkg.add(url="https://gitlab.gwdg.de/ruben.haag/ridepooling_eval.git", rev="main")
-Pkg.add(url="https://gitlab.gwdg.de/smuehle1/RidePooling/", rev="myopic_earliest_pickup")
 
-Pkg.upgrade_manifest()
+Pkg.resolve()
+
 
 
 if length(ARGS) == 3
@@ -30,4 +33,4 @@ end
 
 
 #Test, if everything runs
-run(`julia sim.jl $index $settings_path $name`)
\ No newline at end of file
+run(`julia sim.jl $index $settings_path $name`)

put_together.jl

-import Pkg; 
-Pkg.activate(".")
-Pkg.add("CSV")
 using CSV
 using DataFrames
 using DelimitedFiles

settings.jl

@@ -11,11 +11,11 @@ cost = :combined_delays
 rejection = ((:any_waiting_time, 1.), (:any_relative_detour, 1.))
 
 # Only Limit the number of requests to ensure, that all system get exactly the same requests
-requested = 600*N #CHANGE 10000 * N
+requested = 20000 * N
 
 # Random Distribution of dt_earliest_pickup
 rng_type = :even
-request_type = :resubmission
+request_type = :drive_and_wait
 
 
 xlen = 40
@@ -61,5 +61,6 @@ bus_quantitys = [
 model_quantitys = [
 	:driven_distance,
 	:efficiency,
-	:quality
-]
\ No newline at end of file
+	:quality,
+	:model_time
+]

submit.sh

@@ -6,10 +6,10 @@
 #$ -j yes
 #$ -N anywt1_anydt01
 #$ -t 1-1600
-#$ -tc 900
+#$ -tc 400
 
 
 SETTINGS_NAME="./settings.jl"
 
 #Run simulation
-/usr/ds/bin/julia sim.jl $SGE_TASK_ID $SETTINGS_NAME $JOB_NAME
\ No newline at end of file
+julia sim.jl $SGE_TASK_ID $SETTINGS_NAME $JOB_NAME