mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Positioner] Don't pass primitive types const refs 

Quit using constant references function arguments  or return values for
primitive types.
This commit is contained in:
Matteo Cypriani 2013-10-02 14:50:39 -04:00
parent a495d51f02
commit 17dd3ee6bf
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owlps-positioner/fbcm.cc
View File

@ -31,7 +31,7 @@ Result FBCM::compute(const Request &_request)
float FBCM::estimate_distance(const Measurement &measurement) float FBCM::estimate_distance(const Measurement &measurement)
{ {
double constant_term = make_constant_term(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() ; const CapturePoint *cp = measurement.get_cp() ;
return pow(10, (constant_term - average_dbm) / return pow(10, (constant_term - average_dbm) /
(10 * friis_index(cp))) ; (10 * friis_index(cp))) ;

2
owlps-positioner/frbhmbasic.cc
View File

@ -39,7 +39,7 @@ Result FRBHMBasic::compute(const Request &_request)
float FRBHMBasic::estimate_distance(const Measurement &measurement) float FRBHMBasic::estimate_distance(const Measurement &measurement)
{ {
double constant_term = make_constant_term(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() ; const CapturePoint *cp = measurement.get_cp() ;
return pow(10, (constant_term - average_dbm) / return pow(10, (constant_term - average_dbm) /
(10 * friis_index(cp))) ; (10 * friis_index(cp))) ;

2
owlps-positioner/interlinknetworks.cc
View File

@ -20,6 +20,6 @@ float InterlinkNetworks::
estimate_distance(const Measurement &measurement) estimate_distance(const Measurement &measurement)
{ {
double constant_term = make_constant_term(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) ; return pow(10, (constant_term - average_dbm) / 35) ;
} }

8
owlps-positioner/measurement.hh
View File

@ -117,11 +117,11 @@ public:
/// Computes the distance to another Measurement's SS average /// Computes the distance to another Measurement's SS average
float ss_square_distance(const Measurement &source) const ; float ss_square_distance(const Measurement &source) const ;
/// Computes the distance to another SS value (in dBm) /// 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) /// Computes the distance to another Measurement's variance (mW)
float variance_mw_square_distance(const Measurement &source) const ; float variance_mw_square_distance(const Measurement &source) const ;
/// Computes the distance to another variance value in mW /// 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 */ /** @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)) ; return ((ss_dbm - average_dbm) * (ss_dbm - average_dbm)) ;
} }
@ -218,7 +218,7 @@ variance_mw_square_distance(const Measurement &source) const
inline float Measurement:: 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)) ; return ((var - variance_mw) * (var - variance_mw)) ;
} }

4
owlps-positioner/mobile.hh
View File

@ -28,8 +28,8 @@ class Mobile: public WifiDevice
public: public:
Mobile(const std::string &_ip_addr = "", Mobile(const std::string &_ip_addr = "",
const std::string &_mac_addr = "", const std::string &_mac_addr = "",
const float &_antenna_gain = MOBILE_DEFAULT_ANTENNA_GAIN, const float _antenna_gain = MOBILE_DEFAULT_ANTENNA_GAIN,
const float &_trx_power = WIFIDEVICE_DEFAULT_TRX_POWER): const float _trx_power = WIFIDEVICE_DEFAULT_TRX_POWER):
WifiDevice(_ip_addr, _mac_addr, _antenna_gain, _trx_power) {} WifiDevice(_ip_addr, _mac_addr, _antenna_gain, _trx_power) {}
Mobile(const WifiDevice &wd): Mobile(const WifiDevice &wd):

4
owlps-positioner/posutil.cc
View File

@ -29,13 +29,13 @@ using namespace std ;
/* *** Maths *** */ /* *** Maths *** */
double PosUtil::deg2rad(const double &degrees) double PosUtil::deg2rad(const double degrees)
{ {
return degrees / (180.0 / M_PI) ; return degrees / (180.0 / M_PI) ;
} }
double PosUtil::rad2deg(const double &radians) double PosUtil::rad2deg(const double radians)
{ {
return radians * (180.0 / M_PI) ; return radians * (180.0 / M_PI) ;
} }

4
owlps-positioner/posutil.hh
View File

@ -37,9 +37,9 @@ public:
/** @name Maths */ /** @name Maths */
//@{ //@{
/// Returns the radian value of `degrees` /// Returns the radian value of `degrees`
static double deg2rad(const double &degrees) ; static double deg2rad(const double degrees) ;
/// Returns the degree value of `radians` /// 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] /// Checks if `value` is in the interval [center-width;center+width]
static bool is_in_interval(const float center, const float bound, static bool is_in_interval(const float center, const float bound,
const float value) ; const float value) ;

8
owlps-positioner/referencepoint.cc
View File

@ -262,10 +262,10 @@ friis_index_for_cp(const string &cp_mac) const
* @returns The sum of all Friis indexes for the CapturePoint. * @returns The sum of all Friis indexes for the CapturePoint.
* @returns 0 if the CP is unknown at this ReferencePoint. * @returns 0 if the CP is unknown at this ReferencePoint.
*/ */
float ReferencePoint::friis_indexes_for_cp( float ReferencePoint::
const CapturePoint &cp, friis_indexes_for_cp(const CapturePoint &cp,
const double &const_term, const double const_term,
int &nb_indexes) const int &nb_indexes) const
{ {
nb_indexes = 0 ; nb_indexes = 0 ;
double friis_idx_sum = 0 ; double friis_idx_sum = 0 ;

12
owlps-positioner/referencepoint.hh
View File

@ -45,9 +45,9 @@ protected:
//@} //@}
public: public:
ReferencePoint(const float &_x = 0, ReferencePoint(const float _x = 0,
const float &_y = 0, const float _y = 0,
const float &_z = 0): Point3D(_x, _y, _z) {} const float _z = 0): Point3D(_x, _y, _z) {}
ReferencePoint(const Point3D &p): Point3D(p) {} ReferencePoint(const Point3D &p): Point3D(p) {}
@ -86,9 +86,9 @@ public:
/// Computes the Friis index for the given CapturePoint /// Computes the Friis index for the given CapturePoint
float friis_index_for_cp(const std::string &cp_mac) const ; float friis_index_for_cp(const std::string &cp_mac) const ;
/// Computes the Friis indexes sum for the given CapturePoint /// Computes the Friis indexes sum for the given CapturePoint
float friis_indexes_for_cp( float friis_indexes_for_cp(const CapturePoint &cp,
const CapturePoint &cp, const double &const_term, const double const_term,
int &nb_indexes) const ; int &nb_indexes) const ;
/// Computes the Friis index for the given CapturePoint and packet ID /// Computes the Friis index for the given CapturePoint and packet ID
float friis_index_for_cp( float friis_index_for_cp(
const std::string &cp_mac, const pkt_id_t pkt_id) const ; const std::string &cp_mac, const pkt_id_t pkt_id) const ;

4
owlps-positioner/waypoint.cc
View File

@ -32,8 +32,8 @@ using namespace std ;
* @param _z Z coordinate. * @param _z Z coordinate.
*/ */
Waypoint::Waypoint(Building *const _b, Waypoint::Waypoint(Building *const _b,
const float &_x, const float &_y, const float &_z const float _x, const float _y, const float _z):
): Point3D(_x, _y, _z) Point3D(_x, _y, _z)
{ {
if (_b != NULL) if (_b != NULL)
buildings.insert(_b) ; buildings.insert(_b) ;

4
owlps-positioner/waypoint.hh
View File

@ -37,8 +37,8 @@ protected:
std::unordered_set<Building*> buildings ; std::unordered_set<Building*> buildings ;
public: public:
Waypoint(Building *const _b = NULL, const float &_x = 0, Waypoint(Building *const _b = NULL, const float _x = 0,
const float &_y = 0, const float &_z = 0) ; const float _y = 0, const float _z = 0) ;
Waypoint(Building *const _b, const Point3D &p) ; Waypoint(Building *const _b, const Point3D &p) ;