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

Tune Pass Speed with Pass Distance #2918

Merged
Merged
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
021d61d
added pass speed cost function
sauravbanna May 13, 2023
1657a93
testing
sauravbanna May 17, 2023
3f9dc79
testing
sauravbanna May 18, 2023
1c08c7d
test
sauravbanna May 20, 2023
4f21d2e
test
sauravbanna May 20, 2023
b59eb7d
testing
sauravbanna May 20, 2023
ae4adab
testing
sauravbanna May 22, 2023
f40af89
testing
sauravbanna May 26, 2023
d482e6b
test
sauravbanna May 26, 2023
6f34861
fix
sauravbanna May 27, 2023
9010163
fixed cost function
sauravbanna May 27, 2023
84c3a4f
formatting
sauravbanna May 27, 2023
ebbeb5e
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna May 27, 2023
c5e34df
fix
sauravbanna May 27, 2023
b34e972
test
sauravbanna May 27, 2023
5021ade
test
sauravbanna May 28, 2023
a9725ec
test
sauravbanna Jun 3, 2023
fd34328
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Jun 3, 2023
023d854
fix tests
sauravbanna Jun 3, 2023
c72e46c
formatting + docs
sauravbanna Jun 3, 2023
044e7a2
formatting + docs
sauravbanna Jun 3, 2023
a8bd1c1
test
sauravbanna Jun 12, 2023
babac45
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Jun 12, 2023
ff36d13
test
sauravbanna Jun 13, 2023
5cc2e7f
added tests for backward passes
sauravbanna Jun 16, 2023
4a15972
uncomment + formatting
sauravbanna Jun 16, 2023
0ca8c80
docs
sauravbanna Jun 16, 2023
3327f89
fix
sauravbanna Jun 16, 2023
5893fe8
added new field tets for passing
sauravbanna Jun 17, 2023
ff478bf
fix
sauravbanna Jun 17, 2023
80e07c2
fixed tests
sauravbanna Jun 18, 2023
e3dfe1d
fix
sauravbanna Jun 24, 2023
d97fe64
fix
sauravbanna Jun 24, 2023
00e1e55
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Jun 24, 2023
b473d69
fix tests
sauravbanna Jun 24, 2023
d02f173
fix?
sauravbanna Jun 24, 2023
0ccf164
fix?
sauravbanna Jun 24, 2023
ad6ff93
fix tests
sauravbanna Jun 29, 2023
45771d3
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Oct 14, 2023
37d3785
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Nov 19, 2023
629a936
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Feb 3, 2024
3844cb2
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Feb 3, 2024
77d2354
implemented new pass changes
sauravbanna Feb 3, 2024
6954b80
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Feb 3, 2024
62dda73
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna Feb 3, 2024
7df5317
fix
sauravbanna Feb 3, 2024
03d8344
removed unecessary changes
sauravbanna Feb 4, 2024
fbb2563
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Feb 4, 2024
ee2b01b
formatting
sauravbanna Feb 4, 2024
b14e6c6
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Feb 10, 2024
6e99bc1
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna Feb 10, 2024
de6aaa2
fix types
sauravbanna Feb 10, 2024
0c3c936
fix
sauravbanna Feb 11, 2024
423c981
testing changes
sauravbanna Feb 11, 2024
a1f5fcc
fix
sauravbanna Feb 11, 2024
67d5c57
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Feb 11, 2024
c2c1a22
removed unecessary changes
sauravbanna Feb 11, 2024
7b127db
fix
sauravbanna Feb 14, 2024
55fb728
Revert "fix"
sauravbanna Feb 14, 2024
dba41a4
merge
sauravbanna Feb 14, 2024
7cffa2c
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Feb 14, 2024
de1b49a
formatting
sauravbanna Feb 14, 2024
7ad435b
Merge branch 'saurav_banna/pass_speed_cost' of
sauravbanna Feb 14, 2024
ea5d942
fix bug
sauravbanna Feb 14, 2024
716e001
fix
sauravbanna Feb 17, 2024
38f0ee6
bug
sauravbanna Feb 17, 2024
17c02ae
merge
sauravbanna Mar 10, 2024
c5ffe99
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 10, 2024
88ce00f
fix tests
sauravbanna Mar 14, 2024
283a02a
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna Mar 14, 2024
608f743
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Mar 14, 2024
482a18d
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 14, 2024
5862749
merge
sauravbanna Mar 15, 2024
bdcccc1
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna Mar 15, 2024
96672f0
fix build
sauravbanna Mar 15, 2024
62fa115
test
sauravbanna Mar 16, 2024
0e35e7e
fix
sauravbanna Mar 16, 2024
732d579
fix
sauravbanna Mar 20, 2024
94fd82b
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna Mar 20, 2024
29144df
merge
sauravbanna Mar 23, 2024
43ee59a
address comments
sauravbanna Mar 23, 2024
e26305a
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 23, 2024
f84b0bd
merge + fix
sauravbanna Mar 30, 2024
b4354db
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna Mar 30, 2024
4b68c6d
fix
sauravbanna Mar 30, 2024
e009c65
fix
sauravbanna Mar 30, 2024
8ec3a81
fix comments
sauravbanna Apr 6, 2024
186c564
fix
sauravbanna May 4, 2024
9b6a39d
fix bounds
sauravbanna May 4, 2024
2a38293
Merge branch 'master' of github.com:UBC-Thunderbots/Software into sau…
sauravbanna May 11, 2024
2ea63fa
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] May 11, 2024
0032638
fix test issues
sauravbanna May 11, 2024
f3d59aa
Merge branch 'saurav_banna/pass_speed_cost' of github.com:sauravbanna…
sauravbanna May 11, 2024
9357893
move tests
sauravbanna May 11, 2024
3acee00
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] May 11, 2024
6f7cffd
fix nit
sauravbanna May 25, 2024
34d9e5b
fix semicolons
sauravbanna May 25, 2024
decf751
fix tests
sauravbanna May 25, 2024
e65f394
make validation stricter
sauravbanna May 25, 2024
904d9a5
fix names
sauravbanna May 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/extlibs/er_force_sim/src/amun/simulator/simrobot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -424,12 +424,17 @@ void SimRobot::begin(SimBall *ball, double time)
{
// we subtract the current speed of the ball from the intended kick speed
// this ensures the ball leaves the robot at exactly the speed we want
power = qBound(0.05f,
ball->speed().length() < kickSpeedBoundThreshold
? m_sslCommand.kick_speed() -
(ball->speed().length() / SIMULATOR_SCALE)
: m_sslCommand.kick_speed(),
m_specs.shot_linear_max());
float lowerBound = 0.0f;
if (ball->speed().length() < kickSpeedBoundThreshold)
{
lowerBound =
m_sslCommand.kick_speed() - (ball->speed().length() / SIMULATOR_SCALE)
}
else
{
lowerBound = m_sslCommand.kick_speed()
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (ball->speed().length() < kickSpeedBoundThreshold)
{
lowerBound =
m_sslCommand.kick_speed() - (ball->speed().length() / SIMULATOR_SCALE)
}
else
{
lowerBound = m_sslCommand.kick_speed()
}
if (ball->speed().length() < kickSpeedBoundThreshold)
{
lowerBound =
m_sslCommand.kick_speed() - (ball->speed().length() / SIMULATOR_SCALE);
}
else
{
lowerBound = m_sslCommand.kick_speed();
}

power = qBound(0.05f, lowerBound, m_specs.shot_linear_max());
}
else
{
Expand Down
Loading