Added filetypes to gitignore

.gitignore

 .ipynb_checkpoints/
 .vscode/
+latest_dropoff.o*
+earliest_pickup.o*
\ No newline at end of file

Manifest.toml

@@ -316,9 +316,9 @@ version = "0.21.0+0"
 
 [[Glib_jll]]
 deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "7bf67e9a481712b3dbe9cb3dac852dc4b1162e02"
+git-tree-sha1 = "74ef6288d071f58033d54fd6708d4bc23a8b8972"
 uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
-version = "2.68.3+0"
+version = "2.68.3+1"
 
 [[GraphRecipes]]
 deps = ["AbstractTrees", "GeometryTypes", "Graphs", "InteractiveUtils", "Interpolations", "LinearAlgebra", "NaNMath", "NetworkLayout", "PlotUtils", "RecipesBase", "SparseArrays", "Statistics"]
@@ -351,9 +351,9 @@ version = "0.9.17"
 
 [[HarfBuzz_jll]]
 deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
-git-tree-sha1 = "8a954fed8ac097d5be04921d595f741115c1b2ad"
+git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3"
 uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566"
-version = "2.8.1+0"
+version = "2.8.1+1"
 
 [[Hiccup]]
 deps = ["MacroTools", "Test"]
@@ -847,7 +847,7 @@ version = "1.1.3"
 
 [[RidePooling]]
 deps = ["Agents", "BenchmarkTools", "DelimitedFiles", "Distributions", "LinearAlgebra", "Measures", "OpenStreetMapX", "OpenStreetMapXPlot", "Pkg", "PlotlyJS", "Plots", "PolygonOps", "PrettyTables", "Random", "Serialization", "SparseArrays"]
-git-tree-sha1 = "7e7f7b5b6984a8265cd1181877a8b880088dd113"
+git-tree-sha1 = "b852b4d7ab0221226e8baea64b5751dcd1e6d712"
 repo-rev = "planned_pickup"
 repo-url = "https://gitlab.gwdg.de/smuehle1/RidePooling/"
 uuid = "2a705bf3-b16b-4235-81e9-bc2517364992"

initialize.sh

 #!/bin/bash
 
 
-./settings.sh
+ARRAY=($(./settings.sh))
+N=${ARRAY[0]}
+REQUEST_TYPE=${ARRAY[1]}
+NAME=${ARRAY[2]}
+SAVE_PATH=${ARRAY[3]}
+DATA_PATH=${ARRAY[4]}
+MODEL_PATH=${ARRAY[5]}
+
+
 N=1
 INDEX=1
 mkdir -p $DATA_PATH
@@ -9,4 +17,4 @@ mkdir $MODEL_PATH
 
 
 # Test , if the simulation is starting:
-julia sim.jl $N $SAVE_PATH $INDEX
+julia sim.jl $N $SAVE_PATH $INDEX $REQUEST_TYPE

sim.jl

 using Pkg
 Pkg.activate(".")
 
-Pkg.add(url="https://gitlab.gwdg.de/smuehle1/RidePooling/", rev="planned_pickup")
-Pkg.instantiate()   #there may be an error here concerning PyCall. The dependencies assume Python to be installed on your system, with package 'matplotlib' installed.
+#Pkg.add(url="https://gitlab.gwdg.de/smuehle1/RidePooling/", rev="planned_pickup")
+#Pkg.instantiate()   #there may be an error here concerning PyCall. The dependencies assume Python to be installed on your system, with package 'matplotlib' installed.
                     #Either just run 'conda install -c conda-forge matplotlib' in your system shell, or follow instructions below (after running this cell and getting an error) to solve everything from within Julia.
 import RidePooling
 
@@ -10,7 +10,7 @@ import RidePooling
 RP = RidePooling
 using DataFrames
 using CSV
-include("./initialize.jl")
+include("./sim_functions.jl")
 
 
 
@@ -59,7 +59,7 @@ catch e
 end
 end
 end
-
+end
 
 
 # Set the Filepaths
@@ -82,8 +82,8 @@ if !isdir(paths[:model])
 end
 
 map_folder = paths[:map]
-requested = 2000 * N
-served = 2000 * N
+requested = 1000 * N
+served = 1000 * N
 
 include(paths[:map]*"map.jl") #
 include(paths[:dispatcher]*"dispatcher.jl")

sim_functions.jl

@@ -36,8 +36,8 @@ function getLogValue(index, xmin, xmax, xlen::Int64, ymin, ymax, ylen::Int64)
 
     xs = exp.(LinRange(log(xmin), log(xmax), xlen))
     ys = LinRange(log(ymin), log(ymax), ylen)
-    x = xs[(index-1)%xlen+1]
-    y = ys[trunc(Int64, (index-1)/ylen)+1]
+    x = xs[(index)%xlen+1]
+    y = ys[trunc(Int64, (index)/ylen)+1]
     return x,y
 end
 
@@ -51,8 +51,8 @@ function getLogLogValue(index, xmin, xmax, xlen::Int64, ymin, ymax, ylen::Int64)
     xs = exp.(LinRange(log(xmin), log(xmax), xlen))
     ys = exp.(LinRange(log(ymin), log(ymax), ylen))
     println(length(xs));
-    x = xs[(index-1)%xlen+1]
-    y = ys[trunc(Int64, (index-1)/ylen)+1]
+    x = xs[(index)%xlen+1]
+    y = ys[trunc(Int64, (index)/ylen)+1]
     return x,y
 end