diff --git a/owlps-positioner/fbcm.cc b/owlps-positioner/fbcm.cc index 8531163..c1dff3f 100644 --- a/owlps-positioner/fbcm.cc +++ b/owlps-positioner/fbcm.cc @@ -31,7 +31,7 @@ Result FBCM::compute(const Request &_request) float FBCM::estimate_distance(const Measurement &measurement) { double constant_term = make_constant_term(measurement) ; - const float &average_dbm = measurement.get_average_dbm() ; + float average_dbm = measurement.get_average_dbm() ; const CapturePoint *cp = measurement.get_cp() ; return pow(10, (constant_term - average_dbm) / (10 * friis_index(cp))) ; diff --git a/owlps-positioner/frbhmbasic.cc b/owlps-positioner/frbhmbasic.cc index 3da861c..44869e6 100644 --- a/owlps-positioner/frbhmbasic.cc +++ b/owlps-positioner/frbhmbasic.cc @@ -39,7 +39,7 @@ Result FRBHMBasic::compute(const Request &_request) float FRBHMBasic::estimate_distance(const Measurement &measurement) { double constant_term = make_constant_term(measurement) ; - const float &average_dbm = measurement.get_average_dbm() ; + float average_dbm = measurement.get_average_dbm() ; const CapturePoint *cp = measurement.get_cp() ; return pow(10, (constant_term - average_dbm) / (10 * friis_index(cp))) ; diff --git a/owlps-positioner/interlinknetworks.cc b/owlps-positioner/interlinknetworks.cc index 4dc889b..db1ae78 100644 --- a/owlps-positioner/interlinknetworks.cc +++ b/owlps-positioner/interlinknetworks.cc @@ -20,6 +20,6 @@ float InterlinkNetworks:: estimate_distance(const Measurement &measurement) { double constant_term = make_constant_term(measurement) ; - const float &average_dbm = measurement.get_average_dbm() ; + float average_dbm = measurement.get_average_dbm() ; return pow(10, (constant_term - average_dbm) / 35) ; } diff --git a/owlps-positioner/measurement.hh b/owlps-positioner/measurement.hh index 58c0970..86c7d29 100644 --- a/owlps-positioner/measurement.hh +++ b/owlps-positioner/measurement.hh @@ -117,11 +117,11 @@ public: /// Computes the distance to another Measurement's SS average float ss_square_distance(const Measurement &source) const ; /// Computes the distance to another SS value (in dBm) - float ss_square_distance(const float &ss_dbm) const ; + float ss_square_distance(const float ss_dbm) const ; /// Computes the distance to another Measurement's variance (mW) float variance_mw_square_distance(const Measurement &source) const ; /// Computes the distance to another variance value in mW - float variance_mw_square_distance(const float &var) const ; + float variance_mw_square_distance(const float var) const ; //@} /** @name Operators */ @@ -204,7 +204,7 @@ ss_square_distance(const Measurement &source) const } -inline float Measurement::ss_square_distance(const float &ss_dbm) const +inline float Measurement::ss_square_distance(const float ss_dbm) const { return ((ss_dbm - average_dbm) * (ss_dbm - average_dbm)) ; } @@ -218,7 +218,7 @@ variance_mw_square_distance(const Measurement &source) const inline float Measurement:: -variance_mw_square_distance(const float &var) const +variance_mw_square_distance(const float var) const { return ((var - variance_mw) * (var - variance_mw)) ; } diff --git a/owlps-positioner/mobile.hh b/owlps-positioner/mobile.hh index 1e7f310..7ef1444 100644 --- a/owlps-positioner/mobile.hh +++ b/owlps-positioner/mobile.hh @@ -28,8 +28,8 @@ class Mobile: public WifiDevice public: Mobile(const std::string &_ip_addr = "", const std::string &_mac_addr = "", - const float &_antenna_gain = MOBILE_DEFAULT_ANTENNA_GAIN, - const float &_trx_power = WIFIDEVICE_DEFAULT_TRX_POWER): + const float _antenna_gain = MOBILE_DEFAULT_ANTENNA_GAIN, + const float _trx_power = WIFIDEVICE_DEFAULT_TRX_POWER): WifiDevice(_ip_addr, _mac_addr, _antenna_gain, _trx_power) {} Mobile(const WifiDevice &wd): diff --git a/owlps-positioner/posutil.cc b/owlps-positioner/posutil.cc index 79755cb..74efcdd 100644 --- a/owlps-positioner/posutil.cc +++ b/owlps-positioner/posutil.cc @@ -29,13 +29,13 @@ using namespace std ; /* *** Maths *** */ -double PosUtil::deg2rad(const double °rees) +double PosUtil::deg2rad(const double degrees) { return degrees / (180.0 / M_PI) ; } -double PosUtil::rad2deg(const double &radians) +double PosUtil::rad2deg(const double radians) { return radians * (180.0 / M_PI) ; } diff --git a/owlps-positioner/posutil.hh b/owlps-positioner/posutil.hh index 4bc66cb..2438b53 100644 --- a/owlps-positioner/posutil.hh +++ b/owlps-positioner/posutil.hh @@ -37,9 +37,9 @@ public: /** @name Maths */ //@{ /// Returns the radian value of `degrees` - static double deg2rad(const double °rees) ; + static double deg2rad(const double degrees) ; /// Returns the degree value of `radians` - static double rad2deg(const double &radians) ; + static double rad2deg(const double radians) ; /// Checks if `value` is in the interval [center-width;center+width] static bool is_in_interval(const float center, const float bound, const float value) ; diff --git a/owlps-positioner/referencepoint.cc b/owlps-positioner/referencepoint.cc index b898295..08138d6 100644 --- a/owlps-positioner/referencepoint.cc +++ b/owlps-positioner/referencepoint.cc @@ -262,10 +262,10 @@ friis_index_for_cp(const string &cp_mac) const * @returns The sum of all Friis indexes for the CapturePoint. * @returns 0 if the CP is unknown at this ReferencePoint. */ -float ReferencePoint::friis_indexes_for_cp( - const CapturePoint &cp, - const double &const_term, - int &nb_indexes) const +float ReferencePoint:: +friis_indexes_for_cp(const CapturePoint &cp, + const double const_term, + int &nb_indexes) const { nb_indexes = 0 ; double friis_idx_sum = 0 ; diff --git a/owlps-positioner/referencepoint.hh b/owlps-positioner/referencepoint.hh index 1361b63..4d1a26e 100644 --- a/owlps-positioner/referencepoint.hh +++ b/owlps-positioner/referencepoint.hh @@ -45,9 +45,9 @@ protected: //@} public: - ReferencePoint(const float &_x = 0, - const float &_y = 0, - const float &_z = 0): Point3D(_x, _y, _z) {} + ReferencePoint(const float _x = 0, + const float _y = 0, + const float _z = 0): Point3D(_x, _y, _z) {} ReferencePoint(const Point3D &p): Point3D(p) {} @@ -86,9 +86,9 @@ public: /// Computes the Friis index for the given CapturePoint float friis_index_for_cp(const std::string &cp_mac) const ; /// Computes the Friis indexes sum for the given CapturePoint - float friis_indexes_for_cp( - const CapturePoint &cp, const double &const_term, - int &nb_indexes) const ; + float friis_indexes_for_cp(const CapturePoint &cp, + const double const_term, + int &nb_indexes) const ; /// Computes the Friis index for the given CapturePoint and packet ID float friis_index_for_cp( const std::string &cp_mac, const pkt_id_t pkt_id) const ; diff --git a/owlps-positioner/waypoint.cc b/owlps-positioner/waypoint.cc index 681231f..d8ed1e2 100644 --- a/owlps-positioner/waypoint.cc +++ b/owlps-positioner/waypoint.cc @@ -32,8 +32,8 @@ using namespace std ; * @param _z Z coordinate. */ Waypoint::Waypoint(Building *const _b, - const float &_x, const float &_y, const float &_z - ): Point3D(_x, _y, _z) + const float _x, const float _y, const float _z): + Point3D(_x, _y, _z) { if (_b != NULL) buildings.insert(_b) ; diff --git a/owlps-positioner/waypoint.hh b/owlps-positioner/waypoint.hh index 5b29d07..5004637 100644 --- a/owlps-positioner/waypoint.hh +++ b/owlps-positioner/waypoint.hh @@ -37,8 +37,8 @@ protected: std::unordered_set buildings ; public: - Waypoint(Building *const _b = NULL, const float &_x = 0, - const float &_y = 0, const float &_z = 0) ; + Waypoint(Building *const _b = NULL, const float _x = 0, + const float _y = 0, const float _z = 0) ; Waypoint(Building *const _b, const Point3D &p) ;