Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2015-12-24 19:06:31 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:03:18 +0300
commitb4474785425db53dc184cdc5a171baadc5af34dc (patch)
treebd4908bd7ce825dd0402037d16666c1d39f098b9 /geometry
parent9911aa68bde74ac519389f0cb128adff43cf4957 (diff)
Review fixes.
Diffstat (limited to 'geometry')
-rw-r--r--geometry/geometry_tests/robust_test.cpp8
-rw-r--r--geometry/robust_orientation.cpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/geometry/geometry_tests/robust_test.cpp b/geometry/geometry_tests/robust_test.cpp
index 0eb3d79091..f0ed0c2e19 100644
--- a/geometry/geometry_tests/robust_test.cpp
+++ b/geometry/geometry_tests/robust_test.cpp
@@ -8,26 +8,26 @@ using namespace m2::robust;
namespace
{
- typedef m2::PointD P;
+ using P = m2::PointD;
template <typename IterT> void CheckSelfIntersections(IterT beg, IterT end, bool res)
{
TEST_EQUAL(CheckPolygonSelfIntersections(beg, end), res, ());
- typedef std::reverse_iterator<IterT> ReverseIterT;
+ using ReverseIterT = reverse_iterator<IterT>;
TEST_EQUAL(CheckPolygonSelfIntersections(ReverseIterT(end), ReverseIterT(beg)), res, ());
}
}
UNIT_TEST(OrientedS_Smoke)
{
- m2::PointD arr[] = {{-1, -1}, {0, 0}, {1, -1}};
+ P arr[] = {{-1, -1}, {0, 0}, {1, -1}};
TEST(OrientedS(arr[0], arr[2], arr[1]) > 0, ());
TEST(OrientedS(arr[2], arr[0], arr[1]) < 0, ());
}
UNIT_TEST(Triangle_Smoke)
{
- m2::PointD arr[] = {{0, 0}, {0, 3}, {3, 0}};
+ P arr[] = {{0, 0}, {0, 3}, {3, 0}};
TEST(IsPointInsideTriangle(arr[0], arr[0], arr[1], arr[2]), ());
TEST(IsPointInsideTriangle(arr[1], arr[0], arr[1], arr[2]), ());
diff --git a/geometry/robust_orientation.cpp b/geometry/robust_orientation.cpp
index 98987e5096..38e1608799 100644
--- a/geometry/robust_orientation.cpp
+++ b/geometry/robust_orientation.cpp
@@ -50,15 +50,15 @@ namespace m2 { namespace robust
return OrientedS(vPrev, vNext, v1) > 0.0;
}
- if (cpLR < 0)
+ if (cpLR < 0.0)
{
// vertex is concave
- return OrientedS(v, vPrev, v1) < 0 && OrientedS(v, vNext, v1) > 0.0;
+ return OrientedS(v, vPrev, v1) < 0.0 && OrientedS(v, vNext, v1) > 0.0;
}
else
{
// vertex is convex
- return OrientedS(v, vPrev, v1) < 0 || OrientedS(v, vNext, v1) > 0.0;
+ return OrientedS(v, vPrev, v1) < 0.0 || OrientedS(v, vNext, v1) > 0.0;
}
}