-
Notifications
You must be signed in to change notification settings - Fork 22
team_com disallowed robots to send messages if not intended, and reduces the rate if we get close to the budget end #870
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
Open
MegaIng
wants to merge
14
commits into
main
Choose a base branch
from
team_com-message_budget-emergency-stop
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3b16541
team_com disallowed robots to send messages if not intended, and redu…
cleWu03 614b005
zwischenstand behavior integration
cleWu03 ccdafa8
zwischenstand 2.0
cleWu03 db26bed
corrected version of team_com.py
cleWu03 32c7f1d
check for limit in Proto mesage size before sending
cleWu03 793f1cd
corrected reduce rate in config
cleWu03 0c0e384
apply behaviour changes in DSD and depending decisions to continue pl…
cleWu03 dc7af9b
handle returning robots when penalty ends after team com limit
cleWu03 962273e
Merge branch 'main' into team_com-message_budget-emergency-stop
jaagut 6071a91
Fix typo in gamestate references across decision classes
jaagut 0b5294e
Address PR review feedback for team comm and behavior fallback
Copilot b90edc8
Refine team comm rate helper constants naming
Copilot 0eccd8d
Polish team comm helper comments
Copilot c1b6f50
improvements based on copilot feedback, dsd without #NormalBehavior A…
cleWu03 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...ts_body_behavior/bitbots_body_behavior/behavior_dsd/decisions/number_penalized_players.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| from bitbots_blackboard.body_blackboard import BodyBlackboard | ||
| from dynamic_stack_decider.abstract_decision_element import AbstractDecisionElement | ||
|
|
||
|
|
||
| class NumberPenalizedTeamMates(AbstractDecisionElement): | ||
| blackboard: BodyBlackboard | ||
|
|
||
| def __init__(self, blackboard, dsd, parameters): | ||
| super().__init__(blackboard, dsd, parameters) | ||
|
|
||
| def perform(self, reevaluate=False): | ||
| """ | ||
| Return number of penalized team mates | ||
| :param reevaluate: | ||
| :return: | ||
| """ | ||
| game_state_penalized_team_mates = self.blackboard.gamestate.get_penalized_team_mates() | ||
|
|
||
| if game_state_penalized_team_mates == 4: | ||
| return "FOUR" | ||
| elif game_state_penalized_team_mates == 3: | ||
| return "THREE" | ||
| elif game_state_penalized_team_mates == 2: | ||
| return "TWO" | ||
| elif game_state_penalized_team_mates == 1: | ||
| return "ONE" | ||
| else: | ||
| return "ZERO" | ||
|
|
||
| def get_reevaluate(self): | ||
| """ | ||
| Game state can change during the game | ||
| """ | ||
| return True | ||
|
|
||
| class NumberPenalizedRivals(AbstractDecisionElement): | ||
| blackboard: BodyBlackboard | ||
|
|
||
| def __init__(self, blackboard, dsd, parameters): | ||
| super().__init__(blackboard, dsd, parameters) | ||
|
|
||
| def perform(self, reevaluate=False): | ||
| """ | ||
| Return number of penalized rivals | ||
| :param reevaluate: | ||
| :return: | ||
| """ | ||
| game_state_penalized_rivals = self.blackboard.gamestate.get_penalized_rivals() | ||
|
|
||
| if game_state_penalized_rivals == 4: | ||
| return "FOUR" | ||
| elif game_state_penalized_rivals == 3: | ||
| return "THREE" | ||
| elif game_state_penalized_rivals == 2: | ||
| return "TWO" | ||
| elif game_state_penalized_rivals == 1: | ||
| return "ONE" | ||
| else: | ||
| return "ZERO" | ||
|
|
||
| def get_reevaluate(self): | ||
| """ | ||
| Game state can change during the game | ||
| """ | ||
| return True |
18 changes: 18 additions & 0 deletions
18
...bots_body_behavior/bitbots_body_behavior/behavior_dsd/decisions/team_com_limit_reached.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| from bitbots_blackboard.body_blackboard import BodyBlackboard | ||
| from dynamic_stack_decider.abstract_decision_element import AbstractDecisionElement | ||
|
|
||
|
|
||
| class TeamComLimitReached(AbstractDecisionElement): | ||
| blackboard: BodyBlackboard | ||
|
|
||
| def __init__(self, blackboard, dsd, parameters): | ||
| super().__init__(blackboard, dsd, parameters) | ||
|
|
||
| def perform(self, reevaluate=False): | ||
| if self.blackboard.gamestate.get_team_com_limit_has_reached(): | ||
| return "YES" | ||
| else: | ||
| return "NO" | ||
|
|
||
| def get_reevaluate(self): | ||
| return True |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,11 +76,13 @@ $GoalieActive | |
| NO --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @GoToBlockPosition | ||
|
|
||
| #SupporterRole | ||
| $PassStarted | ||
| YES --> $BallSeen | ||
| YES --> @TrackBall, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassAcceptPosition | ||
| NO --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassAcceptPosition | ||
| NO --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassPreparePosition | ||
| $TeamComLimitReached | ||
| YES --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassPreparePosition | ||
| NO --> $PassStarted | ||
| YES --> $BallSeen | ||
| YES --> @TrackBall, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassAcceptPosition | ||
| NO --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassAcceptPosition | ||
| NO --> @LookAtFieldFeatures, @ChangeAction + action:positioning, @AvoidBallActive, @GoToPassPreparePosition | ||
|
|
||
| #PenaltyShootoutBehavior | ||
| $SecondaryStateTeamDecider | ||
|
|
@@ -120,14 +122,23 @@ $BallSeen | |
| NO_FREEKICK --> #Placing | ||
| YES --> $ConfigRole | ||
| GOALIE --> #GoalieBehavior | ||
| ELSE --> $CountActiveRobotsWithoutGoalie | ||
| ONE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #DefensePositioning | ||
| ELSE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #SupporterRole | ||
| THIRD --> #DefensePositioning | ||
| ELSE --> $TeamComLimitReached //this decision is only for better visualization in rqt | ||
| NO --> $CountActiveRobotsWithoutGoalie | ||
| ONE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #DefensePositioning | ||
| ELSE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #SupporterRole | ||
| THIRD --> #DefensePositioning | ||
| YES --> $CountActiveRobotsWithoutGoalie | ||
| ONE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #DefensePositioning | ||
| ELSE --> $RankToBallNoGoalie | ||
| FIRST --> #StrikerRole | ||
| SECOND --> #SupporterRole | ||
| THIRD --> #DefensePositioning | ||
|
|
||
| #PlayingBehavior | ||
| $SecondaryStateDecider | ||
|
|
@@ -145,6 +156,7 @@ $IsPenalized | |
| JUST_UNPENALIZED --> $GameStateDecider | ||
| INITIAL --> #Init | ||
| ELSE --> #GetWalkreadyAndLocalize | ||
| UNPENALIZED_AFTER_TEAM_COM_LIMIT --> #DoNothing | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the thinking here? Why are we passive after being unpenalized? Is there a possibility this hits every team robot at the same time frame and thus disables the whole team while still being allowed to play? |
||
| NO --> $GameStateDecider | ||
| INITIAL --> #Init | ||
| READY --> $AnyGoalScoreRecently + time:50 | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.