Commit Graph

872 Commits

Author SHA1 Message Date
doterop 85b192530d
Doterop/traffic manager (#2468)
* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* adding section id to map setup

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Print removal

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Server side changes ...

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Initial implementation of t.m. performance script

* Remove redundant getLocation() calls

* Demo for inter-client communication via Carla server

* WIP: To do: For client usage needed to be changed.

* Instead or client instance episodeProxy is passed to TM

* Instead or client instance episodeProxy is passed to TM

* parmeter improvements (walkers,cars,signs,lights)

* fix manual_control to reload car with autopilot on

* Instead of client instance episodeProxy is passed to TM.

* WIP: Only added vehicle register via RPC server / client call in TM to
local instance from remote instance. Similarly other APIs we need to
added.

* Added all TM APIs

* carla client now can provide TM instance if required.

* While getting TM instance if server given data is not valid new TM
instace is created. Need to decide what to do with earlier registed
vehicle with previous TM.

* Updated with HealthCheckRemoteTM() function to check TM server status
instead of ResetAllTrafficLights() for any new user client.

* Dynamic port selection added to TM server instace (in case of multiple
TM serve run, it required).

* Fixed change map error

* If registered TM at carla server is not present then remote TM should be
freed and new local TM instance is created.

* Created Process for Local TM.
It cheaks with total registered vehicles in it, if no register vehicles
for 5 sec, it closes it self.

In python spawn_npc.py Client Timeout set to 10 sec. as creating Process
is system dependent call and takes time.

User has to unregister vehicle before destroying it (if activated with
TM). Also neet to check TM unregister function to remove vehicles from
register list.

* Fix for collision ignore bug

* Update TM exit function check to compare registered vehicles with world
actors that if any valid vehicle present cointinue to run the TM else
stop.

* Splited work of main for loop in ApplyBatchCommandsSync

* WIP! Trying to get client directly

* WIP! Trying to access episode properly without getting it from TM ctr

* Changes to BatchControlStage for Sync Mode
Changes to Parameters for Synch Mode

* Added port support for TM. Multiclient MultiTM

* Added additions for RPC Synchronous Tick to TM.
Error handeling and code organization.

* Exposed API for Sync Mode

* TMServer notifies Server that it is gonna be destroyed

* Exposed Python API for Sync Mode

* Add TM as separate process and synchronous tick calls

* SetSynchronousModeTimeOutInMiliSecond method added

* TM shutsdown and informs to the connected clients

* WIP! Map change issues again

* Updated Traffic Manager for:
1) Multi-client, Multi-TM (as required) can be reistered to server.
2) TM is not a PROCESS separated from the user-client.
3) TM will exit if user-client exit.
4) If server closed, TM also get closed by catching runtime err.

* Fixed possible stall on TM destruction

* fixing collision stage + cybertruck not safe

* Merge branch 'master' into 'soumyadeep/traffic_manager'

* WIP! Disconnection of server has to be properly handled by clients

* format update

* Fix bug unsignalized junctions

* # WARNING: head commit changed in the meantime

Merge branch 'doterop/traffic_manager' into soumyadeep/traffic_manager
Updates for Syncronized Tick.

* Updated runtime exception in Episode for smooth exit if TN server closed
for any other user client.

* Better Exception handeling

* Merged with jackbart94/tm_reduce_getloc_calls

* Merged soumyadeep/traffic_manager.
Removed World getter and recovered Episode as a parameter of TM ctr.
Fixed syntax errors.

* Rebased with master

* Changes after rebase

* Solving tab errors

* Updated Changelog

* Removing Destroyed vehicle's from TM Server

* Fixed uint compatibility with Windows

* Merged soumyadeep/traffic_manager. Discarded destroyed actors

* -Removed unnecessary files

* restoring docs from rebase

* Fix windows compilation

* refactoring stage-related code

* more code refactoring

* When map change the simulation doesn't throw exception anymore

* Fixed incorrect episode

* Fixed map change and TM remote detached thread destruction

* Syntax and comments fixes

* Missed change on previous commit

* Fixed compile minor compile issue

* Cleaned and fixed some issues after merge

* fix to sync localization bugs
modified PID parameters
revamping spawn_npc

* deleted tm_spawn_npc

* fixes spawn error in sync mode

* Redoing TM sync logic

* finished performance benchmark for tm

* deprecated wrapped methods:
register_vehicle
unregister_vehicle

* New TM management

* Fixed sync mode on TM

* Cleaned TM of prints and unussed functions

* collision stage checks for (0,0,0) to ignore.
in memory map has an # between keys to avoid possible mixup.
fixed spawn_npc with new sync mode

* changelog

* added more connection retries

* fixed changelog + comments (see reviewable)

* Moved socket include's to single header

* Added missing line at the end of the file

* Fixed syntax errors

* final commit

* Minor correction in comment

* update copyright year to 2020 + removed break

* restoring unwanted changes

* patch for smoke test error

* Removed "todo" for pylint

Co-authored-by: Jacopo Bartiromo <32928804+jackbart94@users.noreply.github.com>
Co-authored-by: Praveen Kumar <35625166+pravinblaze@users.noreply.github.com>
Co-authored-by: Soumyadeep <soumyadeep.dhar@kpit.com>
Co-authored-by: joel-mb <joel.moriana@gmail.com>
Co-authored-by: Sekhar Barua <58979936+sekhar2912@users.noreply.github.com>
Co-authored-by: bernat <bernatx@gmail.com>
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-02-28 19:58:13 +01:00
Axel 7927ac6921 Some comments. 2020-02-28 12:48:50 +01:00
Axel ae27fe7f78 Code cleanup. 2020-02-28 12:48:50 +01:00
Axel 83180fe9a5 Python documentation. 2020-02-28 12:48:50 +01:00
Axel 3a27e7e5b5 Added signal parsing and queries. 2020-02-28 12:48:50 +01:00
Axel 2a7bb9e15a Removed RoadObject. Adding RoadInfoSignals. 2020-02-28 12:48:50 +01:00
Axel e9e2015674 Added Landmark class. 2020-02-28 12:48:50 +01:00
Marc Garcia Puig c64a2f24ba Removed comments 2020-02-28 11:02:45 +01:00
Marc Garcia Puig 955b753b83 Improved standalone OpenDRIVE usability 2020-02-28 11:02:45 +01:00
Marc Garcia Puig a8aa5afa0a Added basic support for the client using custom xodr on server 2020-02-28 11:02:45 +01:00
Marc Garcia Puig 2b40797c79 Added mesh generation (.obj) from standalone .xodr 2020-02-28 11:02:45 +01:00
bernatx 85619ea31e Adding Ignore Hero to Replayer (Issue 1769) 2020-02-27 10:10:21 +01:00
Denis 090a39855d
Forward header offset directly to the Array constructor (#2194)
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-02-25 13:10:29 +01:00
Axel 8005f4c32d Fix for missing elevation profile and lane offset. 2020-02-21 15:45:04 +01:00
Marc Garcia Puig aa381d05f9 Removed map_viewer 2020-02-07 17:16:48 +01:00
Marc Garcia Puig 7eda35fe80 Deleted opendrive cephes lib 2020-02-07 17:16:48 +01:00
Marc Garcia Puig 8c34a52ea7 More style fixes 2020-02-07 17:16:48 +01:00
Axel dd4e1a7733 Style fix 2020-02-07 17:16:48 +01:00
Marc Garcia Puig 744a2d47e0 Fixed style 2020-02-07 17:16:48 +01:00
Axel 3e6089a192 Fixed code format. Custom dimensions to Rtree. 2020-02-07 17:16:48 +01:00
Axel 77deb8f8a9 Fix for windows compatiility. 2020-02-07 17:16:48 +01:00
Axel 8bdf3f54d1 Fixed Python format. Removed unecessary include. 2020-02-07 17:16:48 +01:00
Axel c8c3952653 Fixed a bug in rtree generation. 2020-02-07 17:16:48 +01:00
Axel 055e8182dd More code prettrification. 2020-02-07 17:16:48 +01:00
Axel f43da77019 Added paramPoly3. Changed python map variable in map_viewer.py 2020-02-07 17:16:48 +01:00
Axel1092 446c6a57ee Added geometry paramPoly3. 2020-02-07 17:16:48 +01:00
Axel e4da746b31 Added fully poly3. 2020-02-07 17:16:48 +01:00
Axel aa78942489 Added support for nearest neighbour for all geometries. Added geometry poly3. 2020-02-07 17:16:48 +01:00
Axel ae2ae92bf1 Added spirals and splines to opendrive parser. 2020-02-07 17:16:48 +01:00
Axel 1792c68546 Adding geometry parser 2020-02-07 17:16:48 +01:00
Axel 26d44172a0 Added spiral and splines geometry classes. 2020-02-07 17:16:48 +01:00
Axel1092 49a09ff841
Axel1092/extend map api (#2380)
* Added GetPrevious function

* Added functions GetNextUntilLaneEnd and GetPreviousUntilLaneStart. Fixed GetPrevious issue.

* Added junction class.

* Added documentation for the python API. Fixed a bug regarding bounding box computation.

* Fixed formatting.

* Updated CHANGELOG.md.

* Fixed python format.

* Added GetPrevious function

* Added functions GetNextUntilLaneEnd and GetPreviousUntilLaneStart. Fixed GetPrevious issue.

* Added junction class.

* Added documentation for the python API. Fixed a bug regarding bounding box computation.

* Fixed formatting.

* Updated CHANGELOG.md.

* Fixed python format.

* Updated map API documentation

* updated mkdocs

* Prettified code.

* Removed nested carla repository

* Review fixes.

* Fixed small tab issues

* Improved code and comments.

* Small code fixes

* Small fix.

* Fixed until lane end and until lane start.

* Style fix

Co-authored-by: bernat <bernatx@gmail.com>
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
2020-02-06 16:43:23 +01:00
joel-mb 1449b1d139
Joel mb/traffic manager (#2385)
* Destroy actor when the waypoint buffer is not updated

The actor is destroyed when the buffer is not updated in a given time.

* Add elapsed time to avoid destroying multiple vehicles at the same time.

* Avoid reseting waypoint buffer when a vehicle is destroyed

* Geodesic boundaries are only computed once during collision stage

* Destroying vehicles with simulation time instead of world clock

* Fix slow down issues when destroying actors.

Avoid processing destroyed vehicles as unregistered actors.

* Remove debugging messages and code formatting.

* Remove false junctions and fix the building of segments maps

* Extend SimpleWaypoint to allow setting if it belongs to a junction

* Update TrafficManager according to new InMemoryMap

* Fix InMemoryMap links (i.e., next and previous waypoints)

* Remove check junction closest waypoint

* Refactor code InMemoryMap

* Add constant parameter stopped velocity threshold

* Fix PR

* Update CHANGELOG
2020-02-06 10:13:56 +01:00
glopezdiest 2f27cd368b
Glopez/intersection anticipation (#2355)
* Windows compatibility changes

* Windows compatibility changes pt2

* Updated docs regarding Traffic Manager

* Fixed Import folder in gitignore

* Namespaces fix

* WIP:TM modified to run synchronously with carla

* Synchronised all stages of TrafficManager
Removed redundant fps cap in BatchControl
Tuned PID values for synchronised mode

* Fix for LibCarla build error

* Fixed collision handling with unregistered actors
Fixed buffer data passed from localization stage to collision stage

* WIP:Geodesic map gridding

* WIP:Integrating geodesic griding with localization and collision stage

* Moved unregistered actor handling logic
to localization stage

Temporary patch for ignoring unregistered actors during lane change

Fixes for geodesic gridding logic

Added exception handling logic to PipelineStage class

Setting simulator back to variable time step asyncrhonous mode
in TrafficManager's destructor

* Modified PerformanceDiagnostics class
to work in synchronous execution

* Fixed incorrect overlap vehicle accumulation
Implemented geodesic grid centering logic

* WIP:Improvements to collision stage throughput

* Fixed incorrect memory handoff between stages
Modified messenger class to a blocking queue implementation

* Seg fault fixes for lane changes

* Removed logic for altering world settings from traffic manager
Fixed SnippetProfiler to work on multiple snippet
Using larger waypoint grids for pedestrian localization

* Set timeout for RPC calls to 5 seconds instead of 1 second, to get time to create Traffic Manager if needed

* Disable autopilot in server

* Fix type int to int64_t for windows compilation

* Fixing command batch autopilot

* Fix uint to uint64_t for windows

* Fix variable type and add parenthesis

* Pipeline changes + cleaning syncr changes

* Velocity dependent pedestrian bbox extension
Removed snippet profiling code from localization stage

(cherry picked from commit 4192906e655ad6f7ea48eda8e1a68ed317d67238)

* Fixing segmentation fault in AssignLaneChange

(cherry picked from commit 57da8b52bcccc359ff3dd27a10261cc724f26203)

* Fixed S.F when forcing lane changes

(cherry picked from commit db0516c8295bdc15993d9c4e1bec517a927ea33d)

* Added UnNotifyWheeledVehicle()

* Set some limits to the parameters.

* Fixed TM delete process

(cherry picked from commit cdd9178f2cbba7cbbc79b389e193517d07ba489e)

* Fixed merge error

* WIP PID Changes
Fixed FPS for PID to 20
Changes to waypoint buffer size

* Final PID + Waypoint buffer default settings.

* Junction anticipation algorithm

* WIP

* WIP: merging with carla 0.9.7

* WIP: merging with carla 0.9.7

* WIP: Intersection anticipation algorithm

* WIP: Intersection anticipation algorithm

* WIP: Intersection anticipation

* Intersection Anticipation algorithm (With debugging tools)

* Implementation of an intersection anticipation algorithm

* Changelog modified

* Removed some unused variables

* PR Changes

* More PR changes

* More minor changes

* Added some checks to detect failures

Co-authored-by: Jacopo Bartiromo <32928804+jackbart94@users.noreply.github.com>
Co-authored-by: Marc Garcia Puig <marcgpuig@gmail.com>
Co-authored-by: Praveen Kumar <35625166+pravinblaze@users.noreply.github.com>
Co-authored-by: bernat <bernatx@gmail.com>
Co-authored-by: doterop <daniel.oterop@gmail.com>
2020-02-05 20:55:53 +01:00
Marc Garcia Puig 459581b09f Exposed car lights to the client 2020-02-04 10:39:01 +01:00
bernatx b83721c6e0 Checking for negative 's' 2020-02-03 16:03:57 +01:00
bernatx c1166e205f Fixing Travis 2020-02-03 16:03:57 +01:00
bernatx 923a794bb6 Adding new way of getting waypoints from parameters from openDRIVE 2020-02-03 16:03:57 +01:00
victor.anton 2bf2b97d64 Formatted inline code 2020-02-03 09:50:54 +01:00
victor.anton 34f993a7c9 Added Contains and Get(World/Local)Vertices to BoundingBox 2020-02-03 09:50:54 +01:00
Marc Garcia Puig a41bf95afd Added more weather attributes 2020-01-20 20:53:58 +01:00
bernat b9fbbf7fd0 Release candiadate (#2310) 2019-12-21 04:59:22 +01:00
bernatx b46117685e Adding new line at end 2019-12-13 15:29:38 +01:00
bernatx c9358be60c Refreshing tm_spawn_npc script 2019-12-13 15:29:38 +01:00
Jacopo Bartiromo 6f3c4e261c Namespaces fix 2019-12-13 15:29:38 +01:00
Jacopo Bartiromo fb41af3628 Windows compatibility changes pt2 2019-12-13 15:29:38 +01:00
Jacopo Bartiromo 3c1aa7d847 Windows compatibility changes 2019-12-13 15:29:38 +01:00
dotero e9a2935a5a Fixing code formatting 2019-12-11 16:31:51 +01:00
Jacopo Bartiromo f794f939f6 Higher min_junct_lookahead for traffic lights
pylint fix
2019-12-11 16:31:51 +01:00
Jacopo Bartiromo 02f292795a Increased min lane change distance
Rename tm_demo to _tm_spawn_npc
Add walker spawn
Remove tm_set_autopilot_test
2019-12-11 16:31:51 +01:00