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.

Sign up for GitHub

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

Fix bug #1 #528

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix bug #1 #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e447e8
Merge pull request #1 from gtri/master
kemen209 Jun 20, 2019
8e8a9be
Merge branch 'master' of https://github.com/gtri/scrimmage
kemen209 Jun 10, 2021
b6da5aa
use stoi for type int of motion_multiplier_
kemen209 Jun 10, 2021
19907cf
Merge branch 'master' of https://github.com/gtri/scrimmage
kemen209 Aug 24, 2021
227c247
Merge branch 'master' into fix-bug-#1
kemen209 Oct 8, 2021
85ee2b2
change API motion_multiplier to be return int
kemen209 Oct 8, 2021
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
2 changes: 1 addition & 1 deletion include/scrimmage/parse/MissionParse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MissionParse {
double t0();
double tend();
double dt();
double motion_multiplier();
int motion_multiplier();
double time_warp();
void set_time_warp(double warp);
bool start_paused();
Expand Down
2 changes: 1 addition & 1 deletion missions/uuv-ex1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name="Straight flying">

<run start="0.0" end="1000" dt="0.1"
motion_multiplier="12.5"
motion_multiplier="12"
time_warp="20"
enable_gui="true"
network_gui="false"
Expand Down
4 changes: 2 additions & 2 deletions src/parse/MissionParse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ bool MissionParse::parse(const std::string &filename) {
} else if (attr_str == "dt") {
dt_ = std::stod(attr->value());
} else if (attr_str == "motion_multiplier") {
motion_multiplier_ = std::stod(attr->value());
motion_multiplier_ = std::stoi(attr->value());
} else if (attr_str == "time_warp") {
time_warp_ = std::stod(attr->value());
} else if (attr_str == "enable_gui") {
Expand Down Expand Up @@ -783,7 +783,7 @@ double MissionParse::dt() { return dt_; }

void MissionParse::set_dt(const double& dt) { dt_ = dt; }

double MissionParse::motion_multiplier() { return motion_multiplier_; }
int MissionParse::motion_multiplier() { return motion_multiplier_; }

double MissionParse::time_warp() { return time_warp_; }

Expand Down