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

[Positioner] Rename single-packet option 

Option positioning.generate-single-packet-reference-points becomes
positioning.generate-multi-packet-reference-points. The default is still
true, which means the default behaviour changed.
This commit is contained in:
Matteo Cypriani 2012-05-31 20:18:49 +02:00
parent 573cb2f256
commit b6f167c549
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
owlps-positioner/cfg/owlps-positioner.conf
View File

@ -123,11 +123,14 @@ csv-file = /tmp/owlps-positioner.log
# received. # received.
#generate-reference-points = false #generate-reference-points = false
# With this option enabled, each generated reference point will contain # With this option disabled, each generated reference point contains
# a single packet in a single calibration request. This is the default. # a single packet in a single calibration request, computed from the
# If disabled, the generated reference points will contain a series of # mean of the real measurements.
# packets, better matching the real requests. # If enabled, the generated reference points will contain a series of
#generate-single-packet-reference-points = true # packets, better matching the real requests; if no packet ID from the
# real requests match, a single packet reference point is generated
# instead. Default is enabled.
#generate-multi-packet-reference-points = true
# When the above option is activated, the reference points are generated # When the above option is activated, the reference points are generated
# with the specified distance (in meters) between one another, in the X # with the specified distance (in meters) between one another, in the X

6
owlps-positioner/src/autocalibration.cc
View File

@ -234,10 +234,10 @@ void Autocalibration::weight_2_aps()
void Autocalibration::compute_ss() void Autocalibration::compute_ss()
{ {
if (Configuration:: if (Configuration::
bool_value("positioning.generate-single-packet-reference-points")) bool_value("positioning.generate-multi-packet-reference-points"))
compute_single_packet_ss(0) ;
else
compute_multi_packet_ss() ; compute_multi_packet_ss() ;
else
compute_single_packet_ss(0) ;
} }

7
owlps-positioner/src/userinterface.cc
View File

@ -247,10 +247,11 @@ void UserInterface::fill_positioning_options()
po::value<bool>()->default_value(false), po::value<bool>()->default_value(false),
"Generate reference points from the (auto)calibration requests" "Generate reference points from the (auto)calibration requests"
" received.") " received.")
("positioning.generate-single-packet-reference-points", ("positioning.generate-multi-packet-reference-points",
po::value<bool>()->default_value(true), po::value<bool>()->default_value(true),
"Generate only one packet per reference point, instead of trying to" "Generate several packets per reference point by trying to match the"
" match the packets in the real requests.") " packets in the real requests. If false, the SS values of the"
" requests are averaged and only one packet is generated.")
("positioning.generated-meshing-grain-x", ("positioning.generated-meshing-grain-x",
po::value<float>()->default_value(DEFAULT_MESHING_GRAIN), po::value<float>()->default_value(DEFAULT_MESHING_GRAIN),
"When generating reference points, this distance (in meters) will" "When generating reference points, this distance (in meters) will"