-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from sisl/road_extension
Merge branch road_extension into master - Made this package compatible with `AutomotiveSimulator.jl` (successor to AutomotiveDrivingModels.jl) and `AutomotiveVisualization.jl` (successor to AutoViz.jl) - Provides extended roadways to enable model driven vehicles to not reverse due to road ending - Visualize such that lane boundaries for merge lanes are sensible. Specialized wrapper called `MergingRoadway` around roadway object with dedicated `add_renderable!` - Cooperative IDM driver model - Vehicle track reading uses only `Vector{Scenes}` rather than legacy code from `Records.jl` such as `ListRecord`
- Loading branch information
Showing
18 changed files
with
1,288 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,15 @@ | ||
# Driving Simulation | ||
```@docs | ||
keep_vehicle_subset! | ||
place_vehs_on_straight_road | ||
place_vehs_on_separated_segments_road | ||
make_def_models | ||
make_TimLaneChanger_models | ||
get_hallucination_scenes | ||
run_vehicles | ||
keep_vehicle_subset!, | ||
make_def_models, | ||
make_IDM_models, | ||
make_cidm_models, | ||
make_iidm_models, | ||
make_TimLaneChanger_models, | ||
get_hallucination_scenes, | ||
run_vehicles, | ||
compare2truth, | ||
run_vehicles_curvept_overlay, | ||
test_barrier_vehicle, | ||
test_jumpy_vehicle | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,16 @@ | ||
# Roadway Building | ||
|
||
```@docs | ||
append_to_curve! | ||
get_new_angle | ||
bound_heading | ||
append_headings | ||
centerlines_txt2tracks | ||
make_roadway_interaction | ||
make_ngsim_roadway | ||
append_to_curve!, | ||
get_new_angle, | ||
bound_heading, | ||
append_headings, | ||
centerlines_txt2tracks, | ||
make_roadway_interaction, | ||
make_roadway_ngsim, | ||
make_roadway_interaction_with_extensions, | ||
make_discont_roadway_straight, | ||
make_discont_roadway_jagged, | ||
MergingRoadway, | ||
add_renderable! | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Vehicle Track Reading | ||
```@docs | ||
INTERACTIONTrajdata, | ||
carsinframe, | ||
car_df_index, | ||
read_veh_tracks | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Visualization | ||
```@docs | ||
video_trajdata_replay, | ||
scenelist2video, | ||
video_overlay_scenelists, | ||
curvepts_overlay, | ||
LaneOverlay, | ||
scenelist2video_curvepts | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,76 @@ | ||
# This is a placeholder file which will later contain all exported functions and included .jl files | ||
|
||
# This is the module file. It allows communication between different files within the src folder | ||
# Also, determines which functions are provided by AutomotiveInteraction whenever someone says | ||
# using AutomotiveInteraction | ||
module AutomotiveInteraction | ||
|
||
using AutomotiveDrivingModels | ||
using AutoViz | ||
using AutomotiveSimulator | ||
using AutomotiveVisualization | ||
using Reel | ||
|
||
using DataFrames | ||
using Records | ||
using DelimitedFiles | ||
using Parameters | ||
using Random # For AbstractRNG in Base.rand for c-idm | ||
|
||
export keep_vehicle_subset!, | ||
export | ||
keep_vehicle_subset!, | ||
make_def_models, | ||
make_IDM_models, | ||
make_cidm_models, | ||
make_iidm_models, | ||
make_TimLaneChanger_models, | ||
get_hallucination_scenes, | ||
run_vehicles | ||
run_vehicles, | ||
compare2truth, | ||
run_vehicles_curvept_overlay, | ||
test_barrier_vehicle, | ||
test_jumpy_vehicle | ||
include("driving_simulation.jl") | ||
|
||
|
||
export append_to_curve!, | ||
export | ||
append_to_curve!, | ||
get_new_angle, | ||
bound_heading, | ||
append_headings, | ||
centerlines_txt2tracks, | ||
make_roadway_interaction, | ||
make_roadway_ngsim | ||
make_roadway_ngsim, | ||
make_roadway_interaction_with_extensions, | ||
make_discont_roadway_straight, | ||
make_discont_roadway_jagged, | ||
MergingRoadway, | ||
add_renderable! | ||
include("roadway_building.jl") | ||
|
||
export | ||
INTERACTIONTrajdata, | ||
carsinframe, | ||
car_df_index, | ||
read_veh_tracks | ||
include("veh_track_reading.jl") | ||
|
||
export | ||
video_trajdata_replay, | ||
scenelist2video, | ||
video_overlay_scenelists, | ||
curvepts_overlay, | ||
LaneOverlay, | ||
scenelist2video_curvepts | ||
include("visualization.jl") | ||
|
||
export | ||
MergingEnvironment, | ||
main_lane, | ||
merge_lane | ||
include("environment.jl") | ||
|
||
export | ||
CooperativeIDM, | ||
find_merge_vehicle | ||
include("cooperative_IDM.jl") | ||
|
||
export | ||
MergeOverlay | ||
include("overlays.jl") | ||
|
||
end | ||
end # End module |
Oops, something went wrong.