[Positioning] Rename options minmax-* area-*
The options minmax-start and minmax-stop are also used by the autocalibration process to know in which area reference points must be generated. Therefore these options are renamed area-start and area-stop.
This commit is contained in:
parent
bf3a6eb661
commit
21c7f80345
|
@ -40,8 +40,6 @@
|
||||||
° Add the area to the result in OutputCSV.
|
° Add the area to the result in OutputCSV.
|
||||||
° When reading the APs, add them to the mobiles' list (or another
|
° When reading the APs, add them to the mobiles' list (or another
|
||||||
way to be able to have a single entry for an AP).
|
way to be able to have a single entry for an AP).
|
||||||
° Rename minmax-start & stop, since it is used elsewhere (grep
|
|
||||||
minmax-start).
|
|
||||||
° Review the option names & descriptions.
|
° Review the option names & descriptions.
|
||||||
° Add option positioning.self-calibrate (or autocalibrate), to
|
° Add option positioning.self-calibrate (or autocalibrate), to
|
||||||
activate automatically the options needed by the autocalibration.
|
activate automatically the options needed by the autocalibration.
|
||||||
|
|
|
@ -49,13 +49,16 @@ csv-file = /tmp/owlps-positioning.log
|
||||||
#algorithm = RADAR
|
#algorithm = RADAR
|
||||||
#algorithm = FRBHMBasic
|
#algorithm = FRBHMBasic
|
||||||
|
|
||||||
# Start and stop coordinates for the MinMax multilateration method.
|
# Coordinates of the deployment area.
|
||||||
|
# This is used to delimit the area in which reference points are
|
||||||
|
# generated (when generate-reference-points is activated), and also
|
||||||
|
# by the MinMax multilateration method.
|
||||||
# Since MinMax is currently the only multilateration method implemented
|
# Since MinMax is currently the only multilateration method implemented
|
||||||
# in OwlPS, you should define these parameters if you use any of the
|
# in OwlPS, you should define these parameters if you use any of the
|
||||||
# multilateration-based algorithms (InterlinkNetworks, FBCM, FRBHM).
|
# multilateration-based algorithms (InterlinkNetworks, FBCM, FRBHM).
|
||||||
# They are declared as strings (X;Y;Z). Do not quote!
|
# They are declared as strings (X;Y;Z). Do not quote!
|
||||||
#minmax-start = -2;-2;0
|
#area-start = -2;-2;0
|
||||||
#minmax-stop = 20;30;6
|
#area-stop = 20;30;6
|
||||||
|
|
||||||
# With the RADAR algorithm, for a given positioning request, average
|
# With the RADAR algorithm, for a given positioning request, average
|
||||||
# all the calibration requests associated with a reference point before
|
# all the calibration requests associated with a reference point before
|
||||||
|
|
|
@ -5,12 +5,17 @@
|
||||||
# handle it. Since none of them are currently implemented, you
|
# handle it. Since none of them are currently implemented, you
|
||||||
# probably can save a lot of time by skipping the topology (and
|
# probably can save a lot of time by skipping the topology (and
|
||||||
# waypoints) description.
|
# waypoints) description.
|
||||||
|
# However, you can describe areas if you want to know when the mobile
|
||||||
|
# is in a particular location. In that case be sure that the algorithm
|
||||||
|
# you use will be able to generate positions that match each described
|
||||||
|
# area (in particular, with RADAR, at least one reference point should
|
||||||
|
# be present in each area).
|
||||||
#
|
#
|
||||||
# ALSO IMPORTANT (EVEN IF YOU DON'T DESCRIBE THE TOPOLOGY):
|
# ALSO IMPORTANT (EVEN IF YOU DON'T DESCRIBE THE TOPOLOGY):
|
||||||
# If you use the MinMax multilateration method, you should provide
|
# If you use the MinMax multilateration method, or the autocalibration,
|
||||||
# minmax-start and minmax-stop parameters that match the deployment
|
# you must provide area-start and area-stop options that match the
|
||||||
# area. That is, the cuboid formed by these two points should include
|
# deployment area. That is, the cuboid formed by these two points
|
||||||
# the whole deployment area.
|
# should include the whole deployment area.
|
||||||
#
|
#
|
||||||
# This file lists the buildings and their "homogeneous areas" (rooms).
|
# This file lists the buildings and their "homogeneous areas" (rooms).
|
||||||
#
|
#
|
||||||
|
|
Can't render this file because it contains an unexpected character in line 20 and column 43.
|
|
@ -18,16 +18,16 @@ MultilaterationAlgorithm::MultilaterationAlgorithm():
|
||||||
// Will be changed when other multilateration methods will be
|
// Will be changed when other multilateration methods will be
|
||||||
// implemented.
|
// implemented.
|
||||||
|
|
||||||
if (! Configuration::is_configured("positioning.minmax-start") ||
|
if (! Configuration::is_configured("positioning.area-start") ||
|
||||||
! Configuration::is_configured("positioning.minmax-stop"))
|
! Configuration::is_configured("positioning.area-stop"))
|
||||||
throw missing_configuration(
|
throw missing_configuration(
|
||||||
"You want to use MinMax, but either positioning.minmax-start or"
|
"You want to use MinMax, but either positioning.area-start or"
|
||||||
" positioning.minmax-stop is not defined!") ;
|
" positioning.area-stop is not defined!") ;
|
||||||
|
|
||||||
Point3D minmax_start(
|
Point3D minmax_start(
|
||||||
Configuration::string_value("positioning.minmax-start")) ;
|
Configuration::string_value("positioning.area-start")) ;
|
||||||
Point3D minmax_stop(
|
Point3D minmax_stop(
|
||||||
Configuration::string_value("positioning.minmax-stop")) ;
|
Configuration::string_value("positioning.area-stop")) ;
|
||||||
|
|
||||||
multilateration_method = new MinMax(minmax_start, minmax_stop) ;
|
multilateration_method = new MinMax(minmax_start, minmax_stop) ;
|
||||||
}
|
}
|
||||||
|
|
|
@ -477,15 +477,15 @@ void Stock::regenerate_reference_points()
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Generate RPs */
|
/* Generate RPs */
|
||||||
if (! Configuration::is_configured("positioning.minmax-start") ||
|
if (! Configuration::is_configured("positioning.area-start") ||
|
||||||
! Configuration::is_configured("positioning.minmax-stop"))
|
! Configuration::is_configured("positioning.area-stop"))
|
||||||
throw missing_configuration(
|
throw missing_configuration(
|
||||||
"You must define the deployment area in order to generate"
|
"You must define the deployment area in order to generate"
|
||||||
" reference points.") ;
|
" reference points.") ;
|
||||||
Point3D start(
|
Point3D start(
|
||||||
Configuration::string_value("positioning.minmax-start")) ;
|
Configuration::string_value("positioning.area-start")) ;
|
||||||
Point3D stop(
|
Point3D stop(
|
||||||
Configuration::string_value("positioning.minmax-stop")) ;
|
Configuration::string_value("positioning.area-stop")) ;
|
||||||
float step_x =
|
float step_x =
|
||||||
Configuration::float_value("positioning.generated-meshing-grain-x") ;
|
Configuration::float_value("positioning.generated-meshing-grain-x") ;
|
||||||
float step_y =
|
float step_y =
|
||||||
|
|
|
@ -183,12 +183,15 @@ void UserInterface::fill_positioning_options()
|
||||||
"Algorithms used to compute positions. You can specify"
|
"Algorithms used to compute positions. You can specify"
|
||||||
"this option more than once (but at least once). Allowed: Real, FBCM,"
|
"this option more than once (but at least once). Allowed: Real, FBCM,"
|
||||||
" FRBHMBasic, InterlinkNetworks, RADAR.")
|
" FRBHMBasic, InterlinkNetworks, RADAR.")
|
||||||
("positioning.minmax-start", po::value<string>(),
|
("positioning.area-start", po::value<string>(),
|
||||||
"Coordinates of the start point of the MinMax multilateration"
|
"Coordinates of the first point of the deployment area; this is"
|
||||||
" method (string format: \"X;Y;Z\").")
|
" used to delimit the area in which the MinMax multilateration"
|
||||||
("positioning.minmax-stop", po::value<string>(),
|
" method tests points and in which the reference points are"
|
||||||
"Coordinates of the stop point of the MinMax multilateration"
|
" generated, if the corresponding options are activated"
|
||||||
" method (string format: \"X;Y;Z\").")
|
" (string format: \"X;Y;Z\").")
|
||||||
|
("positioning.area-stop", po::value<string>(),
|
||||||
|
"Coordinates of the last point of the deployment area"
|
||||||
|
" (string format: \"X;Y;Z\").")
|
||||||
("positioning.radar-average-reference-points",
|
("positioning.radar-average-reference-points",
|
||||||
po::value<bool>()->default_value(false),
|
po::value<bool>()->default_value(false),
|
||||||
"With the RADAR algorithm, for a given positioning request, average"
|
"With the RADAR algorithm, for a given positioning request, average"
|
||||||
|
|
Loading…
Reference in New Issue