Skip to content

Commit efc55f9

Browse files
Saurav AgarwalSaurav Agarwal
authored andcommitted
Linting and doc cleanup
1 parent a9a39bf commit efc55f9

File tree

16 files changed

+456
-420
lines changed

16 files changed

+456
-420
lines changed

cppsrc/core/include/CoverageControl/algorithms/centralized_cvt.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ class CentralizedCVT : public AbstractController {
7171
bool is_converged_ = false;
7272

7373
public:
74-
CentralizedCVT(Parameters const &params, CoverageSystem &env)
75-
: CentralizedCVT(params, params.pNumRobots, env) {}
74+
CentralizedCVT(Parameters const &params, CoverageSystem &env)
75+
: CentralizedCVT(params, params.pNumRobots, env) {}
7676
CentralizedCVT(Parameters const &params, size_t const &num_robots,
7777
CoverageSystem &env)
7878
: params_{params}, num_robots_{num_robots}, env_{env} {
@@ -133,7 +133,6 @@ class CentralizedCVT : public AbstractController {
133133
}
134134
return true;
135135
}
136-
137136
};
138137

139138
} /* namespace CoverageControl */

cppsrc/core/include/CoverageControl/algorithms/clairvoyant_cvt.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
#include <set>
4040
#include <vector>
4141

42+
#include "CoverageControl/algorithms/abstract_controller.h"
4243
#include "CoverageControl/coverage_system.h"
4344
#include "CoverageControl/map_utils.h"
4445
#include "CoverageControl/parameters.h"
4546
#include "CoverageControl/typedefs.h"
46-
#include "CoverageControl/algorithms/abstract_controller.h"
4747

4848
namespace CoverageControl {
4949

@@ -71,10 +71,10 @@ class ClairvoyantCVT : public AbstractController {
7171
bool is_converged_ = false;
7272

7373
public:
74-
ClairvoyantCVT(Parameters const &params, CoverageSystem &env)
75-
: ClairvoyantCVT(params, params.pNumRobots, env) {}
74+
ClairvoyantCVT(Parameters const &params, CoverageSystem &env)
75+
: ClairvoyantCVT(params, params.pNumRobots, env) {}
7676
ClairvoyantCVT(Parameters const &params, size_t const &num_robots,
77-
CoverageSystem &env)
77+
CoverageSystem &env)
7878
: params_{params}, num_robots_{num_robots}, env_{env} {
7979
robot_global_positions_ = env_.GetRobotPositions();
8080
actions_.resize(num_robots_);

cppsrc/core/include/CoverageControl/algorithms/decentralized_cvt.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#define CPPSRC_CORE_INCLUDE_COVERAGECONTROL_ALGORITHMS_DECENTRALIZED_CVT_H_
3131

3232
#include <omp.h>
33+
3334
#include <algorithm>
3435
#include <fstream>
3536
#include <iostream>
@@ -70,8 +71,8 @@ class DecentralizedCVT : public AbstractController {
7071
bool is_converged_ = false;
7172

7273
public:
73-
DecentralizedCVT(Parameters const &params, CoverageSystem &env)
74-
: DecentralizedCVT(params, params.pNumRobots, env) {}
74+
DecentralizedCVT(Parameters const &params, CoverageSystem &env)
75+
: DecentralizedCVT(params, params.pNumRobots, env) {}
7576
DecentralizedCVT(Parameters const &params, size_t const &num_robots,
7677
CoverageSystem &env)
7778
: params_{params}, num_robots_{num_robots}, env_{env} {

cppsrc/core/include/CoverageControl/coverage_system.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class CoverageSystem {
403403
std::vector<int> robot_status(num_robots_, 0);
404404
PlotSystemMap(dir_name, step, robot_status);
405405
}
406-
void PlotSystemMap(std::string const &) const;
406+
void PlotSystemMap(std::string const &) const;
407407
void PlotSystemMap(std::string const &, int const &,
408408
std::vector<int> const &) const;
409409
void PlotMapVoronoi(std::string const &, int const &);
@@ -412,8 +412,8 @@ class CoverageSystem {
412412
void PlotWorldMap(std::string const &, std::string const &) const;
413413
void PlotWorldMapRobots(std::string const &, std::string const &) const;
414414
void PlotInitMap(std::string const &filename) const {
415-
PlotInitMap("./", filename);
416-
}
415+
PlotInitMap("./", filename);
416+
}
417417
void PlotInitMap(std::string const &, std::string const &) const;
418418
void PlotRobotLocalMap(std::string const &, int const &, int const &);
419419
void PlotRobotSystemMap(std::string const &, int const &, int const &);
@@ -442,11 +442,11 @@ class CoverageSystem {
442442
//! \name Getters
443443
//
444444
//! @{
445-
const auto& GetWorldIDFObject() const { return world_idf_; }
446-
const MapType& GetWorldIDF() const { return world_idf_.GetWorldMap(); }
447-
const MapType& GetSystemMap() const { return system_map_; }
448-
const MapType& GetSystemExplorationMap() const { return exploration_map_; }
449-
const MapType& GetSystemExploredIDFMap() const { return explored_idf_map_; }
445+
const auto &GetWorldIDFObject() const { return world_idf_; }
446+
const MapType &GetWorldIDF() const { return world_idf_.GetWorldMap(); }
447+
const MapType &GetSystemMap() const { return system_map_; }
448+
const MapType &GetSystemExplorationMap() const { return exploration_map_; }
449+
const MapType &GetSystemExploredIDFMap() const { return explored_idf_map_; }
450450

451451
inline auto GetNumRobots() const { return num_robots_; }
452452
inline auto GetNumFeatures() const { return num_robots_; }
@@ -498,31 +498,31 @@ class CoverageSystem {
498498
}
499499
}
500500

501-
const MapType& GetRobotLocalMap(size_t const id) {
501+
const MapType &GetRobotLocalMap(size_t const id) {
502502
CheckRobotID(id);
503503
return robots_[id].GetRobotLocalMap();
504504
}
505505

506-
const MapType& GetRobotMap(size_t const id) const {
506+
const MapType &GetRobotMap(size_t const id) const {
507507
CheckRobotID(id);
508508
return robots_[id].GetRobotMap();
509509
}
510510

511-
const MapType& GetRobotExplorationMap(size_t const id) {
511+
const MapType &GetRobotExplorationMap(size_t const id) {
512512
CheckRobotID(id);
513513
return robots_[id].GetExplorationMap();
514514
}
515515

516-
const MapType& GetRobotSystemMap(size_t const id) {
516+
const MapType &GetRobotSystemMap(size_t const id) {
517517
CheckRobotID(id);
518518
return robots_[id].GetRobotSystemMap();
519519
}
520-
const MapType& GetRobotObstacleMap(size_t const id) {
520+
const MapType &GetRobotObstacleMap(size_t const id) {
521521
CheckRobotID(id);
522522
return robots_[id].GetObstacleMap();
523523
}
524524

525-
const MapType& GetRobotSensorView(size_t const id) const {
525+
const MapType &GetRobotSensorView(size_t const id) const {
526526
CheckRobotID(id);
527527
return robots_[id].GetSensorView();
528528
}
@@ -548,7 +548,7 @@ class CoverageSystem {
548548

549549
std::pair<MapType, MapType> const &GetCommunicationMap(size_t const, size_t);
550550

551-
const auto& GetCommunicationMaps(size_t map_size) {
551+
const auto &GetCommunicationMaps(size_t map_size) {
552552
#pragma omp parallel for num_threads(num_robots_)
553553
for (size_t i = 0; i < num_robots_; ++i) {
554554
GetCommunicationMap(i, map_size);
@@ -594,7 +594,7 @@ class CoverageSystem {
594594
}
595595

596596
auto GetVoronoiCells() { return voronoi_cells_; }
597-
auto& GetVoronoi() { return voronoi_; }
597+
auto &GetVoronoi() { return voronoi_; }
598598

599599
auto GetVoronoiCell(int const robot_id) { return voronoi_cells_[robot_id]; }
600600

0 commit comments

Comments
 (0)