Lib test dev (#1455)

* Update lib-base tests

* Fix code style

modules/perception/common/perception_gflags.cc

@@ -20,7 +20,7 @@ DEFINE_int32(perception_loop_rate, 10, "Loop rate for perception node, in Hz.");
 
 DEFINE_string(node_name, "perception", "The perception module name in proto");
 
-/// lib/config_manager/config_manager.cc 
+/// lib/config_manager/config_manager.cc
 DEFINE_string(config_manager_path, "./conf/config_manager.config",
               "The ModelConfig config paths file.");
 DEFINE_string(work_root, "modules/perception", "Project work root direcotry.");

modules/perception/common/perception_gflags.h

@@ -21,7 +21,7 @@
 
 DECLARE_int32(perception_loop_rate);
 
-/// lib/config_manager/config_manager.cc 
+/// lib/config_manager/config_manager.cc
 DECLARE_string(config_manager_path);
 DECLARE_string(work_root);
 

modules/perception/obstacle/base/hdmap_struct.h

@@ -16,11 +16,10 @@
 #ifndef MODULES_PERCEPTION_OBSTACLE_BASE_HDMAP_STRUCT_H_
 #define MODULES_PERCEPTION_OBSTACLE_BASE_HDMAP_STRUCT_H_
 
-#include "modules/perception/obstacle/base/types.h"
-
 #include <memory>
 #include <vector>
 
+#include "modules/perception/obstacle/base/types.h"
 
 namespace apollo {
 namespace perception {

modules/perception/obstacle/common/geometry_util.h

@@ -59,16 +59,16 @@ void TransformPoint(const PointType& point_in, PointType* point_out,
 
 template <typename PointType>
 void TransformPointCloud(const pcl::PointCloud<PointType>& cloud_in,
-                           pcl::PointCloud<PointType>& cloud_out,
+                           pcl::PointCloud<PointType>* cloud_out,
                            const Eigen::Matrix4d& trans_mat) {
-  if (cloud_out.points.size() < cloud_in.points.size()) {
-    cloud_out.points.resize(cloud_in.points.size());
+  if (cloud_out->points.size() < cloud_in.points.size()) {
+    cloud_out->points.resize(cloud_in.points.size());
   }
   for (int i = 0; i < cloud_in.size(); ++i) {
     const PointType& p = cloud_in.at(i);
     Eigen::Vector4d v(p.x, p.y, p.z, 1);
     v = trans_mat * v;
-    PointType& pd = cloud_out.points[i];
+    PointType& pd = cloud_out->points[i];
     pd.x = v.x();
     pd.y = v.y();
     pd.z = v.z();

modules/perception/obstacle/common/geometry_util_test.cc

@@ -106,7 +106,7 @@ TEST_F(GeometryUtilTest, TransformPointCloud2) {
   EXPECT_NEAR(1.715922, in_out_cloud->at(0).z, EPSILON);
 
   pcl_util::PointCloudPtr out_cloud(new pcl_util::PointCloud);
-  TransformPointCloud(*_clouds[0], *out_cloud, _trans_matrix);
+  TransformPointCloud(*_clouds[0], out_cloud.get(), _trans_matrix);
   EXPECT_NEAR(64.184380, out_cloud->at(0).x, EPSILON);
   EXPECT_NEAR(13.708398, out_cloud->at(0).y, EPSILON);
   EXPECT_NEAR(1.715922, out_cloud->at(0).z, EPSILON);

modules/perception/obstacle/common/pose_util.cc

@@ -34,8 +34,11 @@ bool ReadPoseFile(const std::string& filename,
   double time_samp = 0;
   double quat[4];
   double matrix3x3[9];
+  double& pose03 = (*pose)(0, 3);
+  double& pose13 = (*pose)(1, 3);
+  double& pose23 = (*pose)(2, 3);
   sscanf(buffer, "%d %lf %lf %lf %lf %lf %lf %lf %lf", &id, &(time_samp),
-    &((*pose)(0, 3)), &((*pose)(1, 3)), &((*pose)(2, 3)),
+    &pose03, &pose13, &pose23,
     &(quat[0]), &(quat[1]), &(quat[2]), &(quat[3]));
   QuaternionToRotationMatrix<double>(quat, matrix3x3);
 

modules/perception/obstacle/lidar/dummy/dummy_algorithms.cc

@@ -62,7 +62,7 @@ void DummyObjectBuilder::BuildObject(const ObjectBuilderOptions &options,
   Eigen::Vector4f min_pt;
   Eigen::Vector4f max_pt;
   PointCloudPtr cloud = obj->cloud;
-  SetDefaultValue(cloud, obj, min_pt, max_pt);
+  SetDefaultValue(cloud, obj, &min_pt, &max_pt);
   if (cloud->points.size() < 4u) {
     return;
   }

modules/perception/obstacle/lidar/interface/base_object_builder.h

@@ -84,26 +84,26 @@ class BaseObjectBuilder {
 
  protected:
   virtual void SetDefaultValue(pcl_util::PointCloudPtr cloud, ObjectPtr obj,
-                               Eigen::Vector4f &min_pt,
-                               Eigen::Vector4f &max_pt) {
-    GetCloudMinMax3D<pcl_util::Point>(cloud, &min_pt, &max_pt);
-    Eigen::Vector3f center((min_pt[0] + max_pt[0]) / 2,
-                           (min_pt[1] + max_pt[1]) / 2,
-                           (min_pt[2] + max_pt[2]) / 2);
+                               Eigen::Vector4f* min_pt,
+                               Eigen::Vector4f* max_pt) {
+    GetCloudMinMax3D<pcl_util::Point>(cloud, min_pt, max_pt);
+    Eigen::Vector3f center(((*min_pt)[0] + (*max_pt)[0]) / 2,
+                           ((*min_pt)[1] + (*max_pt)[1]) / 2,
+                           ((*min_pt)[2] + (*max_pt)[2]) / 2);
 
     // handle degeneration case
     float epslin = 1e-3;
     for (int i = 0; i < 3; i++) {
-      if (max_pt[i] - min_pt[i] < epslin) {
-        max_pt[i] = center[i] + epslin / 2;
-        min_pt[i] = center[i] - epslin / 2;
+      if ((*max_pt)[i] - (*min_pt)[i] < epslin) {
+        (*max_pt)[i] = center[i] + epslin / 2;
+        (*min_pt)[i] = center[i] - epslin / 2;
       }
     }
 
     // length
-    obj->length = max_pt[0] - min_pt[0];
+    obj->length = (*max_pt)[0] - (*min_pt)[0];
     // width
-    obj->width = max_pt[1] - min_pt[1];
+    obj->width = (*max_pt)[1] - (*min_pt)[1];
     if (obj->length - obj->width < 0) {
       float tmp = obj->length;
       obj->length = obj->width;
@@ -113,29 +113,29 @@ class BaseObjectBuilder {
       obj->direction = Eigen::Vector3d(1.0, 0.0, 0.0);
     }
     // height
-    obj->height = max_pt[2] - min_pt[2];
+    obj->height = (*max_pt)[2] - (*min_pt)[2];
     // center
-    obj->center = Eigen::Vector3d((max_pt[0] + min_pt[0]) / 2,
-                                  (max_pt[1] + min_pt[1]) / 2,
-                                  (max_pt[2] + min_pt[2]) / 2);
+    obj->center = Eigen::Vector3d(((*max_pt)[0] + (*min_pt)[0]) / 2,
+                                  ((*max_pt)[1] + (*min_pt)[1]) / 2,
+                                  ((*max_pt)[2] + (*min_pt)[2]) / 2);
     // polygon
     if (cloud->size() < 4) {
       obj->polygon.points.resize(4);
-      obj->polygon.points[0].x = static_cast<double>(min_pt[0]);
-      obj->polygon.points[0].y = static_cast<double>(min_pt[1]);
-      obj->polygon.points[0].z = static_cast<double>(min_pt[2]);
+      obj->polygon.points[0].x = static_cast<double>((*min_pt)[0]);
+      obj->polygon.points[0].y = static_cast<double>((*min_pt)[1]);
+      obj->polygon.points[0].z = static_cast<double>((*min_pt)[2]);
 
-      obj->polygon.points[1].x = static_cast<double>(max_pt[0]);
-      obj->polygon.points[1].y = static_cast<double>(min_pt[1]);
-      obj->polygon.points[1].z = static_cast<double>(min_pt[2]);
+      obj->polygon.points[1].x = static_cast<double>((*max_pt)[0]);
+      obj->polygon.points[1].y = static_cast<double>((*min_pt)[1]);
+      obj->polygon.points[1].z = static_cast<double>((*min_pt)[2]);
 
-      obj->polygon.points[2].x = static_cast<double>(max_pt[0]);
-      obj->polygon.points[2].y = static_cast<double>(max_pt[1]);
-      obj->polygon.points[2].z = static_cast<double>(min_pt[2]);
+      obj->polygon.points[2].x = static_cast<double>((*max_pt)[0]);
+      obj->polygon.points[2].y = static_cast<double>((*max_pt)[1]);
+      obj->polygon.points[2].z = static_cast<double>((*min_pt)[2]);
 
-      obj->polygon.points[3].x = static_cast<double>(min_pt[0]);
-      obj->polygon.points[3].y = static_cast<double>(max_pt[1]);
-      obj->polygon.points[3].z = static_cast<double>(min_pt[2]);
+      obj->polygon.points[3].x = static_cast<double>((*min_pt)[0]);
+      obj->polygon.points[3].y = static_cast<double>((*max_pt)[1]);
+      obj->polygon.points[3].z = static_cast<double>((*min_pt)[2]);
     }
   }
 

modules/perception/obstacle/lidar/interface/base_object_filter.h

@@ -52,6 +52,7 @@
 // using roi_filter to do somethings.
 // ////////////////////////////////////////////////////
 
+#include <memory>
 #include <string>
 #include <vector>
 

modules/perception/obstacle/lidar/interface/base_roi_filter.h

@@ -52,6 +52,7 @@
 // using roi_filter to do somethings.
 // ////////////////////////////////////////////////////
 
+#include <memory>
 #include <string>
 #include <vector>
 

modules/perception/obstacle/lidar/interface/base_tracker.h

@@ -53,6 +53,7 @@
 // using tracker to do somethings.
 // ////////////////////////////////////////////////////
 
+#include <memory>
 #include <string>
 #include <vector>
 

modules/perception/obstacle/lidar/object_builder/min_box/min_box.cc

@@ -322,7 +322,7 @@ void MinBoxObjectBuilder::ComputePolygon2dxy(ObjectPtr obj) {
     Eigen::Vector4f min_pt;
     Eigen::Vector4f max_pt;
     pcl_util::PointCloudPtr cloud = obj->cloud;
-    SetDefaultValue(cloud, obj, min_pt, max_pt);
+    SetDefaultValue(cloud, obj, &min_pt, &max_pt);
     if (cloud->points.size() < 4u) {
         return;
     }

modules/perception/obstacle/lidar/segmentation/cnnseg/write_img.cc

@@ -14,14 +14,12 @@
  * limitations under the License.
  *****************************************************************************/
 
+#include <opencv2/opencv.hpp>
 #include <fstream>
 #include <iostream>
-#include <opencv2/opencv.hpp>
 #include <string>
 #include "gflags/gflags.h"
 
-using namespace std;
-
 DEFINE_string(test_dir, "/apollo/modules/perception/data/cnnseg_test/",
               "test data directory");
 DEFINE_string(pcd_name, "uscar_12_1470770225_1470770492_1349",
@@ -30,22 +28,22 @@ DEFINE_string(pcd_name, "uscar_12_1470770225_1470770492_1349",
 int main(int argc, char** argv) {
   google::ParseCommandLineFlags(&argc, &argv, true);
 
-  string test_dir(FLAGS_test_dir);
-  string det_res_file = test_dir + FLAGS_pcd_name + "-detection.txt";
-  ifstream f_res(det_res_file.c_str(), std::ifstream::in);
+  std::string test_dir(FLAGS_test_dir);
+  std::string det_res_file = test_dir + FLAGS_pcd_name + "-detection.txt";
+  std::ifstream f_res(det_res_file.c_str(), std::ifstream::in);
 
-  string line;
+  std::string line;
 
-  getline(f_res, line);
+  std::getline(f_res, line);
   int rows, cols;
-  istringstream iss(line);
+  std::istringstream iss(line);
   iss >> rows >> cols;
-  cout << "#rows = " << rows << ", #cols = " << cols << endl;
+  std::cout << "#rows = " << rows << ", #cols = " << cols << endl;
 
   cv::Mat img(rows, cols, CV_8UC3, cv::Scalar(0.0));
   int grid = 0;
-  while (getline(f_res, line)) {
-    istringstream iss(line);
+  while (std::getline(f_res, line)) {
+    std::istringstream iss(line);
     int blue, green, red;
     iss >> blue >> green >> red;
     img.at<cv::Vec3b>(grid / cols, grid % cols) = cv::Vec3b(blue, green, red);
@@ -56,11 +54,12 @@ int main(int argc, char** argv) {
   }
   f_res.close();
 
-  string res_img_file = test_dir + FLAGS_pcd_name + "-detection.png";
+  std::string res_img_file = test_dir + FLAGS_pcd_name + "-detection.png";
   if (!cv::imwrite(res_img_file, img)) {
     return -1;
   }
 
   google::ShutDownCommandLineFlags();
   return 0;
-}
+}
\ No newline at end of file
+

modules/perception/obstacle/lidar/visualizer/opengl_visualizer/opengl_visualizer.cc

@@ -131,7 +131,7 @@ void OpenglVisualizer::UpdateCameraSystem(FrameContent *content) {
                                   &view_point_world_, pose_v2w);
 
   TransformPointCloud<pcl_util::Point>(main_car_points_velodyne_,
-                                       main_car_points_world_, pose_v2w);
+                                       &main_car_points_world_, pose_v2w);
 
   Eigen::Vector4d up_w(up_velodyne_.x, up_velodyne_.y, up_velodyne_.z, 0);
 

modules/perception/obstacle/onboard/hdmap_input.cc

@@ -99,7 +99,8 @@ bool HDMapInput::GetNearestLaneDirection(const pcl_util::PointD& pointd,
   double nearest_s;
   double nearest_l;
 
-  int status = hdmap->GetNearestLane(point, &nearest_lane, &nearest_s, &nearest_l);
+  int status = hdmap->GetNearestLane(point,
+          &nearest_lane, &nearest_s, &nearest_l);
   if (status != SUCC) {
     AERROR << "Failed to get nearest lane for point " << point.DebugString();
     return false;

modules/perception/obstacle/onboard/lidar_process.h

@@ -17,6 +17,8 @@
 #ifndef MODEULES_PERCEPTION_OBSTACLE_ONBOARD_LIDAR_PROCESS_H_
 #define MODEULES_PERCEPTION_OBSTACLE_ONBOARD_LIDAR_PROCESS_H_
 
+#include <memory>
+#include <vector>
 #include "Eigen/Core"
 #include "gtest/gtest_prod.h"
 

modules/perception/obstacle/onboard/lidar_process_test.cc

@@ -14,6 +14,7 @@
  * limitations under the License.
  *****************************************************************************/
 #include <pcl/io/pcd_io.h>
+#include <string>
 #include <vector>
 
 #include "gtest/gtest.h"

modules/perception/perception.h

@@ -22,6 +22,7 @@
 #define MODEULES_PERCEPTION_PERCEPTION_H_
 
 #include <string>
+#include <memory>
 
 #include "modules/common/apollo_app.h"
 #include "modules/common/macro.h"

modules/perception/tool/offline_visualizer_tool/offline_lidar_visualizer_tool.cc

@@ -14,13 +14,13 @@
  * limitations under the License.
  *****************************************************************************/
 
+#include <pcl/io/pcd_io.h>
 #include <cstddef>
 #include <fstream>
 #include <iomanip>
 #include <sstream>
 #include <vector>
 #include <string>
-#include <pcl/io/pcd_io.h>
 
 #include "modules/perception/common/perception_gflags.h"
 #include "modules/perception/lib/config_manager/config_manager.h"
@@ -132,13 +132,13 @@ class OfflineLidarPerceptionTool {
       if (FLAGS_save_obstacles) {
         oss << std::setfill('0') << std::setw(6) << i;
         std::string filename = FLAGS_output_path + oss.str() + ".txt";
-        SaveTrackingInformation(result_objects, pose, frame_id, cloud,
+        SaveTrackingInformation(&result_objects, pose, frame_id, cloud,
                                 filename);
       }
     }
   }
 
-  void SaveTrackingInformation(std::vector<ObjectPtr>& objects,
+  void SaveTrackingInformation(std::vector<ObjectPtr>* objects,
                                const Eigen::Matrix4d& pose_v2w,
                                const int& frame_id,
                                const pcl_util::PointCloudPtr& cloud,
@@ -149,7 +149,7 @@ class OfflineLidarPerceptionTool {
       return;
     }
     // write frame id & number of objects at the beignning
-    fout << frame_id << " " << objects.size() << std::endl;
+    fout << frame_id << " " << objects->size() << std::endl;
 
     typename pcl::PointCloud<pcl_util::Point>::Ptr trans_cloud(
       new pcl::PointCloud<pcl_util::Point>());
@@ -163,7 +163,7 @@ class OfflineLidarPerceptionTool {
     std::vector<float> k_sqrt_dist;
     Eigen::Matrix4d pose_tw2velo = pose_velo2tw.inverse();
 
-    for (const auto& obj : objects) {
+    for (const auto& obj : *objects) {
       Eigen::Vector3f coord_dir(0.0, 1.0, 0.0);
       Eigen::Vector4d dir_velo = pose_tw2velo * Eigen::Vector4d(
         obj->direction[0], obj->direction[1], obj->direction[2], 0);