Skip to content

Commit

Permalink
Merge pull request #6 from sisl/fix_travis
Browse files Browse the repository at this point in the history
Travis tests triggered, and docs also work
  • Loading branch information
raunakbh92 committed Apr 4, 2020
2 parents 82c5d55 + 0b0b765 commit 52a93a4
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 46 deletions.
14 changes: 2 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
# Documentation: http://docs.travis-ci.com/user/languages/julia/
language: julia
sudo: required

os:
- linux
- osx

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:
Expand All @@ -29,8 +21,6 @@ jobs:
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()'
Expand Down
2 changes: 2 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
24 changes: 13 additions & 11 deletions docs/src/driving_simulation.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# Driving Simulation
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
```
23 changes: 12 additions & 11 deletions docs/src/roadway_building.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# Roadway Building
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!
```
10 changes: 6 additions & 4 deletions docs/src/veh_track_reading.md
Original file line number Diff line number Diff line change
@@ -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,
INTERACTIONTrajdata
carsinframe
car_df_index
read_veh_tracks
```
```
12 changes: 6 additions & 6 deletions docs/src/visualization.md
Original file line number Diff line number Diff line change
@@ -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,
video_trajdata_replay
scenelist2video
video_overlay_scenelists
scenelist2video_curvepts
```
```
2 changes: 0 additions & 2 deletions src/AutomotiveInteraction.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ export
video_trajdata_replay,
scenelist2video,
video_overlay_scenelists,
curvepts_overlay,
LaneOverlay,
scenelist2video_curvepts
include("visualization.jl")

Expand Down
3 changes: 3 additions & 0 deletions src/roadway_building.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 52a93a4

Please sign in to comment.