Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Path tracer improvements #565

Merged
merged 1 commit into from
Sep 16, 2020
Merged

Path tracer improvements #565

merged 1 commit into from
Sep 16, 2020

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Aug 20, 2020

Support older log files, which may not have an events.yml .

Also fix a bug in the events.yml file which looks like:

- event:
  type: finished
  time_sec: 317
  elapsed_real_time 589
  elapsed_sim_time 205
  total_score: 1

Note the missing colons after elapsed_real_time and elapsed_sim_time.

Signed-off-by: Nate Koenig [email protected]

@mjcarroll mjcarroll self-assigned this Aug 24, 2020
@mjcarroll mjcarroll self-requested a review August 24, 2020 20:07
@mjcarroll mjcarroll removed their assignment Aug 24, 2020
@acschang acschang self-requested a review September 16, 2020 15:29
Copy link
Contributor

@acschang acschang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This update allowed for a successful run on a log file without an accompanying events.yml file. I did not test for the formatting errors in the events.yml file.

@nkoenig nkoenig requested a review from iche033 September 16, 2020 16:40
Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works for me. Tested with missing events.yml and one with bad syntax - the file now loads with the changes in this PR.

@nkoenig nkoenig merged commit 9b15caf into citadel Sep 16, 2020
@nkoenig nkoenig deleted the pathtracer_no_events branch December 10, 2020 22:31
nkoenig added a commit that referenced this pull request Dec 17, 2020
* bump to citadel, update comms visualization

* Adding breadcrumbs to x1 config 7 & 8

* Added additional breadcrumbs

* Update to citadel

* Prevent breadcrumb topics

* Added breadcrumb handling to more launch files

* Apply patch

* Adjust spawn location of the breadcrumbs

* Update cave_circuit.ign to call the corect spawner method (#409)

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Add disable_physics_time param to breadcrumb plugin to auto disable them

Signed-off-by: Ian Chen <[email protected]>

* Adding team base

* One team base only

* Cleanup after move from bitbucket

* Cleanup

* Remove extra whitespace

* Use https for git

* Cave Qual release

* Update Citadel and Urban Circuit

* Update Citadel and Urban Circuit

* bump to citadel, update comms visualization

* Update to citadel

* bump to citadel, update comms visualization

* Cleanup after rebase

* Updates based on review

* Missed one pose publisher

* one more RawPose

Signed-off-by: Ian Chen <[email protected]>

* Minor cmake tweaks

Signed-off-by: Nate Koenig <[email protected]>

* Change colors for comms visualization.

Signed-off-by: Nate Koenig <[email protected]>

* Fix docs

Signed-off-by: Nate Koenig <[email protected]>

* Azeey/marsupial (#424)

* Add marsupial robots for cave_circuit

* Update example command

* Apply spawnWorldYaw to marsupial offsets

* Add marsupial vehicle support to cloudsim

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Update cloudsim_bridge and json2docker

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Suppress DetachableJoint missing child warning

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Added platform

Signed-off-by: Nate Koenig <[email protected]>

* Fix platform position

Signed-off-by: Nate Koenig <[email protected]>

* Combined spawn

Signed-off-by: Nate Koenig <[email protected]>

* Update submitted models

Signed-off-by: Nate Koenig <[email protected]>

* Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Add missing changes from PRs #402 and #403

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Adjust platform height

Signed-off-by: Nate Koenig <[email protected]>

* Fix deprecation

Signed-off-by: Nate Koenig <[email protected]>

* Fix build

Signed-off-by: Nate Koenig <[email protected]>

* Update to visibility RF model (#440)

* Testing.

* Remove debug code.

* Update to visibility RF model to account for radio characteristics and message size.

* Updated the static number of bytes in a message for communication visualization from 5 to 100.

Co-authored-by: Carlos Aguero <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* citadel dockerfiles

Signed-off-by: Nate Koenig <[email protected]>

* Merged with master

Signed-off-by: Nate Koenig <[email protected]>

* Fix dependencies

Signed-off-by: Nate Koenig <[email protected]>

* Download models

Signed-off-by: Nate Koenig <[email protected]>

* Path tracer (#545)

* Added a path tracer program that visualizes robot paths, artifacts, and artifact reports.

Signed-off-by: Nate Koenig <[email protected]>

* Added path tracer files

Signed-off-by: Nate Koenig <[email protected]>

* Cleanup build and address comments

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Break out model download into separate docker image.

Signed-off-by: Nate Koenig <[email protected]>

* Cleanup

Signed-off-by: Nate Koenig <[email protected]>

* Update docker image name

Signed-off-by: Nate Koenig <[email protected]>

* Updating docker

Signed-off-by: Nate Koenig <[email protected]>

* Fixed merge

Signed-off-by: Nate Koenig <[email protected]>

* Handle log files with no events.yml file, and also handle an error case in events.yml (#565)

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Path tracer rtf (#596)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <[email protected]>

* Added more output

Signed-off-by: Nate Koenig <[email protected]>

* Account for time required to process the step

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Path tracer colors (#599)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <[email protected]>

* Start of path tracer color yaml configuration

Signed-off-by: Nate Koenig <[email protected]>

* Support yaml configuration for colors and rtf

Signed-off-by: Nate Koenig <[email protected]>

* Update to use DRY suggestion

Signed-off-by: Nate Koenig <[email protected]>

* Update subt_ign/src/path_tracer.cc

Co-authored-by: Michael Carroll <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>

* Merge from master (#621)

Signed-off-by: Carlos Agüero <[email protected]>

* Missing include

Signed-off-by: Nate Koenig <[email protected]>

* Merged with master

Signed-off-by: Nate Koenig <[email protected]>

* Disable truth_controller

* Update to use Ignition Dome

Signed-off-by: Nate Koenig <[email protected]>

* Updating dockerfiles

Signed-off-by: Nate Koenig <[email protected]>

* Updating subt_sim_entry dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Updating model download

Signed-off-by: Nate Koenig <[email protected]>

* Update dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Update dockefile

Signed-off-by: Nate Koenig <[email protected]>

* Update subt_sim_entry

Signed-off-by: Nate Koenig <[email protected]>

* Update docker

Signed-off-by: Nate Koenig <[email protected]>

* Fixing docker

Signed-off-by: Nate Koenig <[email protected]>

* Improve git clone

Signed-off-by: Nate Koenig <[email protected]>

* Add back in ros_ign bridge to cloudsim_sim dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Update all urban .dat files. (#721)

Signed-off-by: Carlos Agüero <[email protected]>

* Update all tunnel .dat files. (#723)

Signed-off-by: Carlos Agüero <[email protected]>

* Update dockerfiles

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Addisu Taddese <[email protected]>
Co-authored-by: acschang <[email protected]>
Co-authored-by: Carlos Aguero <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
nkoenig added a commit that referenced this pull request Jan 5, 2021
* bump to citadel, update comms visualization

* Adding breadcrumbs to x1 config 7 & 8

* Added additional breadcrumbs

* Update to citadel

* Prevent breadcrumb topics

* Added breadcrumb handling to more launch files

* Apply patch

* Adjust spawn location of the breadcrumbs

* Update cave_circuit.ign to call the corect spawner method (#409)

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Add disable_physics_time param to breadcrumb plugin to auto disable them

Signed-off-by: Ian Chen <[email protected]>

* Adding team base

* One team base only

* Cleanup after move from bitbucket

* Cleanup

* Remove extra whitespace

* Use https for git

* Cave Qual release

* Update Citadel and Urban Circuit

* Update Citadel and Urban Circuit

* bump to citadel, update comms visualization

* Update to citadel

* bump to citadel, update comms visualization

* Cleanup after rebase

* Updates based on review

* Missed one pose publisher

* one more RawPose

Signed-off-by: Ian Chen <[email protected]>

* Minor cmake tweaks

Signed-off-by: Nate Koenig <[email protected]>

* Change colors for comms visualization.

Signed-off-by: Nate Koenig <[email protected]>

* Fix docs

Signed-off-by: Nate Koenig <[email protected]>

* Azeey/marsupial (#424)

* Add marsupial robots for cave_circuit

* Update example command

* Apply spawnWorldYaw to marsupial offsets

* Add marsupial vehicle support to cloudsim

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Update cloudsim_bridge and json2docker

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Suppress DetachableJoint missing child warning

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Added platform

Signed-off-by: Nate Koenig <[email protected]>

* Fix platform position

Signed-off-by: Nate Koenig <[email protected]>

* Combined spawn

Signed-off-by: Nate Koenig <[email protected]>

* Update submitted models

Signed-off-by: Nate Koenig <[email protected]>

* Merge cave_circuit.ign to urban_circuit.ign, tunnel_circuit_practice.ign, and competition.ign

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Add missing changes from PRs #402 and #403

Signed-off-by: Addisu Z. Taddese <[email protected]>

* Adjust platform height

Signed-off-by: Nate Koenig <[email protected]>

* Fix deprecation

Signed-off-by: Nate Koenig <[email protected]>

* Fix build

Signed-off-by: Nate Koenig <[email protected]>

* Update to visibility RF model (#440)

* Testing.

* Remove debug code.

* Update to visibility RF model to account for radio characteristics and message size.

* Updated the static number of bytes in a message for communication visualization from 5 to 100.

Co-authored-by: Carlos Aguero <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* citadel dockerfiles

Signed-off-by: Nate Koenig <[email protected]>

* Merged with master

Signed-off-by: Nate Koenig <[email protected]>

* Fix dependencies

Signed-off-by: Nate Koenig <[email protected]>

* Download models

Signed-off-by: Nate Koenig <[email protected]>

* Path tracer (#545)

* Added a path tracer program that visualizes robot paths, artifacts, and artifact reports.

Signed-off-by: Nate Koenig <[email protected]>

* Added path tracer files

Signed-off-by: Nate Koenig <[email protected]>

* Cleanup build and address comments

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Break out model download into separate docker image.

Signed-off-by: Nate Koenig <[email protected]>

* Cleanup

Signed-off-by: Nate Koenig <[email protected]>

* Update docker image name

Signed-off-by: Nate Koenig <[email protected]>

* Updating docker

Signed-off-by: Nate Koenig <[email protected]>

* Fixed merge

Signed-off-by: Nate Koenig <[email protected]>

* Handle log files with no events.yml file, and also handle an error case in events.yml (#565)

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Path tracer rtf (#596)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <[email protected]>

* Added more output

Signed-off-by: Nate Koenig <[email protected]>

* Account for time required to process the step

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Path tracer colors (#599)

* Modify path tracer to use an RTF value

Signed-off-by: Nate Koenig <[email protected]>

* Start of path tracer color yaml configuration

Signed-off-by: Nate Koenig <[email protected]>

* Support yaml configuration for colors and rtf

Signed-off-by: Nate Koenig <[email protected]>

* Update to use DRY suggestion

Signed-off-by: Nate Koenig <[email protected]>

* Update subt_ign/src/path_tracer.cc

Co-authored-by: Michael Carroll <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>

* Merge from master (#621)

Signed-off-by: Carlos Agüero <[email protected]>

* Missing include

Signed-off-by: Nate Koenig <[email protected]>

* Merged with master

Signed-off-by: Nate Koenig <[email protected]>

* Disable truth_controller

* Update to use Ignition Dome

Signed-off-by: Nate Koenig <[email protected]>

* Updating dockerfiles

Signed-off-by: Nate Koenig <[email protected]>

* Updating subt_sim_entry dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Updating model download

Signed-off-by: Nate Koenig <[email protected]>

* Update dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Update dockefile

Signed-off-by: Nate Koenig <[email protected]>

* Update subt_sim_entry

Signed-off-by: Nate Koenig <[email protected]>

* Update docker

Signed-off-by: Nate Koenig <[email protected]>

* Fixing docker

Signed-off-by: Nate Koenig <[email protected]>

* Improve git clone

Signed-off-by: Nate Koenig <[email protected]>

* Add back in ros_ign bridge to cloudsim_sim dockerfile

Signed-off-by: Nate Koenig <[email protected]>

* Tunnel connection points

Signed-off-by: Nate Koenig <[email protected]>

* added subt_tunnel_staging_area

Signed-off-by: Nate Koenig <[email protected]>

* Fixed connection points

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Addisu Taddese <[email protected]>
Co-authored-by: acschang <[email protected]>
Co-authored-by: Carlos Aguero <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants