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

A few old cosmetic changes

This commit is contained in:
Matteo Cypriani 2016-11-03 11:10:33 -04:00
parent c4f1ed82e6
commit 759db45a50
5 changed files with 775 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1522
doc/figures/positioner_class_diagram.uxf
View File

File diff suppressed because it is too large Load Diff

1
libowlps/libowlps.c
View File

@ -83,6 +83,7 @@ void owl_mac_bytes_to_string_r(const uint8_t *const mac_binary,
bool owl_mac_equals(const uint8_t *const mac1, bool owl_mac_equals(const uint8_t *const mac1,
const uint8_t *const mac2) const uint8_t *const mac2)
{ {
// TODO: we could use memcmp()
int i ; int i ;
for (i = ETHER_ADDR_LEN - 1 ; i >= 0 ; --i) for (i = ETHER_ADDR_LEN - 1 ; i >= 0 ; --i)
if(mac1[i] != mac2[i]) if(mac1[i] != mac2[i])

2
owlps-positioner/request.cc
View File

@ -257,7 +257,7 @@ ostream& operator<<(ostream &os, const Request &r)
<< " (received at " << r.time_received << "; " ; << " (received at " << r.time_received << "; " ;
if (r.real_position) if (r.real_position)
os << " Real coordinates : " << *r.real_position << "; " ; os << "Real coordinates: " << *r.real_position << "; " ;
// MAC address // MAC address
os << "Type: " << static_cast<uint_fast16_t>(r.type) os << "Type: " << static_cast<uint_fast16_t>(r.type)

8
owlps-positioner/stock.hh
View File

@ -86,7 +86,7 @@ public:
//@{ //@{
/// Returns the number of buildings /// Returns the number of buildings
static unsigned int nb_buildings(void) ; static unsigned int nb_buildings(void) ;
/// Reads the Building corresponding to a given name /// Returns the Building corresponding to a given name
static const Building& get_building(const std::string &name) ; static const Building& get_building(const std::string &name) ;
/// Searches for a Building and creates it if it does not exist /// Searches for a Building and creates it if it does not exist
static const Building& find_create_building(const std::string &name) ; static const Building& find_create_building(const std::string &name) ;
@ -117,7 +117,7 @@ public:
static unsigned int nb_mobiles(void) ; static unsigned int nb_mobiles(void) ;
/// Verify the existence of a mobile /// Verify the existence of a mobile
static bool mobile_exists(const std::string &mac) ; static bool mobile_exists(const std::string &mac) ;
/// Reads the Mobile corresponding to a given MAC address /// Returns the Mobile corresponding to a given MAC address
static const Mobile& get_mobile(const std::string &mac) ; static const Mobile& get_mobile(const std::string &mac) ;
/// Searches for a Mobile given its MAC address and creates it if it /// Searches for a Mobile given its MAC address and creates it if it
/// does not exist /// does not exist
@ -138,7 +138,7 @@ public:
std::unordered_map<std::string, CapturePoint>& get_cps(void) ; std::unordered_map<std::string, CapturePoint>& get_cps(void) ;
/// Verify the existence of a CP /// Verify the existence of a CP
static bool cp_exists(const std::string &mac) ; static bool cp_exists(const std::string &mac) ;
/// Reads the CapturePoint corresponding to a given MAC address /// Returns the CapturePoint corresponding to a given MAC address
static const CapturePoint& get_cp(const std::string &mac) ; static const CapturePoint& get_cp(const std::string &mac) ;
/// Searches for a CapturePoint given its MAC address and creates it /// Searches for a CapturePoint given its MAC address and creates it
/// if it does not exist /// if it does not exist
@ -166,7 +166,7 @@ public:
static unsigned int nb_reference_points(void) ; static unsigned int nb_reference_points(void) ;
/// Verify the existence of a reference point at the given coordinates /// Verify the existence of a reference point at the given coordinates
static bool reference_point_exists(const ReferencePoint &point) ; static bool reference_point_exists(const ReferencePoint &point) ;
/// Reads the ReferencePoint at the given coordinates /// Returns the ReferencePoint at the given coordinates
static const ReferencePoint& static const ReferencePoint&
get_reference_point(const ReferencePoint &point) ; get_reference_point(const ReferencePoint &point) ;
/// Searches for a ReferencePoint and adds it if it does not exist /// Searches for a ReferencePoint and adds it if it does not exist

4
scripts/owlps-aggsetcoord.pl
View File

@ -33,8 +33,8 @@ By default, B<owlps-aggsetcoord> uses the coordinates already present in the
input file (manually set by the user, most of the time) to interpolate the input file (manually set by the user, most of the time) to interpolate the
coordinates of lines containing default values. A given coordinate is coordinates of lines containing default values. A given coordinate is
interpolated according to the previous and next known coordinates and their interpolated according to the previous and next known coordinates and their
timestamps, assuming the mobile moves at a constant speed between two timestamps, assuming the mobile moves at a constant speed between two known
timestamps. The interpolation is done in 3 dimensions, each dimension being coordinates. The interpolation is done in 3 dimensions, each dimension being
interpolated independently. interpolated independently.
Alternatively, using the B<-c> option will disable interpolation but apply an Alternatively, using the B<-c> option will disable interpolation but apply an