forked from organicmaps/organicmaps
git-clang-format
This commit is contained in:
Vladimir Byko-Ianko
mpimenov
parent
9d6c992117
commit
d0a304286f
7 changed files with 57 additions and 50 deletions
|
|
@ -55,13 +55,17 @@ location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
|
|||
LinearExtrapolator e(timeBetweenPointsMs, timeAfterPoint2Ms);
|
||||
|
||||
result.m_timestamp += static_cast<double>(timeAfterPoint2Ms) / 1000.0;
|
||||
result.m_longitude = my::clamp(e.Extrapolate(gpsInfo1.m_longitude, gpsInfo2.m_longitude), -180.0, 180.0);
|
||||
result.m_latitude = my::clamp(e.Extrapolate(gpsInfo1.m_latitude, gpsInfo2.m_latitude), -90.0, 90.0);
|
||||
result.m_horizontalAccuracy = e.Extrapolate(gpsInfo1.m_horizontalAccuracy, gpsInfo2.m_horizontalAccuracy);
|
||||
result.m_longitude =
|
||||
my::clamp(e.Extrapolate(gpsInfo1.m_longitude, gpsInfo2.m_longitude), -180.0, 180.0);
|
||||
result.m_latitude =
|
||||
my::clamp(e.Extrapolate(gpsInfo1.m_latitude, gpsInfo2.m_latitude), -90.0, 90.0);
|
||||
result.m_horizontalAccuracy =
|
||||
e.Extrapolate(gpsInfo1.m_horizontalAccuracy, gpsInfo2.m_horizontalAccuracy);
|
||||
result.m_altitude = e.Extrapolate(gpsInfo1.m_altitude, gpsInfo2.m_altitude);
|
||||
|
||||
if (gpsInfo1.HasVerticalAccuracy() && gpsInfo2.HasVerticalAccuracy())
|
||||
result.m_verticalAccuracy = e.Extrapolate(gpsInfo1.m_verticalAccuracy, gpsInfo2.m_verticalAccuracy);
|
||||
result.m_verticalAccuracy =
|
||||
e.Extrapolate(gpsInfo1.m_verticalAccuracy, gpsInfo2.m_verticalAccuracy);
|
||||
|
||||
// @TODO(bykoianko) Now |result.m_bearing == gpsInfo2.m_bearing|.
|
||||
// In case of |gpsInfo1.HasBearing() && gpsInfo2.HasBearing() == true|
|
||||
|
|
@ -96,11 +100,12 @@ bool AreCoordsGoodForExtrapolation(location::GpsInfo const & beforeLastGpsInfo,
|
|||
distM * (Extrapolator::kMaxExtrapolationTimeMs / 1000.0) / timeS;
|
||||
// |maxDistForAllExtrapolationsM| is maximum possible distance from |lastGpsInfo| to
|
||||
// all extrapolated points in any cases.
|
||||
double const maxDistForAllExtrapolationsM = kMaxExtrapolationSpeedMPS / kMaxExtrapolationTimeSeconds;
|
||||
double const maxDistForAllExtrapolationsM =
|
||||
kMaxExtrapolationSpeedMPS / kMaxExtrapolationTimeSeconds;
|
||||
double const distLastToMeridian180 = ms::DistanceOnEarth(
|
||||
lastGpsInfo.m_latitude, lastGpsInfo.m_longitude, lastGpsInfo.m_latitude, 180.0 /* lon2Deg */);
|
||||
// Switching off extrapolation if |lastGpsInfo| are so close to meridian 180 that extrapolated points
|
||||
// may cross meridian 180 or if |beforeLastGpsInfo| and |lastGpsInfo| are located on
|
||||
// Switching off extrapolation if |lastGpsInfo| are so close to meridian 180 that extrapolated
|
||||
// points may cross meridian 180 or if |beforeLastGpsInfo| and |lastGpsInfo| are located on
|
||||
// different sides of meridian 180.
|
||||
if (distLastToMeridian180 < maxDistAfterExtrapolationM ||
|
||||
(distLastToMeridian180 < maxDistForAllExtrapolationsM &&
|
||||
|
|
@ -113,9 +118,9 @@ bool AreCoordsGoodForExtrapolation(location::GpsInfo const & beforeLastGpsInfo,
|
|||
return false;
|
||||
}
|
||||
|
||||
// Note. |timeS| may be less than zero. (beforeLastGpsInfo.m_timestampS >= lastGpsInfo.m_timestampS)
|
||||
// It may happen in rare cases because GpsInfo::m_timestampS is not monotonic generally.
|
||||
// Please see comment in declaration of class GpsInfo for details.
|
||||
// Note. |timeS| may be less than zero. (beforeLastGpsInfo.m_timestampS >=
|
||||
// lastGpsInfo.m_timestampS) It may happen in rare cases because GpsInfo::m_timestampS is not
|
||||
// monotonic generally. Please see comment in declaration of class GpsInfo for details.
|
||||
|
||||
// @TODO(bykoianko) Switching off extrapolation based on acceleration should be implemented.
|
||||
// Switching off extrapolation based on speed, distance and time.
|
||||
|
|
@ -174,9 +179,8 @@ void Extrapolator::ExtrapolatedLocationUpdate(uint64_t extrapolatedUpdateCounter
|
|||
|
||||
if (gpsInfo.IsValid())
|
||||
{
|
||||
GetPlatform().RunTask(Platform::Thread::Gui, [this, gpsInfo]() {
|
||||
m_extrapolatedLocationUpdate(gpsInfo);
|
||||
});
|
||||
GetPlatform().RunTask(Platform::Thread::Gui,
|
||||
[this, gpsInfo]() { m_extrapolatedLocationUpdate(gpsInfo); });
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "3party/gflags/src/gflags/gflags_declare.h"
|
||||
#include "3party/gflags/src/gflags/gflags.h"
|
||||
#include "3party/gflags/src/gflags/gflags_declare.h"
|
||||
|
||||
// This tool is written to estimate quality of location extrapolation. To launch the benchmark
|
||||
// you need tracks in csv file with the format described below. To generate the csv file
|
||||
|
|
@ -45,9 +45,7 @@ namespace
|
|||
struct GpsPoint
|
||||
{
|
||||
GpsPoint(double timestampS, double lat, double lon)
|
||||
: m_timestampS(timestampS)
|
||||
, m_lat(lat)
|
||||
, m_lon(lon)
|
||||
: m_timestampS(timestampS), m_lat(lat), m_lon(lon)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -132,8 +130,8 @@ bool GetGpsPoint(istringstream & lineStream, uint64_t & timestampS, double & lat
|
|||
/// \brief Fills |tracks| based on file |pathToCsv| content. File |pathToCsv| should be
|
||||
/// a text file with following lines:
|
||||
/// <Mwm name (country id)>, <Aloha id>,
|
||||
/// <Latitude of the first point>, <Longitude of the first point>, <Timestamp in seconds of the first point>,
|
||||
/// <Latitude of the second point> and so on.
|
||||
/// <Latitude of the first point>, <Longitude of the first point>, <Timestamp in seconds of the
|
||||
/// first point>, <Latitude of the second point> and so on.
|
||||
bool Parse(string const & pathToCsv, Tracks & tracks)
|
||||
{
|
||||
tracks.clear();
|
||||
|
|
@ -147,8 +145,8 @@ bool Parse(string const & pathToCsv, Tracks & tracks)
|
|||
{
|
||||
istringstream lineStream(line);
|
||||
string dummy;
|
||||
GetString(lineStream, dummy); // mwm id
|
||||
GetString(lineStream, dummy); // aloha id
|
||||
GetString(lineStream, dummy); // mwm id
|
||||
GetString(lineStream, dummy); // aloha id
|
||||
|
||||
Track track;
|
||||
while (!lineStream.eof())
|
||||
|
|
@ -174,10 +172,11 @@ void GpsPointToGpsInfo(GpsPoint const gpsPoint, GpsInfo & gpsInfo)
|
|||
gpsInfo.m_latitude = gpsPoint.m_lat;
|
||||
gpsInfo.m_longitude = gpsPoint.m_lon;
|
||||
}
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
/// \brief This benchmark is written to estimate how LinearExtrapolation() extrapolates real users tracks.
|
||||
/// The idea behind the test is to measure the distance between extrapolated location and real track.
|
||||
/// \brief This benchmark is written to estimate how LinearExtrapolation() extrapolates real users
|
||||
/// tracks. The idea behind the test is to measure the distance between extrapolated location and
|
||||
/// real track.
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
google::SetUsageMessage(
|
||||
|
|
@ -194,7 +193,8 @@ int main(int argc, char * argv[])
|
|||
Tracks tracks;
|
||||
if (!Parse(FLAGS_csv_path, tracks))
|
||||
{
|
||||
LOG(LERROR, ("An error while parsing", FLAGS_csv_path, "file. Please check if it has a correct format."));
|
||||
LOG(LERROR, ("An error while parsing", FLAGS_csv_path,
|
||||
"file. Please check if it has a correct format."));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -216,8 +216,8 @@ int main(int argc, char * argv[])
|
|||
}
|
||||
|
||||
LOG(LINFO, ("General tracks statistics."
|
||||
"\n Number of tracks:", tracks.size(),
|
||||
"\n Number of track points:", trackPointNum,
|
||||
"\n Number of tracks:",
|
||||
tracks.size(), "\n Number of track points:", trackPointNum,
|
||||
"\n Average points per track:", trackPointNum / tracks.size(),
|
||||
"\n Average track length:", trackLengths / tracks.size(), "meters"));
|
||||
|
||||
|
|
@ -262,7 +262,8 @@ int main(int argc, char * argv[])
|
|||
timeMs += Extrapolator::kExtrapolationPeriodMs)
|
||||
{
|
||||
GpsInfo const extrapolated = LinearExtrapolation(info1, info2, timeMs);
|
||||
m2::PointD const extrapolatedMerc = MercatorBounds::FromLatLon(extrapolated.m_latitude, extrapolated.m_longitude);
|
||||
m2::PointD const extrapolatedMerc =
|
||||
MercatorBounds::FromLatLon(extrapolated.m_latitude, extrapolated.m_longitude);
|
||||
|
||||
// To generate |posSquare| the method below requires the size of half square in meters.
|
||||
// This constant is chosen based on maximum value of GpsInfo::m_horizontalAccuracy
|
||||
|
|
@ -308,17 +309,19 @@ int main(int argc, char * argv[])
|
|||
}
|
||||
|
||||
CHECK_GREATER(extrapolationNumber, 0, ());
|
||||
LOG(LINFO, ("\n Processed", mes.Get()[0].GetCounter(), "points.\n",
|
||||
" ", mes.Get()[0].GetCounter() * extrapolationNumber, "extrapolations is calculated.\n",
|
||||
LOG(LINFO, ("\n Processed", mes.Get()[0].GetCounter(), "points.\n", " ",
|
||||
mes.Get()[0].GetCounter() * extrapolationNumber, "extrapolations is calculated.\n",
|
||||
" Projection is calculated for", projectionCounter, "extrapolations."));
|
||||
|
||||
LOG(LINFO, ("Cumulative moving average, variance and standard deviation for each extrapolation:"));
|
||||
LOG(LINFO,
|
||||
("Cumulative moving average, variance and standard deviation for each extrapolation:"));
|
||||
for (size_t i = 0; i < extrapolationNumber; ++i)
|
||||
{
|
||||
double const variance = squareMes.Get()[i].Get() - pow(mes.Get()[i].Get(), 2.0);
|
||||
LOG(LINFO, ("Extrapolation", i + 1, ",", Extrapolator::kExtrapolationPeriodMs * (i + 1),
|
||||
"seconds after point two. Cumulative moving average =", mes.Get()[i].Get(),
|
||||
"meters.", "Variance =", max(0.0, variance), ". Standard deviation =", sqrt(variance)));
|
||||
LOG(LINFO,
|
||||
("Extrapolation", i + 1, ",", Extrapolator::kExtrapolationPeriodMs * (i + 1),
|
||||
"seconds after point two. Cumulative moving average =", mes.Get()[i].Get(), "meters.",
|
||||
"Variance =", max(0.0, variance), ". Standard deviation =", sqrt(variance)));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ void TestGpsInfo(GpsInfo const & tested, GpsInfo const & expected)
|
|||
TEST_EQUAL(tested.m_source, expected.m_source, ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_latitude, expected.m_latitude, kEpsilon), ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_longitude, expected.m_longitude, kEpsilon), ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_horizontalAccuracy, expected.m_horizontalAccuracy, kEpsilon), ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_horizontalAccuracy, expected.m_horizontalAccuracy, kEpsilon),
|
||||
());
|
||||
TEST(my::AlmostEqualAbs(tested.m_altitude, expected.m_altitude, kEpsilon), ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_verticalAccuracy, expected.m_verticalAccuracy, kEpsilon), ());
|
||||
TEST(my::AlmostEqualAbs(tested.m_bearing, expected.m_bearing, kEpsilon), ());
|
||||
|
|
@ -127,32 +128,32 @@ UNIT_TEST(AreCoordsGoodForExtrapolation)
|
|||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, 10.0 /* lat */, -179.999997 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 10.0 /* lat */, -179.999999 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 10.0 /* lat */, -179.999999 /* lon */);
|
||||
TEST(!AreCoordsGoodForExtrapolation(loc1, loc2), ("Near meridian -180."));
|
||||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, 89.9997 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 89.9999 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 89.9999 /* lat */, -10.0 /* lon */);
|
||||
TEST(!AreCoordsGoodForExtrapolation(loc1, loc2), ("Close to North Pole."));
|
||||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, 89.9997 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 89.9998 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 89.9998 /* lat */, -10.0 /* lon */);
|
||||
TEST(AreCoordsGoodForExtrapolation(loc1, loc2), ("Close to North Pole but ok."));
|
||||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, -89.9997 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, -89.9999 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, -89.9999 /* lat */, -10.0 /* lon */);
|
||||
TEST(!AreCoordsGoodForExtrapolation(loc1, loc2), ("Close to South Pole."));
|
||||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, -89.9997 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, -89.9998 /* lat */, -10.0 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, -89.9998 /* lat */, -10.0 /* lon */);
|
||||
TEST(AreCoordsGoodForExtrapolation(loc1, loc2), ("Close to South Pole but ok."));
|
||||
}
|
||||
{
|
||||
GpsInfo const loc1 = GetGpsInfo(0.0 /* timestamp */, 10.0 /* lat */, -179.999997 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 10.0 /* lat */, -179.999998 /* lon */);
|
||||
GpsInfo const loc2 = GetGpsInfo(1.0 /* timestamp */, 10.0 /* lat */, -179.999998 /* lon */);
|
||||
TEST(AreCoordsGoodForExtrapolation(loc1, loc2), ("Near meridian -180 but ok."));
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -565,7 +565,8 @@ void RoutingManager::FollowRoute()
|
|||
return;
|
||||
|
||||
// Switching on the extrapolatior only for following mode in car and bicycle navigation.
|
||||
m_extrapolator.Enable(m_currentRouterType == RouterType::Vehicle || m_currentRouterType == RouterType::Bicycle);
|
||||
m_extrapolator.Enable(m_currentRouterType == RouterType::Vehicle ||
|
||||
m_currentRouterType == RouterType::Bicycle);
|
||||
m_delegate.OnRouteFollow(m_currentRouterType);
|
||||
|
||||
HideRoutePoint(RouteMarkType::Start);
|
||||
|
|
@ -1246,8 +1247,8 @@ void RoutingManager::OnExtrapolatedLocationUpdate(location::GpsInfo const & info
|
|||
m_gpsInfoCache = make_unique<location::GpsInfo>(gpsInfo);
|
||||
|
||||
auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
|
||||
m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo,
|
||||
m_routingSession.IsNavigable(), routeMatchingInfo);
|
||||
m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo, m_routingSession.IsNavigable(),
|
||||
routeMatchingInfo);
|
||||
|
||||
if (IsTrackingReporterEnabled())
|
||||
m_trackingReporter.AddLocation(gpsInfo, m_routingSession.MatchTraffic(routeMatchingInfo));
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ void Platform::RunThreads()
|
|||
ASSERT(!m_networkThread && !m_fileThread && !m_backgroundThread, ());
|
||||
m_networkThread = make_unique<base::WorkerThread>();
|
||||
m_fileThread = make_unique<base::WorkerThread>();
|
||||
m_backgroundThread = make_unique<base::WorkerThread>();
|
||||
m_backgroundThread = make_unique<base::WorkerThread>();
|
||||
}
|
||||
|
||||
string DebugPrint(Platform::EError err)
|
||||
|
|
|
|||
|
|
@ -296,9 +296,7 @@ public:
|
|||
case Thread::Gui:
|
||||
RunOnGuiThread(std::forward<Task>(task));
|
||||
break;
|
||||
case Thread::Background:
|
||||
m_backgroundThread->Push(std::forward<Task>(task));
|
||||
break;
|
||||
case Thread::Background: m_backgroundThread->Push(std::forward<Task>(task)); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ using namespace routing;
|
|||
using namespace std;
|
||||
using namespace storage;
|
||||
|
||||
void ParseTracks(string const & logFile, shared_ptr<NumMwmIds> & numMwmIds,
|
||||
Storage & storage, MwmToTracks & mwmToTracks)
|
||||
void ParseTracks(string const & logFile, shared_ptr<NumMwmIds> & numMwmIds, Storage & storage,
|
||||
MwmToTracks & mwmToTracks)
|
||||
{
|
||||
storage.RegisterAllLocalMaps(false /* enableDiffs */);
|
||||
numMwmIds = CreateNumMwmIds(storage);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue