From b6da5aaf0864f345e99b5210dfd6d8ea9bc9a046 Mon Sep 17 00:00:00 2001 From: Yun Lin Date: Thu, 10 Jun 2021 14:37:32 +0800 Subject: [PATCH 1/2] use stoi for type int of motion_multiplier_ --- src/parse/MissionParse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parse/MissionParse.cpp b/src/parse/MissionParse.cpp index 159aee4526..895ad8ee63 100644 --- a/src/parse/MissionParse.cpp +++ b/src/parse/MissionParse.cpp @@ -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") { From 85ee2b2b755bf6a564fc33905ac57deeab4a8f3f Mon Sep 17 00:00:00 2001 From: Yun Lin Date: Fri, 8 Oct 2021 20:57:29 +0800 Subject: [PATCH 2/2] change API motion_multiplier to be return int --- include/scrimmage/parse/MissionParse.h | 2 +- missions/uuv-ex1.xml | 2 +- src/parse/MissionParse.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/scrimmage/parse/MissionParse.h b/include/scrimmage/parse/MissionParse.h index f651ac94b7..d90d1caff8 100644 --- a/include/scrimmage/parse/MissionParse.h +++ b/include/scrimmage/parse/MissionParse.h @@ -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(); diff --git a/missions/uuv-ex1.xml b/missions/uuv-ex1.xml index b50c12aad3..c5c1955267 100644 --- a/missions/uuv-ex1.xml +++ b/missions/uuv-ex1.xml @@ -4,7 +4,7 @@ name="Straight flying">