From 042750332b4dd89d5215b1655f400604d3e9a5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Wed, 19 Oct 2016 15:19:27 +0300 Subject: [PATCH] Remove comment in destructor about 'destruct()' --- src/capture_image.h | 5 ----- src/capture_laser_2D.h | 5 ----- src/capture_void.h | 6 ------ src/constraint_AHP.h | 5 ----- src/constraint_analytic.h | 5 ----- src/constraint_container.h | 5 ----- src/constraint_corner_2D.h | 5 ----- src/constraint_gps_2D.h | 5 ----- src/constraint_gps_pseudorange_2D.h | 5 ----- src/constraint_gps_pseudorange_3D.h | 5 ----- src/constraint_imu.h | 4 ---- src/constraint_odom_2D.h | 5 ----- src/constraint_odom_2D_analytic.h | 5 ----- src/constraint_point_2D.h | 5 ----- src/constraint_point_to_line_2D.h | 5 ----- src/constraint_relative_2D_analytic.h | 4 ---- src/constraint_sparse.h | 5 ----- src/feature_gps_fix.h | 6 ------ src/feature_gps_pseudorange.h | 6 ------ src/feature_imu.h | 5 ----- src/feature_line_2D.h | 5 ----- src/feature_odom_2D.h | 5 ----- src/feature_point_image.h | 5 ----- src/frame_imu.h | 6 ------ src/landmark_container.h | 5 ----- src/landmark_corner_2D.h | 5 ----- src/landmark_line_2D.h | 5 ----- src/sensor_camera.h | 5 ----- src/sensor_gps.h | 4 ---- src/sensor_gps_fix.h | 5 ----- src/sensor_imu.h | 5 ----- src/sensor_laser_2D.h | 5 ----- src/sensor_odom_2D.h | 5 ----- 33 files changed, 166 deletions(-) diff --git a/src/capture_image.h b/src/capture_image.h index 9f5126ce7..6cd3a0b3d 100644 --- a/src/capture_image.h +++ b/src/capture_image.h @@ -32,11 +32,6 @@ class CaptureImage : public CaptureBase public: CaptureImage(const TimeStamp& _ts, SensorCamera::Ptr _camera_ptr, cv::Mat _data_cv); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - */ virtual ~CaptureImage(); virtual const cv::Mat& getImage() const; diff --git a/src/capture_laser_2D.h b/src/capture_laser_2D.h index 314ed3160..80fdfc47f 100644 --- a/src/capture_laser_2D.h +++ b/src/capture_laser_2D.h @@ -21,11 +21,6 @@ class CaptureLaser2D : public CaptureBase /** \brief Constructor with ranges **/ CaptureLaser2D(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const std::vector<float>& _ranges); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - **/ virtual ~CaptureLaser2D(); laserscanutils::LaserScan& getScan(); diff --git a/src/capture_void.h b/src/capture_void.h index 2d6b23f93..1b0602fa1 100644 --- a/src/capture_void.h +++ b/src/capture_void.h @@ -12,12 +12,6 @@ class CaptureVoid : public CaptureBase { public: CaptureVoid(const TimeStamp& _ts, SensorBasePtr _sensor_ptr); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~CaptureVoid(); }; diff --git a/src/constraint_AHP.h b/src/constraint_AHP.h index a88a7259b..fa160656d 100644 --- a/src/constraint_AHP.h +++ b/src/constraint_AHP.h @@ -40,11 +40,6 @@ class ConstraintAHP : public ConstraintSparse<2, 3, 4, 3, 4, 4> distortion_ = (std::static_pointer_cast<SensorCamera>(_ftr_ptr->getCapturePtr()->getSensorPtr()))->getDistortionVector(); } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintAHP() { // diff --git a/src/constraint_analytic.h b/src/constraint_analytic.h index ea4e66805..e2b95a902 100644 --- a/src/constraint_analytic.h +++ b/src/constraint_analytic.h @@ -84,11 +84,6 @@ class ConstraintAnalytic: public ConstraintBase StateBlock* _state8Ptr = nullptr, StateBlock* _state9Ptr = nullptr ) ; - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintAnalytic(); /** \brief Returns a vector of pointers to the state blocks diff --git a/src/constraint_container.h b/src/constraint_container.h index b055fd1f9..9da4469e7 100644 --- a/src/constraint_container.h +++ b/src/constraint_container.h @@ -28,11 +28,6 @@ class ConstraintContainer: public ConstraintSparse<3,2,1,2,1> std::cout << "new constraint container: corner idx = " << corner_ << std::endl; } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintContainer() { //std::cout << "deleting ConstraintContainer " << nodeId() << std::endl; diff --git a/src/constraint_corner_2D.h b/src/constraint_corner_2D.h index b61db7a4e..06186d63b 100644 --- a/src/constraint_corner_2D.h +++ b/src/constraint_corner_2D.h @@ -17,11 +17,6 @@ class ConstraintCorner2D: public ConstraintSparse<3,2,1,2,1> setType("CORNER 2D"); } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintCorner2D() { //std::cout << "deleting ConstraintCorner2D " << nodeId() << std::endl; diff --git a/src/constraint_gps_2D.h b/src/constraint_gps_2D.h index 09d5c78f8..6427bcb5f 100644 --- a/src/constraint_gps_2D.h +++ b/src/constraint_gps_2D.h @@ -20,11 +20,6 @@ class ConstraintGPS2D : public ConstraintSparse<2, 2> setType("GPS FIX 2D"); } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintGPS2D() { // diff --git a/src/constraint_gps_pseudorange_2D.h b/src/constraint_gps_pseudorange_2D.h index 4e4acc20b..2cb40e0f3 100644 --- a/src/constraint_gps_pseudorange_2D.h +++ b/src/constraint_gps_pseudorange_2D.h @@ -46,11 +46,6 @@ public: //std::cout << "ConstraintGPSPseudorange2D() pr=" << pseudorange_ << "\tsat_pos=(" << sat_position_[0] << ", " << sat_position_[1] << ", " << sat_position_[2] << ")" << std::endl; } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintGPSPseudorange2D() { //std::cout << "deleting ConstraintGPSPseudorange2D " << nodeId() << std::endl; diff --git a/src/constraint_gps_pseudorange_3D.h b/src/constraint_gps_pseudorange_3D.h index c971689ce..f03a94e19 100644 --- a/src/constraint_gps_pseudorange_3D.h +++ b/src/constraint_gps_pseudorange_3D.h @@ -42,11 +42,6 @@ public: } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintGPSPseudorange3D() { //std::cout << "deleting ConstraintGPSPseudorange3D " << nodeId() << std::endl; diff --git a/src/constraint_imu.h b/src/constraint_imu.h index fd5bdd706..15e04ae10 100644 --- a/src/constraint_imu.h +++ b/src/constraint_imu.h @@ -18,10 +18,6 @@ class ConstraintIMU : public ConstraintSparse<9, 3, 4, 3, 3, 3, 3, 4, 3> ConstraintIMU(FeatureIMU::Ptr _ftr_ptr, FrameIMU::Ptr _frame_ptr, bool _apply_loss_function = false, ConstraintStatus _status = CTR_ACTIVE); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - **/ virtual ~ConstraintIMU(); template<typename T> diff --git a/src/constraint_odom_2D.h b/src/constraint_odom_2D.h index 8a992e545..e2a11fd31 100644 --- a/src/constraint_odom_2D.h +++ b/src/constraint_odom_2D.h @@ -18,11 +18,6 @@ class ConstraintOdom2D : public ConstraintSparse<3, 2, 1, 2, 1> setType("ODOM 2D"); } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintOdom2D() { // diff --git a/src/constraint_odom_2D_analytic.h b/src/constraint_odom_2D_analytic.h index 4c0bdbea4..45beb38e8 100644 --- a/src/constraint_odom_2D_analytic.h +++ b/src/constraint_odom_2D_analytic.h @@ -16,11 +16,6 @@ class ConstraintOdom2DAnalytic : public ConstraintRelative2DAnalytic setType("ODOM 2D ANALYTIC"); } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintOdom2DAnalytic() { // diff --git a/src/constraint_point_2D.h b/src/constraint_point_2D.h index 71f03c3fd..d2ac0da0c 100644 --- a/src/constraint_point_2D.h +++ b/src/constraint_point_2D.h @@ -32,11 +32,6 @@ class ConstraintPoint2D: public ConstraintSparse<2,2,1,2,1,2> measurement_sqrt_information_ = measurement_sqrt_covariance.inverse().transpose(); // retrieve factor U in the decomposition } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintPoint2D() { //std::cout << "deleting ConstraintPoint2D " << nodeId() << std::endl; diff --git a/src/constraint_point_to_line_2D.h b/src/constraint_point_to_line_2D.h index 26ffb7045..e7b084140 100644 --- a/src/constraint_point_to_line_2D.h +++ b/src/constraint_point_to_line_2D.h @@ -33,11 +33,6 @@ class ConstraintPointToLine2D: public ConstraintSparse<1,2,1,2,1,2,2> measurement_sqrt_information_ = measurement_sqrt_covariance.inverse().transpose(); // retrieve factor U in the decomposition } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintPointToLine2D() { //std::cout << "deleting ConstraintPoint2D " << nodeId() << std::endl; diff --git a/src/constraint_relative_2D_analytic.h b/src/constraint_relative_2D_analytic.h index 469ee9140..d9f88ff27 100644 --- a/src/constraint_relative_2D_analytic.h +++ b/src/constraint_relative_2D_analytic.h @@ -36,10 +36,6 @@ class ConstraintRelative2DAnalytic : public ConstraintAnalytic // } - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - **/ virtual ~ConstraintRelative2DAnalytic() { // diff --git a/src/constraint_sparse.h b/src/constraint_sparse.h index 7204835e0..73545f4ce 100644 --- a/src/constraint_sparse.h +++ b/src/constraint_sparse.h @@ -108,11 +108,6 @@ class ConstraintSparse: public ConstraintBase StateBlock* _state8Ptr = nullptr, StateBlock* _state9Ptr = nullptr ) ; - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~ConstraintSparse(); /** \brief Returns a vector of pointers to the state blocks diff --git a/src/feature_gps_fix.h b/src/feature_gps_fix.h index 1569776f6..1f6ea90ef 100644 --- a/src/feature_gps_fix.h +++ b/src/feature_gps_fix.h @@ -27,12 +27,6 @@ class FeatureGPSFix : public FeatureBase * */ FeatureGPSFix(const Eigen::VectorXs& _measurement, const Eigen::MatrixXs& _meas_covariance); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~FeatureGPSFix(); }; diff --git a/src/feature_gps_pseudorange.h b/src/feature_gps_pseudorange.h index eec2ed457..caf5d9b50 100644 --- a/src/feature_gps_pseudorange.h +++ b/src/feature_gps_pseudorange.h @@ -24,12 +24,6 @@ public: EIGEN_MAKE_ALIGNED_OPERATOR_NEW; // to guarantee alignment (see http://eigen.tuxfamily.org/dox-devel/group__TopicStructHavingEigenMembers.html) FeatureGPSPseudorange(Eigen::Vector3s& _sat_position, Scalar _pseudorange, Scalar _covariance); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~FeatureGPSPseudorange(); const Eigen::Vector3s & getSatPosition() const; diff --git a/src/feature_imu.h b/src/feature_imu.h index bf00ab90a..6732ae162 100644 --- a/src/feature_imu.h +++ b/src/feature_imu.h @@ -26,11 +26,6 @@ class FeatureIMU : public FeatureBase */ FeatureIMU(const Eigen::VectorXs& _delta_preintegrated, const Eigen::MatrixXs& _delta_preintegrated_covariance); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~FeatureIMU(); public: // TODO eventually produce getters for these and then go private diff --git a/src/feature_line_2D.h b/src/feature_line_2D.h index be36db185..3dfbb7223 100644 --- a/src/feature_line_2D.h +++ b/src/feature_line_2D.h @@ -33,11 +33,6 @@ class FeatureLine2D : public FeatureBase FeatureLine2D(const Eigen::Vector3s & _line_homogeneous_params, const Eigen::Matrix3s & _params_covariance, Eigen::Vector3s & _point1, Eigen::Vector3s & _point2); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - */ virtual ~FeatureLine2D(); /** \brief Returns a const reference to first_point_ diff --git a/src/feature_odom_2D.h b/src/feature_odom_2D.h index 1b7f74d6c..ba2be2f51 100644 --- a/src/feature_odom_2D.h +++ b/src/feature_odom_2D.h @@ -30,11 +30,6 @@ class FeatureOdom2D : public FeatureBase */ FeatureOdom2D(const Eigen::VectorXs& _measurement, const Eigen::MatrixXs& _meas_covariance); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~FeatureOdom2D(); /** \brief Generic interface to find constraints diff --git a/src/feature_point_image.h b/src/feature_point_image.h index 54b23843f..c44d4c6d4 100644 --- a/src/feature_point_image.h +++ b/src/feature_point_image.h @@ -61,11 +61,6 @@ class FeaturePointImage : public FeatureBase measurement_(1) = Scalar(_keypoint.pt.y); } - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - */ virtual ~FeaturePointImage(); const cv::KeyPoint& getKeypoint() const; diff --git a/src/frame_imu.h b/src/frame_imu.h index 929a9c18a..babb5cd41 100644 --- a/src/frame_imu.h +++ b/src/frame_imu.h @@ -64,12 +64,6 @@ namespace wolf { * \param _x state vector of size 16, organized as [position, quaternion, velocity, acc_bias, gyro_bias] **/ FrameIMU(const FrameKeyType & _tp, const TimeStamp& _ts, const Eigen::VectorXs& _x); - - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~FrameIMU(); // Frame values ------------------------------------------------ diff --git a/src/landmark_container.h b/src/landmark_container.h index 171c973e3..385292ebd 100644 --- a/src/landmark_container.h +++ b/src/landmark_container.h @@ -72,11 +72,6 @@ class LandmarkContainer : public LandmarkBase **/ //LandmarkContainer(StateBlock* _p_ptr, StateBlock* _o_ptr, LandmarkCorner2D* _corner_A_ptr, LandmarkCorner2D* _corner_B_ptr, LandmarkCorner2D* _corner_C_ptr, LandmarkCorner2D* _corner_D_ptr, const Scalar& _witdh=2.44, const Scalar& _length=12.2); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~LandmarkContainer(); /** \brief Returns the container width diff --git a/src/landmark_corner_2D.h b/src/landmark_corner_2D.h index 4c7b16d4e..b95eb5338 100644 --- a/src/landmark_corner_2D.h +++ b/src/landmark_corner_2D.h @@ -26,11 +26,6 @@ class LandmarkCorner2D : public LandmarkBase **/ LandmarkCorner2D(StateBlock* _p_ptr, StateBlock* _o_ptr, const Scalar& _aperture=0); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~LandmarkCorner2D(); /** \brief Returns aperture diff --git a/src/landmark_line_2D.h b/src/landmark_line_2D.h index 8a016eeff..ab30bf7d1 100644 --- a/src/landmark_line_2D.h +++ b/src/landmark_line_2D.h @@ -32,11 +32,6 @@ class LandmarkLine2D : public LandmarkBase **/ LandmarkLine2D(StateBlock* _p_ptr, Eigen::Vector3s & _point1, Eigen::Vector3s & _point2); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~LandmarkLine2D(); /** \brief Line segment update diff --git a/src/sensor_camera.h b/src/sensor_camera.h index 58e700e60..433155286 100644 --- a/src/sensor_camera.h +++ b/src/sensor_camera.h @@ -40,11 +40,6 @@ class SensorCamera : public SensorBase SensorCamera(const Eigen::VectorXs & _extrinsics, const std::shared_ptr<IntrinsicsCamera> _intrinsics_ptr); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~SensorCamera(); Eigen::VectorXs getDistortionVector(){return distortion_;} diff --git a/src/sensor_gps.h b/src/sensor_gps.h index 495599fc0..b9a328798 100644 --- a/src/sensor_gps.h +++ b/src/sensor_gps.h @@ -41,10 +41,6 @@ public: StateBlock *getMapOPtr() const; - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - **/ virtual ~SensorGPS(); /** \brief Adds all StateBlocks of the frame to the Problem list of new StateBlocks diff --git a/src/sensor_gps_fix.h b/src/sensor_gps_fix.h index 8336e7fa5..afa5eb2cd 100644 --- a/src/sensor_gps_fix.h +++ b/src/sensor_gps_fix.h @@ -30,11 +30,6 @@ class SensorGPSFix : public SensorBase **/ SensorGPSFix(StateBlock* _p_ptr, StateBlock* _o_ptr, const double& _noise); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~SensorGPSFix(); /** \brief Returns noise standard deviation diff --git a/src/sensor_imu.h b/src/sensor_imu.h index f5463dd06..630d06753 100644 --- a/src/sensor_imu.h +++ b/src/sensor_imu.h @@ -29,11 +29,6 @@ class SensorIMU : public SensorBase **/ SensorIMU(StateBlock* _p_ptr, StateBlock* _o_ptr, StateBlock* _a_w_biases_ptr = nullptr); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~SensorIMU(); public: diff --git a/src/sensor_laser_2D.h b/src/sensor_laser_2D.h index 8020f8962..4711f9674 100644 --- a/src/sensor_laser_2D.h +++ b/src/sensor_laser_2D.h @@ -48,11 +48,6 @@ class SensorLaser2D : public SensorBase **/ SensorLaser2D(StateBlock* _p_ptr, StateBlock* _o_ptr, const laserscanutils::LaserScanParams& _params); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~SensorLaser2D(); void setDefaultScanParams(); diff --git a/src/sensor_odom_2D.h b/src/sensor_odom_2D.h index 99dec762f..36a542120 100644 --- a/src/sensor_odom_2D.h +++ b/src/sensor_odom_2D.h @@ -32,11 +32,6 @@ class SensorOdom2D : public SensorBase **/ SensorOdom2D(StateBlock* _p_ptr, StateBlock* _o_ptr, const Scalar& _disp_noise_factor, const Scalar& _rot_noise_factor); - /** \brief Default destructor (not recommended) - * - * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity) - * - **/ virtual ~SensorOdom2D(); /** \brief Returns displacement noise factor -- GitLab