Skip to content

Commit

Permalink
Replace custom SplitString() by absl::StrSplit() (cartographer-projec…
Browse files Browse the repository at this point in the history
…t#1026)

code simplification
  • Loading branch information
MichaelGrupp authored and wally-the-cartographer committed Sep 27, 2018
1 parent dd4d2af commit 829e2dc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 75 deletions.
1 change: 0 additions & 1 deletion cartographer_ros/cartographer_ros/assets_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "cartographer/transform/transform_interpolation_buffer.h"
#include "cartographer_ros/msg_conversion.h"
#include "cartographer_ros/ros_map_writing_points_processor.h"
#include "cartographer_ros/split_string.h"
#include "cartographer_ros/time_conversion.h"
#include "cartographer_ros/urdf_reader.h"
#include "gflags/gflags.h"
Expand Down
5 changes: 2 additions & 3 deletions cartographer_ros/cartographer_ros/assets_writer_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#include "absl/strings/str_split.h"
#include "cartographer_ros/assets_writer.h"
#include "cartographer_ros/split_string.h"
#include "gflags/gflags.h"
#include "glog/logging.h"

Expand Down Expand Up @@ -55,8 +55,7 @@ int main(int argc, char** argv) {
<< "-pose_graph_filename is missing.";

::cartographer_ros::AssetsWriter asset_writer(
FLAGS_pose_graph_filename,
cartographer_ros::SplitString(FLAGS_bag_filenames, ','),
FLAGS_pose_graph_filename, absl::StrSplit(FLAGS_bag_filenames, ','),
FLAGS_output_file_prefix);

asset_writer.Run(FLAGS_configuration_directory, FLAGS_configuration_basename,
Expand Down
15 changes: 8 additions & 7 deletions cartographer_ros/cartographer_ros/offline_node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include <time.h>
#include <chrono>

#include "absl/strings/str_split.h"
#include "cartographer_ros/node.h"
#include "cartographer_ros/playable_bag.h"
#include "cartographer_ros/split_string.h"
#include "cartographer_ros/urdf_reader.h"
#include "gflags/gflags.h"
#include "ros/callback_queue.h"
Expand Down Expand Up @@ -86,11 +86,11 @@ void RunOfflineNode(const MapBuilderFactory& map_builder_factory) {
<< "-configuration_basenames is missing.";
CHECK(!(FLAGS_bag_filenames.empty() && FLAGS_load_state_filename.empty()))
<< "-bag_filenames and -load_state_filename cannot both be unspecified.";
const auto bag_filenames =
cartographer_ros::SplitString(FLAGS_bag_filenames, ',');
const std::vector<std::string> bag_filenames =
absl::StrSplit(FLAGS_bag_filenames, ',');
cartographer_ros::NodeOptions node_options;
const auto configuration_basenames =
cartographer_ros::SplitString(FLAGS_configuration_basenames, ',');
const std::vector<std::string> configuration_basenames =
absl::StrSplit(FLAGS_configuration_basenames, ',');
std::vector<TrajectoryOptions> bag_trajectory_options(1);
std::tie(node_options, bag_trajectory_options.at(0)) =
LoadOptions(FLAGS_configuration_directory, configuration_basenames.at(0));
Expand Down Expand Up @@ -122,8 +122,9 @@ void RunOfflineNode(const MapBuilderFactory& map_builder_factory) {
tf2_ros::Buffer tf_buffer;

std::vector<geometry_msgs::TransformStamped> urdf_transforms;
for (const std::string& urdf_filename :
cartographer_ros::SplitString(FLAGS_urdf_filenames, ',')) {
const std::vector<std::string> urdf_filenames =
absl::StrSplit(FLAGS_urdf_filenames, ',');
for (const auto& urdf_filename : urdf_filenames) {
const auto current_urdf_transforms =
ReadStaticTransformsFromUrdf(urdf_filename, &tf_buffer);
urdf_transforms.insert(urdf_transforms.end(),
Expand Down
34 changes: 0 additions & 34 deletions cartographer_ros/cartographer_ros/split_string.cc

This file was deleted.

30 changes: 0 additions & 30 deletions cartographer_ros/cartographer_ros/split_string.h

This file was deleted.

0 comments on commit 829e2dc

Please sign in to comment.