Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

[ready] Negotiation messages and callbacks #140

Merged
merged 36 commits into from
Aug 20, 2020
Merged

[ready] Negotiation messages and callbacks #140

merged 36 commits into from
Aug 20, 2020

Conversation

ddengster
Copy link
Contributor

@ddengster ddengster commented Jul 24, 2020 •
edited
Loading

  • Callbacks (StatusUpdateCallback, StatusConclusionCallback) for negotiation status updates and conclusions have been added

  • Table::Views now have reject and forfeit flags

@mxgrey mxgrey added this to the 1.1.0 milestone Jul 27, 2020
@ddengster ddengster force-pushed the feature/negotiation_visualizer branch from 72be592 to 40c2430 Compare July 28, 2020 07:59
@ddengster ddengster changed the title [wip] Feature/negotiation visualizer Negotiation messages Aug 5, 2020
@ddengster ddengster changed the title Negotiation messages [Ready] Negotiation messages Aug 5, 2020
@ddengster ddengster changed the title [Ready] Negotiation messages [Ready] Negotiation messages and callbacks Aug 5, 2020
@ddengster ddengster marked this pull request as ready for review August 5, 2020 02:39
@ddengster ddengster requested a review from mxgrey August 5, 2020 03:03
@ddengster ddengster changed the title [Ready] Negotiation messages and callbacks [wip] Negotiation messages and callbacks Aug 12, 2020
@ddengster
add negotiation status messages
45c644f
@ddengster
add negotiation status publisher
4ea0a22
@ddengster
fix error printout
cc7f048
@ddengster
add defunct boolean and itinerary proposals to negotiation status
9583183
@ddengster
cleanup
80cf7ba
@ddengster
more cleanup + comments
7474ac4
@ddengster
fix messages for romi consumption, update status to use bitwise flags
26eb5de
@ddengster
changed negotiation status topic name so that soss works
0d591d7
@ddengster
remove publishing negotiation status from schedule node
f41d7df
@ddengster
negotiation status now only sends root and terminal nodes
d2a4cc1 
add participant names to status msg
@ddengster
removed publishing status from rmf_traffic_ros2::schedule::Negotiation
28e48c2
@ddengster
remove unneeded children member
d6f23d8
@ddengster
add status callback
79f1dc5
@ddengster
fix rebase include error
76448a4
@ddengster
add negotiation status conclusion message
32da808
@ddengster
add reject/forfeit for table viewer
254776f
@ddengster
add callbacks for updating negotiation status and negotiation conclus…
55e71c0 
…ions
@ddengster
remove NegotiationStatusTable.msg, cleanup
271efe4
@ddengster
remove NegotiationStatusTable #2
6d09958
@ddengster
remove negotiation publishing from schedulenode
763c03f
@ddengster
remove negotiation status publishing #2
91a8c5f
@ddengster
typo fix
95d1e17
@ddengster ddengster force-pushed the feature/negotiation_visualizer branch from c65e162 to 693d9b2 Compare August 14, 2020 03:21
@ddengster ddengster changed the title [wip] Negotiation messages and callbacks [readu] Negotiation messages and callbacks Aug 14, 2020
@ddengster ddengster changed the title [readu] Negotiation messages and callbacks [ready] Negotiation messages and callbacks Aug 14, 2020
mxgrey
mxgrey suggested changes Aug 19, 2020
View reviewed changes
Copy link
Member

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

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

There are some extremely valuable new features in this PR, but there are a few implementation issues that need to be resolved before we can merge. Details are given below.

rmf_traffic/include/rmf_traffic/schedule/Negotiation.hpp Show resolved Hide resolved
rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Show resolved Hide resolved
rmf_traffic_ros2/include/rmf_traffic_ros2/schedule/Negotiation.hpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
mxgrey
mxgrey suggested changes Aug 20, 2020
View reviewed changes
Copy link
Member

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

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

This is looking really great!

There are just a few loose threads left to tie up.

rmf_traffic/src/rmf_traffic/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/include/rmf_traffic_ros2/schedule/Negotiation.hpp Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
rmf_traffic_ros2/src/rmf_traffic_ros2/schedule/Negotiation.cpp Outdated Show resolved Hide resolved
@ddengster ddengster requested a review from mxgrey August 20, 2020 07:13
mxgrey
mxgrey approved these changes Aug 20, 2020
View reviewed changes
Copy link
Member

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

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

Thanks for adding this feature!

@mxgrey mxgrey merged commit 873cc2e into master Aug 20, 2020
@mxgrey mxgrey deleted the feature/negotiation_visualizer branch August 20, 2020 07:45
@ddengster ddengster mentioned this pull request Aug 26, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mxgrey mxgrey mxgrey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ddengster @mxgrey