Merge 90acc31 into 52a93a4

.gitignore

@@ -4,6 +4,12 @@ julia_notebooks/.ipynb_checkpoints
 # media files generated by notebooks
 julia_notebooks/media/
 
+# media files generated by tests
+test/media/
+
+# media files generated by scripts
+scripts/media/
+
 # Files generated by invoking Julia with --code-coverage
 *.jl.cov
 *.jl.*.cov

.travis.yml

@@ -25,4 +25,4 @@ jobs:
         - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));
                                                Pkg.instantiate()'
         - julia --project=docs/ docs/make.jl
-      after_success: skip
+      after_success: skip

Project.toml

@@ -6,12 +6,21 @@ version = "0.1.0"
 [deps]
 AutomotiveSimulator = "6aa42d20-6c96-11ea-1103-339224409280"
 AutomotiveVisualization = "0faf7fd0-6c98-11ea-1740-03605baa3b07"
+Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
+JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reel = "71555da5-176e-5e73-a222-aebc6c6e4f2f"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
+StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+
+[compat]
+Reel = "1.1.1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

docs/src/driving_simulation.md

@@ -14,4 +14,4 @@ These functions help in running driving simulations.
     run_vehicles_curvept_overlay
     test_barrier_vehicle
     test_jumpy_vehicle
-```
+```

docs/src/filtering.md

@@ -0,0 +1,23 @@
+# Particle Filtering
+
+These functions are responsible for performing particle filtering for parameter estimation.
+
+```@docs
+    c_idm_from_particle
+    hallucinate_a_step
+    weight_and_resample
+    multistep_update
+    obtain_driver_models
+```
+
+The following functions are helpers. They provide access to information about vehicle state, as well as help visualize filtering progress.
+
+```@docs
+    get_frenet_s
+    get_veh_info
+    get_lane_id
+    get_lane_change_prob
+    initial_pmat
+    pgfplots2gif
+    plot_pairwise_particles
+```

docs/src/index.md

@@ -8,6 +8,7 @@ Pages = [
     "roadway_building.md",
     "driving_simulation.md",
     "visualization.md",
-    "veh_track_reading.md"
+    "veh_track_reading.md",
+    "filtering.md"
 ]
-```
+```

docs/src/roadway_building.md

@@ -14,4 +14,4 @@ These functions are required to build the roadway from the provided centerline t
     make_discont_roadway_jagged
     MergingRoadway
     add_renderable!
-```
+```

scripts/experiments.jl

@@ -0,0 +1,93 @@
+# This file is used for performing experiments
+# Run by changing path in REPL to scripts folder
+# Then `include("experiments.jl")`
+
+using AutomotiveSimulator
+using AutomotiveInteraction
+using PGFPlots
+using JLD
+
+include("helpers.jl")
+
+# Scenarios for upper merge
+# List of tuples. Elem 1 of tuple is veh id list, elem 2 is list with ts and te
+scenarios_upper = [
+        ([6,8,13,19,28,29],[1,120]), #19,29 merge lane
+        ([34,37,40,42,43,49,50],[88,230]), #34,37,43,50 merge lane
+        ([59,60,62,66,67,71,73],[188,390]), #59,62,66,71 merge lane
+        ([66,67,71,73,76,82,88,92,95],[310,440]), #71,76,95 merge lane
+        ([187,191,193,194],[940,985]), #187,191,194 merge lane
+
+        ([211,213,215,217,221],[1135,1190]), #211,217,221 merge lane
+        ([248,249,250,256],[1323,1420]), # 249 merge lane
+        ([272,275,276,277,279],[1440,1615]), #275, 277 merge lane
+        ([294,295,300,307,308,311],[1576,1780]), #295,307,308 merge lane
+        ([324,327,329,333,335,339,341,346,354,357],[1810,1950]) #327,333,339,346,354
+]
+
+# Scenarios for lower merge
+scenarios_lower = [
+        ([2,7,10,18,25],[1,30]), #7,25 merge vehicles
+        ([64,68,70,74,77],[198,230]), #70 merge lane
+        ([105,106,108,110],[382,430]), # 110 merge lane
+        ([176,177,178],[827,870]), #177 merge lane
+
+        ([252,253,255],[1315,1370]), #253 merge lane
+        ([361,363,364,366],[1830,1885]) #363 merge lane
+]
+
+#***********Run filtering and store resulting models to jld files****
+# s = scenarios_lower
+# f = FilteringEnvironment(mergeenv=MergingEnvironmentLower())
+
+s = scenarios_upper
+f = FilteringEnvironment()
+for i in 1:length(s)
+        veh_id_list = s[i][1]
+        ts = s[i][2][1]
+        te = s[i][2][2]
+        m,p,md = obtain_driver_models(f,veh_id_list=veh_id_list,num_p=50,ts=ts,te=te)
+        #JLD.save("media/lower_$i.jld","m",m,"p",p,"md",md,"veh_id_list",veh_id_list,"ts",ts,"te",te)
+        JLD.save("media/upper_$i.jld","m",m,"p",p,"md",md,"veh_id_list",veh_id_list,"ts",ts,"te",te)
+end
+
+
+#************Docstring example code from multiscenarios_pf in helpers.jl*****
+# USEFUL to keep around for making tikz plots later on by rerunning this script
+# Select a block of code and press shift+enter to run block selectively
+
+# Lower merge
+rmse_pos_mat_idm,rmse_vel_mat_idm,coll_mat_idm = 
+        multiscenarios_idm(mergetype="lower",modelmaker=make_IDM_models);
+rmse_pos_mat_cidm,rmse_vel_mat_cidm, coll_mat_cidm = 
+        multiscenarios_idm(mergetype="lower",modelmaker=make_cidm_models);
+rmse_pos_mat_lmidm, rmse_vel_mat_lmidm, coll_mat_lmidm = 
+        multiscenarios_idm(mergetype="lower",modelmaker=make_lmidm_models);
+rmse_pos_mat_pf,rmse_vel_mat_pf, coll_mat_pf = multiscenarios_pf(mergetype="lower");
+
+rmse_pos_list = [rmse_pos_mat_idm,rmse_pos_mat_cidm,rmse_pos_mat_lmidm,rmse_pos_mat_pf];
+rmse_plots_modelscompare(rmse_pos_list,filename = "media/rmse_pos_lower.svg");
+
+coll_mat_list = [coll_mat_idm,coll_mat_cidm,coll_mat_lmidm,coll_mat_pf];
+coll_barchart(coll_mat_list,filename = "media/coll_barchart_lower.svg");
+
+# Upper merge
+rmse_pos_mat_idm,rmse_vel_mat_idm,coll_mat_idm = 
+        multiscenarios_idm(mergetype="upper",modelmaker=make_IDM_models);
+rmse_pos_mat_cidm, rmse_vel_mat_cidm, coll_mat_cidm = 
+        multiscenarios_idm(mergetype="upper",modelmaker=make_cidm_models);
+rmse_pos_mat_lmidm, rmse_vel_mat_lmidm, coll_mat_lmidm = 
+        multiscenarios_idm(mergetype="upper",modelmaker=make_lmidm_models);
+rmse_pos_mat_pf, rmse_vel_mat_pf, coll_mat_pf = multiscenarios_pf(mergetype="upper");
+
+rmse_pos_list = [rmse_pos_mat_idm,rmse_pos_mat_cidm,rmse_pos_mat_lmidm,rmse_pos_mat_pf];
+rmse_plots_modelscompare(rmse_pos_list,filename = "media/rmse_pos_upper.svg");
+
+coll_mat_list = [coll_mat_idm,coll_mat_cidm,coll_mat_lmidm,coll_mat_pf];
+coll_barchart(coll_mat_list,filename = "media/coll_barchart_upper.svg");
+
+#********************Train upper test lower******************
+# We need to show a variability in the generated scenarios
+# So we need to combine the particle sets of different vehicles together
+# And then for the same set of vehicles in the lower merge i.e. test domain
+# We show significantly different driving behavior by sampling from the particle set