diff options
| author | Maxim Pimenov <m@maps.me> | 2018-09-14 21:08:09 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-18 14:46:56 +0300 |
| commit | 412387c84eefba2ec4c267ee2748bf78f03ce327 (patch) | |
| tree | 8d79b6b480fb91a5458a21aec10ac689de54db9f /traffic | |
| parent | bef147b46fb8fd5160fc8e3b13f3548906ae5ef7 (diff) | |
[base] Replaced the namespace my with base.
Diffstat (limited to 'traffic')
| -rw-r--r-- | traffic/pytraffic/bindings.cpp | 8 | ||||
| -rw-r--r-- | traffic/speed_groups.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/traffic/pytraffic/bindings.cpp b/traffic/pytraffic/bindings.cpp index 8408055859..d222412c6f 100644 --- a/traffic/pytraffic/bindings.cpp +++ b/traffic/pytraffic/bindings.cpp @@ -59,15 +59,15 @@ traffic::TrafficInfo::Coloring TransformToSpeedGroups(SegmentMapping const & seg double const ws = kv.second.m_weightedSpeed; double const wrs = kv.second.m_weightedRefSpeed; double const w = kv.second.m_weight; - if (my::AlmostEqualAbs(w, 0.0, kEps)) + if (base::AlmostEqualAbs(w, 0.0, kEps)) { LOG(LWARNING, ("A traffic segment has zero weight.")); continue; } double const u = ws / w; double const v = wrs / w; - bool const uz = my::AlmostEqualAbs(u, 0.0, kEps); - bool const vz = my::AlmostEqualAbs(v, 0.0, kEps); + bool const uz = base::AlmostEqualAbs(u, 0.0, kEps); + bool const vz = base::AlmostEqualAbs(v, 0.0, kEps); if (uz && vz) { result[kv.first] = traffic::SpeedGroup::TempBlock; @@ -80,7 +80,7 @@ traffic::TrafficInfo::Coloring TransformToSpeedGroups(SegmentMapping const & seg else { double p = 100.0 * u / v; - p = my::clamp(p, 0.0, 100.0); + p = base::clamp(p, 0.0, 100.0); result[kv.first] = traffic::GetSpeedGroupByPercentage(p); } } diff --git a/traffic/speed_groups.cpp b/traffic/speed_groups.cpp index a136e5721d..2083c696b3 100644 --- a/traffic/speed_groups.cpp +++ b/traffic/speed_groups.cpp @@ -10,7 +10,7 @@ uint32_t const kSpeedGroupThresholdPercentage[] = {8, 16, 33, 58, 83, 100, 100, SpeedGroup GetSpeedGroupByPercentage(double p) { - p = my::clamp(p, 0.0, 100.0); + p = base::clamp(p, 0.0, 100.0); SpeedGroup res = SpeedGroup::Unknown; for (int i = static_cast<int>(SpeedGroup::Count) - 1; i >= 0; --i) { |