From f8d7d1a27e021df4c392f25d61501cee3d8e06e7 Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Thu, 2 Apr 2020 10:33:40 +0530 Subject: [PATCH 01/12] copy travis from AutomotiveSimulator, add docstrings and remove not included functions from docs --- .travis.yml | 15 +-------------- docs/src/driving_simulation.md | 2 ++ docs/src/roadway_building.md | 1 + docs/src/veh_track_reading.md | 4 +++- docs/src/visualization.md | 4 ++-- src/AutomotiveInteraction.jl | 2 -- src/roadway_building.jl | 3 +++ 7 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08fcc50..4935457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,32 +7,19 @@ os: julia: - 1 -addons: - apt: # apt-get for linux - packages: - - libgtk-3-dev notifications: email: false -script: - - git clone https://github.com/JuliaRegistries/General $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))') - - git clone https://github.com/SISL/Registry $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "SISL"))') - - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia --project --color=yes -e 'import Pkg; Pkg.build(); Pkg.test(coverage=true)' after_success: - - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' - jobs: include: - stage: "Documentation" julia: 1 os: linux script: - - git clone https://github.com/JuliaRegistries/General $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))') - - git clone https://github.com/SISL/Registry $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "SISL"))') - julia --project=docs/ -e 'using Pkg; Pkg.add("Documenter")' - 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 \ No newline at end of file diff --git a/docs/src/driving_simulation.md b/docs/src/driving_simulation.md index 8dc0c95..417b660 100644 --- a/docs/src/driving_simulation.md +++ b/docs/src/driving_simulation.md @@ -1,4 +1,6 @@ # Driving Simulation +These functions help in running driving simulations. + ```@docs keep_vehicle_subset!, make_def_models, diff --git a/docs/src/roadway_building.md b/docs/src/roadway_building.md index 8d216de..ec615de 100644 --- a/docs/src/roadway_building.md +++ b/docs/src/roadway_building.md @@ -1,4 +1,5 @@ # Roadway Building +These functions are required to build the roadway from the provided centerline text files. ```@docs append_to_curve!, diff --git a/docs/src/veh_track_reading.md b/docs/src/veh_track_reading.md index cceb593..bed6ede 100644 --- a/docs/src/veh_track_reading.md +++ b/docs/src/veh_track_reading.md @@ -1,7 +1,9 @@ # Vehicle Track Reading +These functions are responsible for reading vehicle track information from provided csv file into a vector of scenes, a format compatible with `AutomotiveSimulator.jl` + ```@docs INTERACTIONTrajdata, carsinframe, car_df_index, read_veh_tracks -``` \ No newline at end of file +``` diff --git a/docs/src/visualization.md b/docs/src/visualization.md index 6438303..b14bfaf 100644 --- a/docs/src/visualization.md +++ b/docs/src/visualization.md @@ -1,9 +1,9 @@ # Visualization +These functions are responsible to create visualizations using `AutomotiveVisualization.jl`. + ```@docs video_trajdata_replay, scenelist2video, video_overlay_scenelists, - curvepts_overlay, - LaneOverlay, scenelist2video_curvepts ``` \ No newline at end of file diff --git a/src/AutomotiveInteraction.jl b/src/AutomotiveInteraction.jl index ea29e8b..fd0b571 100644 --- a/src/AutomotiveInteraction.jl +++ b/src/AutomotiveInteraction.jl @@ -53,8 +53,6 @@ export video_trajdata_replay, scenelist2video, video_overlay_scenelists, - curvepts_overlay, - LaneOverlay, scenelist2video_curvepts include("visualization.jl") diff --git a/src/roadway_building.jl b/src/roadway_building.jl index 2c4e995..4922c95 100644 --- a/src/roadway_building.jl +++ b/src/roadway_building.jl @@ -392,6 +392,9 @@ struct MergingRoadway roadway::Roadway end +""" +Dedicated render function for the MergingRoadway wrapper +""" function AutomotiveVisualization.add_renderable!(rendermodel::RenderModel, mr::MergingRoadway) #print("This is the (still code copied) rendering for merging lane boundary") From 3d16766b08a98382d33879558d688632c08d7165 Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Thu, 2 Apr 2020 10:48:42 +0530 Subject: [PATCH 02/12] copying travis from sisl/SatelliteDynamics.jl --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4935457..5a5a53a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # Documentation: http://docs.travis-ci.com/user/languages/julia/ language: julia sudo: required + os: - linux @@ -10,6 +11,9 @@ julia: notifications: email: false +script: + - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' + after_success: - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' jobs: From ca05569c89e8ee590a0c02ab6b56b8f6fe3af125 Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Thu, 2 Apr 2020 12:48:57 +0530 Subject: [PATCH 03/12] julia 1.3 instead of julia 1 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a5a53a..f4ba4e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ os: - linux julia: - - 1 + - 1.3 notifications: email: false @@ -19,7 +19,7 @@ after_success: jobs: include: - stage: "Documentation" - julia: 1 + julia: 1.3 os: linux script: - julia --project=docs/ -e 'using Pkg; Pkg.add("Documenter")' From aa69665fccbe6af19c856ae484fe452f808ca4ae Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Thu, 2 Apr 2020 15:28:01 +0530 Subject: [PATCH 04/12] minor change to travis to see if tests will trigger --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f4ba4e7..91c588a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ script: after_success: - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' + jobs: include: - stage: "Documentation" From e7047e050a4cb32d859a1000789f63ca1c9a7b0c Mon Sep 17 00:00:00 2001 From: MaximeBouton Date: Thu, 2 Apr 2020 22:36:50 -0700 Subject: [PATCH 05/12] comment script, add osx --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91c588a..369a84e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,16 @@ sudo: required os: - linux + - osx julia: - - 1.3 + - 1 notifications: email: false -script: - - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' +# script: +# - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' after_success: - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' @@ -20,11 +21,11 @@ after_success: jobs: include: - stage: "Documentation" - julia: 1.3 + julia: 1 os: linux script: - julia --project=docs/ -e 'using Pkg; Pkg.add("Documenter")' - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - julia --project=docs/ docs/make.jl - after_success: skip \ No newline at end of file + after_success: skip From 4b7b13025f34f322249660336ae2c4693a98bac7 Mon Sep 17 00:00:00 2001 From: MaximeBouton Date: Thu, 2 Apr 2020 22:47:58 -0700 Subject: [PATCH 06/12] comment out macos --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 369a84e..ac753cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: required os: - linux - - osx + # - osx julia: - 1 From 31cf78169fc0989072c1cb16169f2f0df7f46469 Mon Sep 17 00:00:00 2001 From: MaximeBouton Date: Thu, 2 Apr 2020 22:57:02 -0700 Subject: [PATCH 07/12] restore build script --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac753cb..ff2f30d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ julia: notifications: email: false -# script: -# - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' +script: + - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' after_success: - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' From 9b10827c866336ec416d33829d1d5b57f67488e9 Mon Sep 17 00:00:00 2001 From: MaximeBouton Date: Thu, 2 Apr 2020 23:01:52 -0700 Subject: [PATCH 08/12] default script' --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff2f30d..482a2ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ julia: notifications: email: false -script: - - julia --project --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("AutomotiveInteraction"; coverage=true)' - after_success: - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' From 47f06d6ff37c880fb70045131235af2887360eb8 Mon Sep 17 00:00:00 2001 From: MaximeBouton Date: Thu, 2 Apr 2020 23:06:08 -0700 Subject: [PATCH 09/12] add osx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 482a2ff..abd8ee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: required os: - linux - # - osx + - osx julia: - 1 From 567341d189aa0ef3a3f70a90e620d80c7c1ddf69 Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Fri, 3 Apr 2020 13:06:19 +0530 Subject: [PATCH 10/12] fix docs --- docs/src/driving_simulation.md | 22 +++++++++++----------- docs/src/roadway_building.md | 22 +++++++++++----------- docs/src/veh_track_reading.md | 6 +++--- docs/src/visualization.md | 8 ++++---- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/src/driving_simulation.md b/docs/src/driving_simulation.md index 417b660..5d978b2 100644 --- a/docs/src/driving_simulation.md +++ b/docs/src/driving_simulation.md @@ -2,16 +2,16 @@ These functions help in running driving simulations. ```@docs - 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, + 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 ``` diff --git a/docs/src/roadway_building.md b/docs/src/roadway_building.md index ec615de..0c44fb4 100644 --- a/docs/src/roadway_building.md +++ b/docs/src/roadway_building.md @@ -2,16 +2,16 @@ These functions are required to build the roadway from the provided centerline text files. ```@docs - 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, + 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! ``` diff --git a/docs/src/veh_track_reading.md b/docs/src/veh_track_reading.md index bed6ede..3f6d796 100644 --- a/docs/src/veh_track_reading.md +++ b/docs/src/veh_track_reading.md @@ -2,8 +2,8 @@ These functions are responsible for reading vehicle track information from provided csv file into a vector of scenes, a format compatible with `AutomotiveSimulator.jl` ```@docs - INTERACTIONTrajdata, - carsinframe, - car_df_index, + INTERACTIONTrajdata + carsinframe + car_df_index read_veh_tracks ``` diff --git a/docs/src/visualization.md b/docs/src/visualization.md index b14bfaf..389c992 100644 --- a/docs/src/visualization.md +++ b/docs/src/visualization.md @@ -2,8 +2,8 @@ These functions are responsible to create visualizations using `AutomotiveVisualization.jl`. ```@docs - video_trajdata_replay, - scenelist2video, - video_overlay_scenelists, + video_trajdata_replay + scenelist2video + video_overlay_scenelists scenelist2video_curvepts -``` \ No newline at end of file +``` From 6ddd2de2270805a4512ccdf5016db056d27a9b10 Mon Sep 17 00:00:00 2001 From: Raunak laptop Date: Fri, 3 Apr 2020 13:09:04 +0530 Subject: [PATCH 11/12] Add docs folder project.toml --- docs/Project.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/Project.toml diff --git a/docs/Project.toml b/docs/Project.toml new file mode 100644 index 0000000..b4c0ff2 --- /dev/null +++ b/docs/Project.toml @@ -0,0 +1,3 @@ +[deps] +AutomotiveInteraction = "2cd99dca-542e-11ea-3527-d59c2c73dc48" +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" From 0b0b7650b2e329ad82155f344eb17d84cdd79ecd Mon Sep 17 00:00:00 2001 From: Maxime Date: Fri, 3 Apr 2020 09:00:15 -0700 Subject: [PATCH 12/12] remove AutomotiveInteraction from docs/Project.toml --- docs/Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/Project.toml b/docs/Project.toml index b4c0ff2..dfa65cd 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,3 +1,2 @@ [deps] -AutomotiveInteraction = "2cd99dca-542e-11ea-3527-d59c2c73dc48" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"