Skip to content

Commit 534c9e2

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent 165205c commit 534c9e2

12 files changed

Lines changed: 87 additions & 71 deletions

File tree

docs/fsm-diagrams.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,23 @@ Terminate:::terminate --> Terminate:::terminate : <i>SET_STOP_PRIMITIVE_ACTION</
298298
299299
```
300300

301+
## [ChipFSM](/src/software/ai/hl/stp/tactic/chip/chip_fsm.h)
302+
303+
```mermaid
304+
305+
stateDiagram-v2
306+
classDef terminate fill:white,color:black,font-weight:bold
307+
direction LR
308+
[*] --> GetBehindBallFSM
309+
GetBehindBallFSM --> GetBehindBallFSM : <i>updateGetBehindBall</i>
310+
GetBehindBallFSM --> ChipState
311+
ChipState --> GetBehindBallFSM : [shouldRealignWithBall]\n<i>updateGetBehindBall</i>
312+
ChipState --> ChipState : [!ballChicked]\n<i>updateChip</i>
313+
ChipState --> Terminate:::terminate : [ballChicked]\n<i>SET_STOP_PRIMITIVE_ACTION</i>
314+
Terminate:::terminate --> Terminate:::terminate : <i>SET_STOP_PRIMITIVE_ACTION</i>
315+
316+
```
317+
301318
## [CreaseDefenderFSM](/src/software/ai/hl/stp/tactic/crease_defender/crease_defender_fsm.h)
302319

303320
```mermaid

src/software/ai/hl/stp/play/free_kick/free_kick_play_fsm.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,9 @@ void FreeKickPlayFSM::passBall(const Update& event)
291291
Pass pass = best_pass_and_score_so_far.pass;
292292

293293
AutoChipOrKick auto_chip_or_kick = {AutoChipOrKickMode::AUTOKICK, pass.speed()};
294-
passer_tactic->updateControlParams(
295-
pass.passerPoint(), pass.passerOrientation(),
296-
auto_chip_or_kick);
297-
receiver_tactic->updateControlParams(pass);
294+
passer_tactic->updateControlParams(pass.passerPoint(), pass.passerOrientation(),
295+
auto_chip_or_kick);
296+
receiver_tactic->updateControlParams(pass);
298297
tactics_to_run[0].emplace_back(passer_tactic);
299298
tactics_to_run[0].emplace_back(receiver_tactic);
300299

src/software/ai/hl/stp/play/kickoff_friendly_play.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ KickoffFriendlyPlay::KickoffFriendlyPlay(
1212
{
1313
}
1414

15-
void KickoffFriendlyPlay::getNextTactics(TacticCoroutine::push_type &yield,
16-
const WorldPtr &world_ptr)
15+
void KickoffFriendlyPlay::getNextTactics(TacticCoroutine::push_type& yield,
16+
const WorldPtr& world_ptr)
1717
{
1818
// Since we only have 6 robots at the maximum, the number one priority
1919
// is the robot doing the kickoff up front. The goalie is the second most

src/software/ai/hl/stp/tactic/kick_or_chip/kick_or_chip_fsm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ KickOrChipFSM::KickOrChipFSM(std::shared_ptr<const TbotsProto::AiConfig> ai_conf
88
{
99
}
1010

11-
void KickOrChipFSM::kickOrChipBall(const Update &event)
11+
void KickOrChipFSM::kickOrChipBall(const Update& event)
1212
{
1313
Vector direction =
1414
Vector::createFromAngle(event.control_params.kick_or_chip_direction);
@@ -24,7 +24,7 @@ void KickOrChipFSM::kickOrChipBall(const Update &event)
2424
}
2525

2626
void KickOrChipFSM::updateGetBehindBall(
27-
const Update &event, boost::sml::back::process<GetBehindBallFSM::Update> processEvent)
27+
const Update& event, boost::sml::back::process<GetBehindBallFSM::Update> processEvent)
2828
{
2929
GetBehindBallFSM::ControlParams control_params{
3030
.ball_location = event.control_params.kick_or_chip_origin,
@@ -34,15 +34,15 @@ void KickOrChipFSM::updateGetBehindBall(
3434
processEvent(GetBehindBallFSM::Update(control_params, event.common));
3535
}
3636

37-
bool KickOrChipFSM::ballChicked(const Update &event)
37+
bool KickOrChipFSM::ballChicked(const Update& event)
3838
{
3939
return event.common.world_ptr->ball().hasBallBeenKicked(
4040
event.control_params.kick_or_chip_direction);
4141
}
4242

43-
bool KickOrChipFSM::shouldRealignWithBall(const Update &event)
43+
bool KickOrChipFSM::shouldRealignWithBall(const Update& event)
4444
{
45-
const Robot &robot = event.common.robot;
45+
const Robot& robot = event.common.robot;
4646

4747
// First check to see if it's too late to realign with the ball
4848
if (robot.isNearDribbler(event.control_params.kick_or_chip_origin, 0.05))

src/software/ai/hl/stp/tactic/kick_or_chip/kick_or_chip_fsm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct KickOrChipFSM : TacticFSM<KickOrChipFSM>
4040
*
4141
* @param event KickFSM::Update event
4242
*/
43-
void kickOrChipBall(const Update &event);
43+
void kickOrChipBall(const Update& event);
4444

4545
/**
4646
* Action that updates the GetBehindBallFSM

src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_fsm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const Point PenaltyKickFSM::evaluateNextShotPosition(std::optional<Robot> enemy_
121121
}
122122
}
123123

124-
void PenaltyKickFSM::shoot(const Update &event,
124+
void PenaltyKickFSM::shoot(const Update& event,
125125
boost::sml::back::process<KickOrChipFSM::Update> processEvent)
126126
{
127127
AutoChipOrKick auto_chip_or_kick = {AutoChipOrKickMode::AUTOKICK,

src/software/ai/hl/stp/tactic/penalty_kick/penalty_kick_fsm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct PenaltyKickFSM : TacticFSM<PenaltyKickFSM>
5858
* @param event PenaltyKickFSM::Update event
5959
* @param processEvent processes the KickFSM::Update
6060
*/
61-
void shoot(const Update &event,
61+
void shoot(const Update& event,
6262
boost::sml::back::process<KickOrChipFSM::Update> processEvent);
6363

6464
/**

src/software/ai/hl/stp/tactic/tactic_factory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ std::shared_ptr<Tactic> createTactic(
5959
}
6060

6161
std::shared_ptr<Tactic> createTactic(
62-
const TbotsProto::CreaseDefenderTactic &tactic_proto,
62+
const TbotsProto::CreaseDefenderTactic& tactic_proto,
6363
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr)
6464
{
6565
auto tactic = std::make_shared<CreaseDefenderTactic>(ai_config_ptr);
@@ -113,7 +113,7 @@ std::shared_ptr<Tactic> createTactic(
113113
}
114114

115115
std::shared_ptr<Tactic> createTactic(
116-
const TbotsProto::KickOrChipTactic &tactic_proto,
116+
const TbotsProto::KickOrChipTactic& tactic_proto,
117117
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr)
118118
{
119119
auto tactic = std::make_shared<KickOrChipTactic>(ai_config_ptr);

src/software/ai/hl/stp/tactic/tactic_factory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ std::shared_ptr<Tactic> createTactic(
1818
const TbotsProto::AttackerTactic& tactic_proto,
1919
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr);
2020
std::shared_ptr<Tactic> createTactic(
21-
const TbotsProto::CreaseDefenderTactic &tactic_proto,
21+
const TbotsProto::CreaseDefenderTactic& tactic_proto,
2222
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr);
2323
std::shared_ptr<Tactic> createTactic(
2424
const TbotsProto::DribbleTactic& tactic_proto,
@@ -30,7 +30,7 @@ std::shared_ptr<Tactic> createTactic(
3030
const TbotsProto::GoalieTactic& tactic_proto,
3131
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr);
3232
std::shared_ptr<Tactic> createTactic(
33-
const TbotsProto::KickOrChipTactic &tactic_proto,
33+
const TbotsProto::KickOrChipTactic& tactic_proto,
3434
std::shared_ptr<const TbotsProto::AiConfig> ai_config_ptr);
3535
std::shared_ptr<Tactic> createTactic(
3636
const TbotsProto::MoveGoalieToGoalLineTactic& tactic_proto,

src/software/ai/hl/stp/tactic/tactic_visitor.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,29 @@ class TacticVisitor
4646
* @param tactic The tactic to visit
4747
*/
4848

49-
virtual void visit(const CreaseDefenderTactic &tactic) = 0;
50-
virtual void visit(const DefenseShadowEnemyTactic &tactic) = 0;
51-
virtual void visit(const DribbleTactic &tactic) = 0;
52-
virtual void visit(const GetBehindBallTactic &tactic) = 0;
53-
virtual void visit(const GoalieTactic &tactic) = 0;
54-
virtual void visit(const GoalieTestTactic &tactic) = 0;
55-
virtual void visit(const KickoffChipTactic &tactic) = 0;
56-
virtual void visit(const MoveTactic &tactic) = 0;
57-
virtual void visit(const MoveTestTactic &tactic) = 0;
58-
virtual void visit(const AttackerTactic &tactic) = 0;
59-
virtual void visit(const PassDefenderTactic &tactic) = 0;
60-
virtual void visit(const PenaltyKickTactic &tactic) = 0;
61-
virtual void visit(const PenaltySetupTactic &tactic) = 0;
62-
virtual void visit(const PivotKickTactic &tactic) = 0;
63-
virtual void visit(const ReceiverTactic &tactic) = 0;
64-
virtual void visit(const ShadowEnemyTactic &tactic) = 0;
65-
virtual void visit(const HaltTactic &tactic) = 0;
66-
virtual void visit(const StopTestTactic &tactic) = 0;
67-
virtual void visit(const MoveGoalieToGoalLineTactic &tactic) = 0;
68-
virtual void visit(const PrepareKickoffMoveTactic &tactic) = 0;
69-
virtual void visit(const PlaceBallTactic &tactic) = 0;
70-
virtual void visit(const PlaceBallMoveTactic &tactic) = 0;
71-
virtual void visit(const WallKickoffTactic &tactic) = 0;
72-
virtual void visit(const AvoidInterferenceTactic &tactic) = 0;
73-
virtual void visit(const KickOrChipTactic &tactic) = 0;
49+
virtual void visit(const CreaseDefenderTactic& tactic) = 0;
50+
virtual void visit(const DefenseShadowEnemyTactic& tactic) = 0;
51+
virtual void visit(const DribbleTactic& tactic) = 0;
52+
virtual void visit(const GetBehindBallTactic& tactic) = 0;
53+
virtual void visit(const GoalieTactic& tactic) = 0;
54+
virtual void visit(const GoalieTestTactic& tactic) = 0;
55+
virtual void visit(const KickoffChipTactic& tactic) = 0;
56+
virtual void visit(const MoveTactic& tactic) = 0;
57+
virtual void visit(const MoveTestTactic& tactic) = 0;
58+
virtual void visit(const AttackerTactic& tactic) = 0;
59+
virtual void visit(const PassDefenderTactic& tactic) = 0;
60+
virtual void visit(const PenaltyKickTactic& tactic) = 0;
61+
virtual void visit(const PenaltySetupTactic& tactic) = 0;
62+
virtual void visit(const PivotKickTactic& tactic) = 0;
63+
virtual void visit(const ReceiverTactic& tactic) = 0;
64+
virtual void visit(const ShadowEnemyTactic& tactic) = 0;
65+
virtual void visit(const HaltTactic& tactic) = 0;
66+
virtual void visit(const StopTestTactic& tactic) = 0;
67+
virtual void visit(const MoveGoalieToGoalLineTactic& tactic) = 0;
68+
virtual void visit(const PrepareKickoffMoveTactic& tactic) = 0;
69+
virtual void visit(const PlaceBallTactic& tactic) = 0;
70+
virtual void visit(const PlaceBallMoveTactic& tactic) = 0;
71+
virtual void visit(const WallKickoffTactic& tactic) = 0;
72+
virtual void visit(const AvoidInterferenceTactic& tactic) = 0;
73+
virtual void visit(const KickOrChipTactic& tactic) = 0;
7474
};

0 commit comments

Comments
 (0)