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

[Positioning] InputCSV: Fix CalibrationRequest handling 

We now consider a Request as a CalibrationRequest if the Direction field
is valid. We do not take care of the position fields any more.
This commit is contained in:
Matteo Cypriani 2010-06-08 15:18:21 +02:00
parent 92bb12bfe3
commit d7973a3ef0
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
owlps-positioning/src/inputcsv.cc
View File

@ -54,19 +54,14 @@ const Request& InputCSV::get_next_request()
current_request->set_time_sent(Timestamp(timestamp_ms)) ;
// Read position fields
bool is_calibration_request = false ;
float pos[3] ;
for (int i = 0 ; i < 3 ; ++i)
{
if (! file.read_field(pos[i]))
{
// Wrong number of fields: blank current request
current_request->clear() ;
return *current_request ;
}
if (pos[i] != 0)
is_calibration_request = true ;
}
if (! file.read_field(pos[i]))
{
// Wrong number of fields: blank current request
current_request->clear() ;
return *current_request ;
}
// Read direction field
Direction direction ;
@ -78,10 +73,7 @@ const Request& InputCSV::get_next_request()
return *current_request ;
}
if (direction_int != 0)
{
is_calibration_request = true ;
direction = direction_int ;
}
direction = direction_int ;
// Reading {MAC_AP;SS} couples
unordered_map<string, Measurement> measurements ;
@ -103,7 +95,8 @@ const Request& InputCSV::get_next_request()
current_request->set_measurements(measurements) ;
if (is_calibration_request)
// If the direction is valid, it means we have a CalibrationRequest
if (direction)
{
current_request_to_calibration_request() ;
CalibrationRequest *request =