Merge d9a994d into f2aac47

sisl · Nov 13, 2019 · c718e51 · c718e51
2 parents f2aac47 + d9a994d
commit c718e51
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 422 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "AutoUrban"
 uuid = "1385418a-9289-5a49-ab93-843b508de4cb"
 repo = "https://github.com/sisl/AutoUrban.jl"
-version = "0.2.2"
+version = "0.2.3"
 
 [deps]
 AutoViz = "82aa6e0c-a491-5edf-8d4b-c16b98e4ea17"

diff --git a/README.md b/README.md
@@ -6,6 +6,15 @@ A Julia package expanding the [AutomotiveDrivingModels.jl](https://github.com/si
 
 ## Installation
 
+Preferred way, by adding the SISL registry: 
+
+```
+] registry add https://github.com/sisl/Registry
+] add AutoUrban
+```
+
+Other way, by manually adding all the dependencies:
+
 ```julia 
 using Pkg
 Pkg.add(PackageSpec(url="https://github.com/sisl/Vec.jl"))

diff --git a/src/AutoUrban.jl b/src/AutoUrban.jl
@@ -9,9 +9,54 @@ using Printf
 using LinearAlgebra
 using Distributions
 
-include("simulation/main.jl")
-include("drivermodels/main.jl")
-include("render/main.jl")
-include("roadway/main.jl")
+export
+	LatLonAccelDirection,
+	AccelSteeringDirection,
+    NextState
+
+include("actions.jl")
+
+export
+    initialize_XML,
+    get_lane_length,
+    handle_junctions,
+    convert_roadway!,
+    Connection,
+    Junction,
+    connect_two_lane_general!,
+    connect_two_seg!,
+    connect_two_seg_general!,
+    add_connection!,
+    add_junction!,
+    gen_connected_lanes,
+    gen_intersection,
+    gen_loop_roadway,
+    add_line!,
+    in_lanes,
+    get_max_curvature
+
+include("roadway/roadway_generation.jl")
+include("roadway/roadway_perception.jl")
+include("roadway/roadway_intersection.jl")
+include("roadway/convert2xodr.jl")
+
+export
+    AccSteerDriver,
+    IDMDriver,
+    UrbanDriver,
+    MultiPtsDriver,
+    MultiPtsTurningDriver,
+    MOBILDriver,
+    excute_action!
+
+include("drivermodels/acc_steer_drivers.jl")
+include("drivermodels/IDMDriver.jl")
+include("drivermodels/MOBILDriver.jl")
+include("drivermodels/urban_drivers.jl")
+include("drivermodels/multiPts_driver.jl")
+include("drivermodels/multiPts_functions_GD.jl")
+include("drivermodels/waypoints_setting_functions.jl")
+include("drivermodels/multiPtsTurning_driver.jl")
+include("drivermodels/render_drivers.jl")
 
 end
diff --git a/src/simulation/actions.jl → src/actions.jl b/src/simulation/actions.jl → src/actions.jl
diff --git a/src/drivermodels/MOBILDriver.jl b/src/drivermodels/MOBILDriver.jl
@@ -1,6 +1,6 @@
 import AutomotiveDrivingModels.observe!
 
-mutable struct MOBILDriver <: LaneChangeModel
+mutable struct MOBILDriver <: LaneChangeModel{LaneChangeChoice}
 
     dir::Int
     #rec::SceneRecord

diff --git a/src/drivermodels/env_drivers_backup.jl b/src/drivermodels/env_drivers_backup.jl
diff --git a/src/drivermodels/main.jl b/src/drivermodels/main.jl
diff --git a/src/render/render_drivers.jl → src/drivermodels/render_drivers.jl b/src/render/render_drivers.jl → src/drivermodels/render_drivers.jl
diff --git a/src/render/main.jl b/src/render/main.jl