12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal cleanup (#1045) 

Clean up the lint errors.
master
jie 2018-04-10 00:43:36 -07:00 committed by Wally B. Feed
parent 74b35caf6e
commit cf358e7640
11 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cartographer/io/internal/in_memory_proto_stream.h
View File

@ -52,7 +52,7 @@ class InMemoryProtoStreamReader
public:
explicit InMemoryProtoStreamReader(
std::queue<std::unique_ptr<google::protobuf::Message>>&& state_chunks)
: state_chunks_(std::move(state_chunks)){};
: state_chunks_(std::move(state_chunks)) {}
InMemoryProtoStreamReader() = default;
~InMemoryProtoStreamReader() = default;

1
cartographer/io/probability_grid_points_processor.cc
View File

@ -142,7 +142,6 @@ std::unique_ptr<Image> DrawProbabilityGrid(
probability_grid.IsKnown(index)
? ProbabilityToColor(probability_grid.GetProbability(index))
: kUnknownValue;
;
image->SetPixel(xy_index.x(), xy_index.y(), {{value, value, value}});
}
return image;

4
cartographer/io/proto_stream_interface.h
View File

@ -26,7 +26,7 @@ namespace io {
// A writer for writing proto messages to a pbstream.
class ProtoStreamWriterInterface {
public:
virtual ~ProtoStreamWriterInterface(){};
virtual ~ProtoStreamWriterInterface() {}
// Serializes, compressed and writes the 'proto' to the file.
virtual void WriteProto(const google::protobuf::Message& proto) = 0;
@ -39,7 +39,7 @@ class ProtoStreamWriterInterface {
class ProtoStreamReaderInterface {
public:
ProtoStreamReaderInterface() = default;
virtual ~ProtoStreamReaderInterface(){};
virtual ~ProtoStreamReaderInterface() {}
// Deserialize compressed proto from the pb stream.
virtual bool ReadProto(google::protobuf::Message* proto) = 0;

2
cartographer/mapping/internal/2d/pose_graph_2d.h
View File

@ -284,7 +284,7 @@ class PoseGraph2D : public PoseGraph {
std::vector<PoseGraphInterface::Constraint> GetConstraints() const override;
void MarkSubmapAsTrimmed(const SubmapId& submap_id)
REQUIRES(parent_->mutex_) override;
bool IsFinished(int trajectory_id) const override REQUIRES(parent_->mutex);
bool IsFinished(int trajectory_id) const override REQUIRES(parent_->mutex_);
private:
PoseGraph2D* const parent_;

2
cartographer/mapping/internal/2d/scan_matching/fast_correlative_scan_matcher_2d.cc
View File

@ -69,7 +69,7 @@ class SlidingWindowMaximum {
private:
// Maximum of the current sliding window at the front. Then the maximum of the
// remaining window that came after this values first occurence, and so on.
// remaining window that came after this values first occurrence, and so on.
std::deque<float> non_ascending_maxima_;
};

6
cartographer/mapping/internal/2d/scan_matching/occupied_space_cost_function_2d.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#ifndef CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_2D_H_
#define CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_2D_H_
#include "Eigen/Core"
#include "Eigen/Geometry"
@ -126,4 +126,4 @@ class OccupiedSpaceCostFunction2D {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_H_
#endif // CARTOGRAPHER_MAPPING_INTERNAL_2D_SCAN_MATCHING_OCCUPIED_SPACE_COST_FUNCTION_2D_H_

11
cartographer/mapping/internal/3d/pose_graph_3d.h
View File

@ -158,7 +158,8 @@ class PoseGraph3D : public PoseGraph {
SubmapState state = SubmapState::kActive;
};
MapById<SubmapId, PoseGraphInterface::SubmapData> GetSubmapDataUnderLock();
MapById<SubmapId, PoseGraphInterface::SubmapData> GetSubmapDataUnderLock()
REQUIRES(mutex_);
// Handles a new work item.
void AddWorkItem(const std::function<void()>& work_item) REQUIRES(mutex_);
@ -284,9 +285,11 @@ class PoseGraph3D : public PoseGraph {
int num_submaps(int trajectory_id) const override;
std::vector<SubmapId> GetSubmapIds(int trajectory_id) const override;
MapById<SubmapId, PoseGraphInterface::SubmapData> GetAllSubmapData()
const override;
MapById<NodeId, TrajectoryNode> GetTrajectoryNodes() const override;
std::vector<PoseGraphInterface::Constraint> GetConstraints() const override;
const override REQUIRES(parent_->mutex_);
MapById<NodeId, TrajectoryNode> GetTrajectoryNodes() const override
REQUIRES(parent_->mutex_);
std::vector<PoseGraphInterface::Constraint> GetConstraints() const override
REQUIRES(parent_->mutex_);
void MarkSubmapAsTrimmed(const SubmapId& submap_id)
REQUIRES(parent_->mutex_) override;
bool IsFinished(int trajectory_id) const override REQUIRES(parent_->mutex_);

2
cartographer/mapping/internal/range_data_collator.cc
View File

@ -28,7 +28,7 @@ namespace mapping {
sensor::TimedPointCloudOriginData RangeDataCollator::AddRangeData(
const std::string& sensor_id,
const sensor::TimedPointCloudData& timed_point_cloud_data) {
CHECK(expected_sensor_ids_.count(sensor_id) != 0);
CHECK_NE(expected_sensor_ids_.count(sensor_id), 0);
// TODO(gaschler): These two cases can probably be one.
if (id_to_pending_data_.count(sensor_id) != 0) {
current_start_ = current_end_;

2
cartographer/mapping/pose_graph.h
View File

@ -53,7 +53,7 @@ class PoseGraph : public PoseGraphInterface {
};
PoseGraph() {}
virtual ~PoseGraph() override {}
~PoseGraph() override {}
PoseGraph(const PoseGraph&) = delete;
PoseGraph& operator=(const PoseGraph&) = delete;

2
cartographer/sensor/internal/trajectory_collator.cc
View File

@ -23,7 +23,7 @@ void TrajectoryCollator::AddTrajectory(
const int trajectory_id,
const std::unordered_set<std::string>& expected_sensor_ids,
const Callback& callback) {
CHECK(trajectory_to_queue_.count(trajectory_id) == 0);
CHECK_EQ(trajectory_to_queue_.count(trajectory_id), 0);
for (const auto& sensor_id : expected_sensor_ids) {
const auto queue_key = QueueKey{trajectory_id, sensor_id};
trajectory_to_queue_[trajectory_id].AddQueue(

2
cartographer/sensor/internal/voxel_filter.h
View File

@ -34,7 +34,7 @@ namespace sensor {
class VoxelFilter {
public:
// 'size' is the length of a voxel edge.
explicit VoxelFilter(float size) : resolution_(size){};
explicit VoxelFilter(float size) : resolution_(size) {}
VoxelFilter(const VoxelFilter&) = delete;
VoxelFilter& operator=(const VoxelFilter&) = delete;