From 8d0457d1d89ae933c383b9398ec0d8acd9e79cb5 Mon Sep 17 00:00:00 2001 From: Rodrigo Queiro Date: Thu, 9 Aug 2018 17:08:38 +0200 Subject: [PATCH] Move tools/bazel.rc to prepare for bazel 0.17 (#1375) * Move tools/bazel.rc to prepare for bazel 0.17 Bazel 0.17 will no longer import the legacy "tools/bazel.rc" config file. This change ensures compatibility with the new versions. For users on bazel 0.16 and earlier who have a ~/.bazelrc, this change will cause bazel to ignore their ~/.bazelrc and load this one instead. Hopefully this won't break anyone. (famous last words) --- tools/bazel.rc => .bazelrc | 0 .../mapping/internal/optimization/optimization_problem_2d.cc | 3 ++- .../mapping/internal/optimization/optimization_problem_3d.cc | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) rename tools/bazel.rc => .bazelrc (100%) diff --git a/tools/bazel.rc b/.bazelrc similarity index 100% rename from tools/bazel.rc rename to .bazelrc diff --git a/cartographer/mapping/internal/optimization/optimization_problem_2d.cc b/cartographer/mapping/internal/optimization/optimization_problem_2d.cc index 5c29301..e7d7b6a 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_2d.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_2d.cc @@ -256,7 +256,8 @@ void OptimizationProblem2D::Solve( } // Add cost functions for landmarks. AddLandmarkCostFunctions(landmark_nodes, freeze_landmarks, node_data_, - &C_nodes, &C_landmarks, &problem, options_.huber_scale()); + &C_nodes, &C_landmarks, &problem, + options_.huber_scale()); // Add penalties for violating odometry or changes between consecutive nodes // if odometry is not available. for (auto node_it = node_data_.begin(); node_it != node_data_.end();) { diff --git a/cartographer/mapping/internal/optimization/optimization_problem_3d.cc b/cartographer/mapping/internal/optimization/optimization_problem_3d.cc index b8401a4..d7e1ee0 100644 --- a/cartographer/mapping/internal/optimization/optimization_problem_3d.cc +++ b/cartographer/mapping/internal/optimization/optimization_problem_3d.cc @@ -352,7 +352,8 @@ void OptimizationProblem3D::Solve( } // Add cost functions for landmarks. AddLandmarkCostFunctions(landmark_nodes, freeze_landmarks, node_data_, - &C_nodes, &C_landmarks, &problem, options_.huber_scale()); + &C_nodes, &C_landmarks, &problem, + options_.huber_scale()); // Add constraints based on IMU observations of angular velocities and // linear acceleration. if (!options_.fix_z_in_3d()) {