Skip to content

Commit 1f6283b

Browse files
committed
Fixed order of access specifiers in Robot and HumanDetector class
1 parent ff4e4b7 commit 1f6283b

2 files changed

Lines changed: 19 additions & 18 deletions

File tree

include/HumanDetector.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@ using cv::Size;
4949
* A class for human detection and drawing bounding boxes
5050
*/
5151
class HumanDetector {
52-
private:
53-
float confidence_threshold = 0.5;
54-
float nms_threshold = 0.4;
55-
/**
56-
* @brief Get the Outputs Names object
57-
*
58-
* @param net
59-
* @return vector<string>
60-
*/
61-
vector<string> getOutputsNames(const Net& net);
62-
6352
public:
6453
/**
6554
* @brief detection : Runs the neural network to detect humans.
@@ -95,5 +84,16 @@ class HumanDetector {
9584
*/
9685
int drawBoundingBoxes(double confidence, int left, int top,
9786
int right, int bottom, Mat& frame, int human_number);
87+
88+
private:
89+
float confidence_threshold = 0.5;
90+
float nms_threshold = 0.4;
91+
/**
92+
* @brief Get the Outputs Names object
93+
*
94+
* @param net
95+
* @return vector<string>
96+
*/
97+
vector<string> getOutputsNames(const Net& net);
9898
};
9999
#endif // INCLUDE_HUMANDETECTOR_H_

include/Robot.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ using Eigen::Vector4d;
4040
*
4141
*/
4242
class Robot {
43+
public:
44+
/**
45+
* @brief detectHumans : Main method for human detection
46+
*/
47+
int detectHumans();
48+
// A constructor
49+
explicit Robot(Matrix4d transformation_matrix);
50+
4351
private:
4452
vector<int> net_input_shape = {416, 416};
4553
string path_to_model_weights = "../network/yolov3.weights";
@@ -62,12 +70,5 @@ class Robot {
6270
* @return vector<double> : location of each human in robot reference frame
6371
*/
6472
vector<double> transformToRobotFrame(vector<Rect> bbox_coords);
65-
public:
66-
/**
67-
* @brief detectHumans : Main method for human detection
68-
*/
69-
int detectHumans();
70-
// A constructor
71-
explicit Robot(Matrix4d transformation_matrix);
7273
};
7374
#endif // INCLUDE_ROBOT_H_

0 commit comments

Comments
 (0)