diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-04-10 01:31:06 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:45:49 +0300 |
commit | df5b060bbcfa2b42226c942219adbdf46e57e5f8 (patch) | |
tree | 1c35c4f2c7e57d7f3ec7fe91a4d2589d658d9094 /geometry/geometry_tests | |
parent | 969071d1eea72b68d17abfd1d3651f221c9b7e51 (diff) |
Fix include path for geometry
Diffstat (limited to 'geometry/geometry_tests')
26 files changed, 96 insertions, 96 deletions
diff --git a/geometry/geometry_tests/angle_test.cpp b/geometry/geometry_tests/angle_test.cpp index 4e5e0f912c..54fd651a0d 100644 --- a/geometry/geometry_tests/angle_test.cpp +++ b/geometry/geometry_tests/angle_test.cpp @@ -1,12 +1,12 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "equality.hpp" +#include "geometry/geometry_tests/equality.hpp" -#include "../../base/macros.hpp" +#include "base/macros.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../angles.hpp" +#include "geometry/angles.hpp" using namespace test; diff --git a/geometry/geometry_tests/anyrect_test.cpp b/geometry/geometry_tests/anyrect_test.cpp index 9ae89d06b5..33f4323ca1 100644 --- a/geometry/geometry_tests/anyrect_test.cpp +++ b/geometry/geometry_tests/anyrect_test.cpp @@ -1,8 +1,8 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../any_rect2d.hpp" +#include "geometry/any_rect2d.hpp" -#include "../../std/cmath.hpp" +#include "std/cmath.hpp" UNIT_TEST(AnyRect_TestConvertTo) { diff --git a/geometry/geometry_tests/cellid_test.cpp b/geometry/geometry_tests/cellid_test.cpp index a664f33e9e..9910020b96 100644 --- a/geometry/geometry_tests/cellid_test.cpp +++ b/geometry/geometry_tests/cellid_test.cpp @@ -1,7 +1,7 @@ -#include "../../testing/testing.hpp" -#include "../cellid.hpp" -#include "../../std/algorithm.hpp" -#include "../../std/string.hpp" +#include "testing/testing.hpp" +#include "geometry/cellid.hpp" +#include "std/algorithm.hpp" +#include "std/string.hpp" UNIT_TEST(CellID_Parent) { diff --git a/geometry/geometry_tests/common_test.cpp b/geometry/geometry_tests/common_test.cpp index d6dc8cb4db..7ffbbb2af0 100644 --- a/geometry/geometry_tests/common_test.cpp +++ b/geometry/geometry_tests/common_test.cpp @@ -1,11 +1,11 @@ -#include "../../base/SRC_FIRST.hpp" -#include "../../base/macros.hpp" +#include "base/SRC_FIRST.hpp" +#include "base/macros.hpp" -#include "equality.hpp" +#include "geometry/geometry_tests/equality.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../rect2d.hpp" +#include "geometry/rect2d.hpp" using namespace test; diff --git a/geometry/geometry_tests/covering_test.cpp b/geometry/geometry_tests/covering_test.cpp index 4165134919..3872e6acda 100644 --- a/geometry/geometry_tests/covering_test.cpp +++ b/geometry/geometry_tests/covering_test.cpp @@ -1,9 +1,9 @@ -#include "../../testing/testing.hpp" -#include "../cellid.hpp" -#include "../covering.hpp" -#include "../covering_utils.hpp" -#include "../point2d.hpp" -#include "../../base/stl_add.hpp" +#include "testing/testing.hpp" +#include "geometry/cellid.hpp" +#include "geometry/covering.hpp" +#include "geometry/covering_utils.hpp" +#include "geometry/point2d.hpp" +#include "base/stl_add.hpp" // TODO: Add covering unit tests here. diff --git a/geometry/geometry_tests/distance_on_sphere_test.cpp b/geometry/geometry_tests/distance_on_sphere_test.cpp index f985fa53a1..ddb8739078 100644 --- a/geometry/geometry_tests/distance_on_sphere_test.cpp +++ b/geometry/geometry_tests/distance_on_sphere_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" -#include "../distance_on_sphere.hpp" -#include "../../base/math.hpp" +#include "testing/testing.hpp" +#include "geometry/distance_on_sphere.hpp" +#include "base/math.hpp" UNIT_TEST(DistanceOnSphere) { diff --git a/geometry/geometry_tests/distance_test.cpp b/geometry/geometry_tests/distance_test.cpp index 26d1a79f20..e3f23252a8 100644 --- a/geometry/geometry_tests/distance_test.cpp +++ b/geometry/geometry_tests/distance_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" -#include "../distance.hpp" -#include "../point2d.hpp" +#include "testing/testing.hpp" +#include "geometry/distance.hpp" +#include "geometry/point2d.hpp" template <class PointT> void FloatingPointsTest() diff --git a/geometry/geometry_tests/equality.hpp b/geometry/geometry_tests/equality.hpp index 90ed2fdd8b..02fee741e4 100644 --- a/geometry/geometry_tests/equality.hpp +++ b/geometry/geometry_tests/equality.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../../base/math.hpp" +#include "base/math.hpp" -#include "../angles.hpp" -#include "../rect2d.hpp" +#include "geometry/angles.hpp" +#include "geometry/rect2d.hpp" namespace test { diff --git a/geometry/geometry_tests/intersect_test.cpp b/geometry/geometry_tests/intersect_test.cpp index 45981cf544..154e46009e 100644 --- a/geometry/geometry_tests/intersect_test.cpp +++ b/geometry/geometry_tests/intersect_test.cpp @@ -1,11 +1,11 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "equality.hpp" +#include "geometry/geometry_tests/equality.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../geometry/rect_intersect.hpp" -#include "../../geometry/angles.hpp" +#include "geometry/rect_intersect.hpp" +#include "geometry/angles.hpp" using namespace test; diff --git a/geometry/geometry_tests/large_polygon.hpp b/geometry/geometry_tests/large_polygon.hpp index 5909852eed..223914af16 100644 --- a/geometry/geometry_tests/large_polygon.hpp +++ b/geometry/geometry_tests/large_polygon.hpp @@ -1,4 +1,4 @@ -#include "../point2d.hpp" +#include "geometry/point2d.hpp" namespace LargePolygon { diff --git a/geometry/geometry_tests/packer_test.cpp b/geometry/geometry_tests/packer_test.cpp index bc26a9df9a..49c1c3daa0 100644 --- a/geometry/geometry_tests/packer_test.cpp +++ b/geometry/geometry_tests/packer_test.cpp @@ -1,7 +1,7 @@ -#include "../../base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" +#include "base/SRC_FIRST.hpp" +#include "testing/testing.hpp" -#include "../packer.hpp" +#include "geometry/packer.hpp" static int i = 1; diff --git a/geometry/geometry_tests/point_test.cpp b/geometry/geometry_tests/point_test.cpp index 6c24dad228..8024b4281a 100644 --- a/geometry/geometry_tests/point_test.cpp +++ b/geometry/geometry_tests/point_test.cpp @@ -1,7 +1,7 @@ -#include "../../base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" -#include "equality.hpp" -#include "../point2d.hpp" +#include "base/SRC_FIRST.hpp" +#include "testing/testing.hpp" +#include "geometry/geometry_tests/equality.hpp" +#include "geometry/point2d.hpp" UNIT_TEST(Point_Rotate) { diff --git a/geometry/geometry_tests/pointu_to_uint64_test.cpp b/geometry/geometry_tests/pointu_to_uint64_test.cpp index 7fc690ce90..c890a17476 100644 --- a/geometry/geometry_tests/pointu_to_uint64_test.cpp +++ b/geometry/geometry_tests/pointu_to_uint64_test.cpp @@ -1,5 +1,5 @@ -#include "../../testing/testing.hpp" -#include "../pointu_to_uint64.hpp" +#include "testing/testing.hpp" +#include "geometry/pointu_to_uint64.hpp" UNIT_TEST(PointUToUint64_0) { diff --git a/geometry/geometry_tests/polygon_test.cpp b/geometry/geometry_tests/polygon_test.cpp index 4647e295ba..3e677afdbc 100644 --- a/geometry/geometry_tests/polygon_test.cpp +++ b/geometry/geometry_tests/polygon_test.cpp @@ -1,11 +1,11 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../polygon.hpp" -#include "../point2d.hpp" +#include "geometry/polygon.hpp" +#include "geometry/point2d.hpp" -#include "../../base/macros.hpp" +#include "base/macros.hpp" -#include "../../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace diff --git a/geometry/geometry_tests/rect_test.cpp b/geometry/geometry_tests/rect_test.cpp index c56533e382..7676fbb880 100644 --- a/geometry/geometry_tests/rect_test.cpp +++ b/geometry/geometry_tests/rect_test.cpp @@ -1,6 +1,6 @@ -#include "../../base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" -#include "../rect2d.hpp" +#include "base/SRC_FIRST.hpp" +#include "testing/testing.hpp" +#include "geometry/rect2d.hpp" UNIT_TEST(Rect_Intersect) { diff --git a/geometry/geometry_tests/region2d_binary_op_test.cpp b/geometry/geometry_tests/region2d_binary_op_test.cpp index b5c0232001..bf856ef908 100644 --- a/geometry/geometry_tests/region2d_binary_op_test.cpp +++ b/geometry/geometry_tests/region2d_binary_op_test.cpp @@ -1,12 +1,12 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "test_regions.hpp" +#include "geometry/geometry_tests/test_regions.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../region2d/binary_operators.hpp" +#include "geometry/region2d/binary_operators.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" namespace diff --git a/geometry/geometry_tests/region_test.cpp b/geometry/geometry_tests/region_test.cpp index 386a8f4926..714ad56806 100644 --- a/geometry/geometry_tests/region_test.cpp +++ b/geometry/geometry_tests/region_test.cpp @@ -1,8 +1,8 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../base/macros.hpp" +#include "base/macros.hpp" -#include "../region2d.hpp" +#include "geometry/region2d.hpp" namespace { diff --git a/geometry/geometry_tests/robust_test.cpp b/geometry/geometry_tests/robust_test.cpp index cc3e2cd29c..04e5f356c2 100644 --- a/geometry/geometry_tests/robust_test.cpp +++ b/geometry/geometry_tests/robust_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../robust_orientation.hpp" +#include "geometry/robust_orientation.hpp" typedef m2::PointD P; diff --git a/geometry/geometry_tests/screen_test.cpp b/geometry/geometry_tests/screen_test.cpp index b754b4807b..529a30e909 100644 --- a/geometry/geometry_tests/screen_test.cpp +++ b/geometry/geometry_tests/screen_test.cpp @@ -1,9 +1,9 @@ -#include "equality.hpp" +#include "geometry/geometry_tests/equality.hpp" -#include "../screenbase.hpp" -#include "../transformations.hpp" +#include "geometry/screenbase.hpp" +#include "geometry/transformations.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" using namespace test; diff --git a/geometry/geometry_tests/segments_intersect_test.cpp b/geometry/geometry_tests/segments_intersect_test.cpp index f9c903e00c..a92c62c163 100644 --- a/geometry/geometry_tests/segments_intersect_test.cpp +++ b/geometry/geometry_tests/segments_intersect_test.cpp @@ -1,5 +1,5 @@ -#include "../../testing/testing.hpp" -#include "../point2d.hpp" +#include "testing/testing.hpp" +#include "geometry/point2d.hpp" typedef m2::PointD P; diff --git a/geometry/geometry_tests/simplification_test.cpp b/geometry/geometry_tests/simplification_test.cpp index fe7a8b74f3..f6024d1b05 100644 --- a/geometry/geometry_tests/simplification_test.cpp +++ b/geometry/geometry_tests/simplification_test.cpp @@ -1,18 +1,18 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../simplification.hpp" +#include "geometry/simplification.hpp" -#include "../../indexer/scales.hpp" +#include "indexer/scales.hpp" -#include "../../geometry/distance.hpp" -#include "../../geometry/point2d.hpp" +#include "geometry/distance.hpp" +#include "geometry/point2d.hpp" -#include "../../base/logging.hpp" -#include "../../base/macros.hpp" -#include "../../base/stl_add.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" +#include "base/stl_add.hpp" -#include "../../std/limits.hpp" -#include "../../std/vector.hpp" +#include "std/limits.hpp" +#include "std/vector.hpp" namespace { @@ -166,7 +166,7 @@ UNIT_TEST(Simpfication_DP_DegenerateTrg) CheckDPStrict(arr2, ARRAY_SIZE(arr2), 1.0, 4); } -#include "large_polygon.hpp" +#include "geometry/geometry_tests/large_polygon.hpp" m2::PointD const * LargePolylineTestData::m_Data = LargePolygon::kLargePolygon; size_t LargePolylineTestData::m_Size = ARRAY_SIZE(LargePolygon::kLargePolygon); diff --git a/geometry/geometry_tests/spline_test.cpp b/geometry/geometry_tests/spline_test.cpp index d901340583..4b0ccc69cb 100644 --- a/geometry/geometry_tests/spline_test.cpp +++ b/geometry/geometry_tests/spline_test.cpp @@ -1,7 +1,7 @@ -#include "../../base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" -#include "equality.hpp" -#include "../spline.hpp" +#include "base/SRC_FIRST.hpp" +#include "testing/testing.hpp" +#include "geometry/geometry_tests/equality.hpp" +#include "geometry/spline.hpp" using m2::Spline; using m2::PointD; diff --git a/geometry/geometry_tests/test_regions.hpp b/geometry/geometry_tests/test_regions.hpp index 339e4568a6..ffc3f42f72 100644 --- a/geometry/geometry_tests/test_regions.hpp +++ b/geometry/geometry_tests/test_regions.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../point2d.hpp" +#include "geometry/point2d.hpp" namespace geom_test { diff --git a/geometry/geometry_tests/transformations_test.cpp b/geometry/geometry_tests/transformations_test.cpp index e6c1a0fd89..a6d911e618 100644 --- a/geometry/geometry_tests/transformations_test.cpp +++ b/geometry/geometry_tests/transformations_test.cpp @@ -1,9 +1,9 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" -#include "../../base/matrix.hpp" -#include "../../geometry/point2d.hpp" -#include "../transformations.hpp" +#include "testing/testing.hpp" +#include "base/matrix.hpp" +#include "geometry/point2d.hpp" +#include "geometry/transformations.hpp" UNIT_TEST(Transformations_Shift) { diff --git a/geometry/geometry_tests/tree_test.cpp b/geometry/geometry_tests/tree_test.cpp index 65897687d6..fab4144e0c 100644 --- a/geometry/geometry_tests/tree_test.cpp +++ b/geometry/geometry_tests/tree_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../tree4d.hpp" +#include "geometry/tree4d.hpp" namespace diff --git a/geometry/geometry_tests/vector_test.cpp b/geometry/geometry_tests/vector_test.cpp index c7cc0e162f..1709833ec1 100644 --- a/geometry/geometry_tests/vector_test.cpp +++ b/geometry/geometry_tests/vector_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../avg_vector.hpp" +#include "geometry/avg_vector.hpp" namespace |