From 4782cb191db502335cd8472b769b5bfa01ac0605 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Fri, 27 Jul 2018 19:00:19 +0200 Subject: [PATCH] [test][algorithms] Move relops tests dirs to algorithms/ dir. --- test/algorithms/Jamfile.v2 | 11 +++++++- .../covered_by/Jamfile.v2 | 0 .../covered_by/covered_by.cpp | 0 .../covered_by/covered_by_multi.cpp | 0 .../covered_by/covered_by_sph.cpp | 0 .../covered_by/covered_by_sph_geo.cpp | 0 .../covered_by/test_covered_by.hpp | 0 .../crosses/Jamfile.v2 | 0 .../crosses/crosses.cpp | 0 .../crosses/crosses_sph.cpp | 0 .../crosses/test_crosses.hpp | 0 .../disjoint/Jamfile.v2 | 0 .../disjoint/disjoint.cpp | 0 .../disjoint/disjoint_coverage_a_a.cpp | 0 .../disjoint/disjoint_coverage_l_a.cpp | 0 .../disjoint/disjoint_coverage_l_l.cpp | 0 .../disjoint/disjoint_coverage_p_a.cpp | 0 .../disjoint/disjoint_coverage_p_l.cpp | 0 .../disjoint/disjoint_coverage_p_p.cpp | 0 .../disjoint/disjoint_multi.cpp | 0 .../disjoint/disjoint_point_box_geometry.cpp | 0 .../disjoint/disjoint_seg_box.cpp | 0 .../disjoint/disjoint_sph.cpp | 0 .../disjoint/test_disjoint.hpp | 0 .../disjoint/test_disjoint_seg_box.hpp | 0 .../equals/Jamfile.v2 | 0 .../equals/equals.cpp | 0 .../equals/equals_multi.cpp | 0 .../equals/equals_on_spheroid.cpp | 0 .../equals/equals_sph.cpp | 0 .../equals/test_equals.hpp | 0 .../intersects/Jamfile.v2 | 0 .../intersects/intersects.cpp | 0 .../intersects/intersects_box_geometry.cpp | 0 .../intersects/intersects_multi.cpp | 0 .../intersects/intersects_self.cpp | 0 .../intersects/intersects_sph.cpp | 0 .../intersects/intersects_sph_geo.cpp | 0 .../intersects/test_intersects.hpp | 0 .../overlaps/Jamfile.v2 | 0 .../overlaps/overlaps.cpp | 0 .../overlaps/overlaps_areal.cpp | 0 .../overlaps/overlaps_box.cpp | 0 .../overlaps/overlaps_sph.cpp | 0 .../overlaps/test_overlaps.hpp | 0 .../relate/Jamfile.v2 | 0 .../nan_cases.hpp | 0 .../relate/relate_areal_areal.cpp | 0 .../relate/relate_areal_areal_sph.cpp | 0 .../relate/relate_linear_areal.cpp | 3 ++- .../relate/relate_linear_areal_sph.cpp | 0 .../relate/relate_linear_linear.cpp | 0 .../relate/relate_linear_linear_sph.cpp | 0 .../relate/relate_pointlike_geometry.cpp | 7 +++--- .../relate/test_relate.hpp | 0 .../relational_operations/Jamfile.v2 | 25 ------------------- .../touches/Jamfile.v2 | 0 .../touches/test_touches.hpp | 0 .../touches/touches.cpp | 0 .../touches/touches_box.cpp | 0 .../touches/touches_multi.cpp | 0 .../touches/touches_self.cpp | 0 .../touches/touches_sph.cpp | 0 .../within/Jamfile.v2 | 0 .../within/test_within.hpp | 0 .../within/within.cpp | 0 .../within/within_areal_areal.cpp | 0 .../within/within_linear_areal.cpp | 0 .../within/within_linear_linear.cpp | 0 .../within/within_multi.cpp | 0 .../within/within_pointlike_geometry.cpp | 0 .../within/within_sph.cpp | 0 .../within/within_sph_geo.cpp | 0 73 files changed, 16 insertions(+), 30 deletions(-) rename test/algorithms/{relational_operations => }/covered_by/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/covered_by/covered_by.cpp (100%) rename test/algorithms/{relational_operations => }/covered_by/covered_by_multi.cpp (100%) rename test/algorithms/{relational_operations => }/covered_by/covered_by_sph.cpp (100%) rename test/algorithms/{relational_operations => }/covered_by/covered_by_sph_geo.cpp (100%) rename test/algorithms/{relational_operations => }/covered_by/test_covered_by.hpp (100%) rename test/algorithms/{relational_operations => }/crosses/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/crosses/crosses.cpp (100%) rename test/algorithms/{relational_operations => }/crosses/crosses_sph.cpp (100%) rename test/algorithms/{relational_operations => }/crosses/test_crosses.hpp (100%) rename test/algorithms/{relational_operations => }/disjoint/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_a_a.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_l_a.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_l_l.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_p_a.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_p_l.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_coverage_p_p.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_multi.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_point_box_geometry.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_seg_box.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/disjoint_sph.cpp (100%) rename test/algorithms/{relational_operations => }/disjoint/test_disjoint.hpp (100%) rename test/algorithms/{relational_operations => }/disjoint/test_disjoint_seg_box.hpp (100%) rename test/algorithms/{relational_operations => }/equals/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/equals/equals.cpp (100%) rename test/algorithms/{relational_operations => }/equals/equals_multi.cpp (100%) rename test/algorithms/{relational_operations => }/equals/equals_on_spheroid.cpp (100%) rename test/algorithms/{relational_operations => }/equals/equals_sph.cpp (100%) rename test/algorithms/{relational_operations => }/equals/test_equals.hpp (100%) rename test/algorithms/{relational_operations => }/intersects/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/intersects/intersects.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/intersects_box_geometry.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/intersects_multi.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/intersects_self.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/intersects_sph.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/intersects_sph_geo.cpp (100%) rename test/algorithms/{relational_operations => }/intersects/test_intersects.hpp (100%) rename test/algorithms/{relational_operations => }/overlaps/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/overlaps/overlaps.cpp (100%) rename test/algorithms/{relational_operations => }/overlaps/overlaps_areal.cpp (100%) rename test/algorithms/{relational_operations => }/overlaps/overlaps_box.cpp (100%) rename test/algorithms/{relational_operations => }/overlaps/overlaps_sph.cpp (100%) rename test/algorithms/{relational_operations => }/overlaps/test_overlaps.hpp (100%) rename test/algorithms/{relational_operations => }/relate/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => relate}/nan_cases.hpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_areal_areal.cpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_areal_areal_sph.cpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_linear_areal.cpp (99%) rename test/algorithms/{relational_operations => }/relate/relate_linear_areal_sph.cpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_linear_linear.cpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_linear_linear_sph.cpp (100%) rename test/algorithms/{relational_operations => }/relate/relate_pointlike_geometry.cpp (99%) rename test/algorithms/{relational_operations => }/relate/test_relate.hpp (100%) delete mode 100644 test/algorithms/relational_operations/Jamfile.v2 rename test/algorithms/{relational_operations => }/touches/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/touches/test_touches.hpp (100%) rename test/algorithms/{relational_operations => }/touches/touches.cpp (100%) rename test/algorithms/{relational_operations => }/touches/touches_box.cpp (100%) rename test/algorithms/{relational_operations => }/touches/touches_multi.cpp (100%) rename test/algorithms/{relational_operations => }/touches/touches_self.cpp (100%) rename test/algorithms/{relational_operations => }/touches/touches_sph.cpp (100%) rename test/algorithms/{relational_operations => }/within/Jamfile.v2 (100%) rename test/algorithms/{relational_operations => }/within/test_within.hpp (100%) rename test/algorithms/{relational_operations => }/within/within.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_areal_areal.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_linear_areal.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_linear_linear.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_multi.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_pointlike_geometry.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_sph.cpp (100%) rename test/algorithms/{relational_operations => }/within/within_sph_geo.cpp (100%) diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index c0ae853b7..d595925f2 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -3,6 +3,7 @@ # Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. # Copyright (c) 2008-2015 Bruno Lalande, Paris, France. # Copyright (c) 2009-2015 Mateusz Loskot, London, UK. +# Copyright (c) 2018 Adam Wulkiewicz, Lodz, Poland. # # This file was modified by Oracle on 2014, 2015, 2016, 2017. # Modifications copyright (c) 2014-2017, Oracle and/or its affiliates. @@ -64,11 +65,19 @@ test-suite boost-geometry-algorithms build-project area ; build-project buffer ; +build-project covered_by ; +build-project crosses ; build-project detail ; +build-project disjoint ; build-project distance ; build-project envelope_expand ; +build-project equals ; +build-project intersects ; build-project length ; +build-project overlaps ; build-project overlay ; build-project perimeter ; -build-project relational_operations ; +build-project relate ; build-project set_operations ; +build-project touches ; +build-project within ; diff --git a/test/algorithms/relational_operations/covered_by/Jamfile.v2 b/test/algorithms/covered_by/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/covered_by/Jamfile.v2 rename to test/algorithms/covered_by/Jamfile.v2 diff --git a/test/algorithms/relational_operations/covered_by/covered_by.cpp b/test/algorithms/covered_by/covered_by.cpp similarity index 100% rename from test/algorithms/relational_operations/covered_by/covered_by.cpp rename to test/algorithms/covered_by/covered_by.cpp diff --git a/test/algorithms/relational_operations/covered_by/covered_by_multi.cpp b/test/algorithms/covered_by/covered_by_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/covered_by/covered_by_multi.cpp rename to test/algorithms/covered_by/covered_by_multi.cpp diff --git a/test/algorithms/relational_operations/covered_by/covered_by_sph.cpp b/test/algorithms/covered_by/covered_by_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/covered_by/covered_by_sph.cpp rename to test/algorithms/covered_by/covered_by_sph.cpp diff --git a/test/algorithms/relational_operations/covered_by/covered_by_sph_geo.cpp b/test/algorithms/covered_by/covered_by_sph_geo.cpp similarity index 100% rename from test/algorithms/relational_operations/covered_by/covered_by_sph_geo.cpp rename to test/algorithms/covered_by/covered_by_sph_geo.cpp diff --git a/test/algorithms/relational_operations/covered_by/test_covered_by.hpp b/test/algorithms/covered_by/test_covered_by.hpp similarity index 100% rename from test/algorithms/relational_operations/covered_by/test_covered_by.hpp rename to test/algorithms/covered_by/test_covered_by.hpp diff --git a/test/algorithms/relational_operations/crosses/Jamfile.v2 b/test/algorithms/crosses/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/crosses/Jamfile.v2 rename to test/algorithms/crosses/Jamfile.v2 diff --git a/test/algorithms/relational_operations/crosses/crosses.cpp b/test/algorithms/crosses/crosses.cpp similarity index 100% rename from test/algorithms/relational_operations/crosses/crosses.cpp rename to test/algorithms/crosses/crosses.cpp diff --git a/test/algorithms/relational_operations/crosses/crosses_sph.cpp b/test/algorithms/crosses/crosses_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/crosses/crosses_sph.cpp rename to test/algorithms/crosses/crosses_sph.cpp diff --git a/test/algorithms/relational_operations/crosses/test_crosses.hpp b/test/algorithms/crosses/test_crosses.hpp similarity index 100% rename from test/algorithms/relational_operations/crosses/test_crosses.hpp rename to test/algorithms/crosses/test_crosses.hpp diff --git a/test/algorithms/relational_operations/disjoint/Jamfile.v2 b/test/algorithms/disjoint/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/disjoint/Jamfile.v2 rename to test/algorithms/disjoint/Jamfile.v2 diff --git a/test/algorithms/relational_operations/disjoint/disjoint.cpp b/test/algorithms/disjoint/disjoint.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint.cpp rename to test/algorithms/disjoint/disjoint.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_a_a.cpp b/test/algorithms/disjoint/disjoint_coverage_a_a.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_a_a.cpp rename to test/algorithms/disjoint/disjoint_coverage_a_a.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_l_a.cpp b/test/algorithms/disjoint/disjoint_coverage_l_a.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_l_a.cpp rename to test/algorithms/disjoint/disjoint_coverage_l_a.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_l_l.cpp b/test/algorithms/disjoint/disjoint_coverage_l_l.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_l_l.cpp rename to test/algorithms/disjoint/disjoint_coverage_l_l.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_p_a.cpp b/test/algorithms/disjoint/disjoint_coverage_p_a.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_p_a.cpp rename to test/algorithms/disjoint/disjoint_coverage_p_a.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_p_l.cpp b/test/algorithms/disjoint/disjoint_coverage_p_l.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_p_l.cpp rename to test/algorithms/disjoint/disjoint_coverage_p_l.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_coverage_p_p.cpp b/test/algorithms/disjoint/disjoint_coverage_p_p.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_coverage_p_p.cpp rename to test/algorithms/disjoint/disjoint_coverage_p_p.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_multi.cpp b/test/algorithms/disjoint/disjoint_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_multi.cpp rename to test/algorithms/disjoint/disjoint_multi.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_point_box_geometry.cpp b/test/algorithms/disjoint/disjoint_point_box_geometry.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_point_box_geometry.cpp rename to test/algorithms/disjoint/disjoint_point_box_geometry.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_seg_box.cpp b/test/algorithms/disjoint/disjoint_seg_box.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_seg_box.cpp rename to test/algorithms/disjoint/disjoint_seg_box.cpp diff --git a/test/algorithms/relational_operations/disjoint/disjoint_sph.cpp b/test/algorithms/disjoint/disjoint_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/disjoint_sph.cpp rename to test/algorithms/disjoint/disjoint_sph.cpp diff --git a/test/algorithms/relational_operations/disjoint/test_disjoint.hpp b/test/algorithms/disjoint/test_disjoint.hpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/test_disjoint.hpp rename to test/algorithms/disjoint/test_disjoint.hpp diff --git a/test/algorithms/relational_operations/disjoint/test_disjoint_seg_box.hpp b/test/algorithms/disjoint/test_disjoint_seg_box.hpp similarity index 100% rename from test/algorithms/relational_operations/disjoint/test_disjoint_seg_box.hpp rename to test/algorithms/disjoint/test_disjoint_seg_box.hpp diff --git a/test/algorithms/relational_operations/equals/Jamfile.v2 b/test/algorithms/equals/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/equals/Jamfile.v2 rename to test/algorithms/equals/Jamfile.v2 diff --git a/test/algorithms/relational_operations/equals/equals.cpp b/test/algorithms/equals/equals.cpp similarity index 100% rename from test/algorithms/relational_operations/equals/equals.cpp rename to test/algorithms/equals/equals.cpp diff --git a/test/algorithms/relational_operations/equals/equals_multi.cpp b/test/algorithms/equals/equals_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/equals/equals_multi.cpp rename to test/algorithms/equals/equals_multi.cpp diff --git a/test/algorithms/relational_operations/equals/equals_on_spheroid.cpp b/test/algorithms/equals/equals_on_spheroid.cpp similarity index 100% rename from test/algorithms/relational_operations/equals/equals_on_spheroid.cpp rename to test/algorithms/equals/equals_on_spheroid.cpp diff --git a/test/algorithms/relational_operations/equals/equals_sph.cpp b/test/algorithms/equals/equals_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/equals/equals_sph.cpp rename to test/algorithms/equals/equals_sph.cpp diff --git a/test/algorithms/relational_operations/equals/test_equals.hpp b/test/algorithms/equals/test_equals.hpp similarity index 100% rename from test/algorithms/relational_operations/equals/test_equals.hpp rename to test/algorithms/equals/test_equals.hpp diff --git a/test/algorithms/relational_operations/intersects/Jamfile.v2 b/test/algorithms/intersects/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/intersects/Jamfile.v2 rename to test/algorithms/intersects/Jamfile.v2 diff --git a/test/algorithms/relational_operations/intersects/intersects.cpp b/test/algorithms/intersects/intersects.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects.cpp rename to test/algorithms/intersects/intersects.cpp diff --git a/test/algorithms/relational_operations/intersects/intersects_box_geometry.cpp b/test/algorithms/intersects/intersects_box_geometry.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects_box_geometry.cpp rename to test/algorithms/intersects/intersects_box_geometry.cpp diff --git a/test/algorithms/relational_operations/intersects/intersects_multi.cpp b/test/algorithms/intersects/intersects_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects_multi.cpp rename to test/algorithms/intersects/intersects_multi.cpp diff --git a/test/algorithms/relational_operations/intersects/intersects_self.cpp b/test/algorithms/intersects/intersects_self.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects_self.cpp rename to test/algorithms/intersects/intersects_self.cpp diff --git a/test/algorithms/relational_operations/intersects/intersects_sph.cpp b/test/algorithms/intersects/intersects_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects_sph.cpp rename to test/algorithms/intersects/intersects_sph.cpp diff --git a/test/algorithms/relational_operations/intersects/intersects_sph_geo.cpp b/test/algorithms/intersects/intersects_sph_geo.cpp similarity index 100% rename from test/algorithms/relational_operations/intersects/intersects_sph_geo.cpp rename to test/algorithms/intersects/intersects_sph_geo.cpp diff --git a/test/algorithms/relational_operations/intersects/test_intersects.hpp b/test/algorithms/intersects/test_intersects.hpp similarity index 100% rename from test/algorithms/relational_operations/intersects/test_intersects.hpp rename to test/algorithms/intersects/test_intersects.hpp diff --git a/test/algorithms/relational_operations/overlaps/Jamfile.v2 b/test/algorithms/overlaps/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/overlaps/Jamfile.v2 rename to test/algorithms/overlaps/Jamfile.v2 diff --git a/test/algorithms/relational_operations/overlaps/overlaps.cpp b/test/algorithms/overlaps/overlaps.cpp similarity index 100% rename from test/algorithms/relational_operations/overlaps/overlaps.cpp rename to test/algorithms/overlaps/overlaps.cpp diff --git a/test/algorithms/relational_operations/overlaps/overlaps_areal.cpp b/test/algorithms/overlaps/overlaps_areal.cpp similarity index 100% rename from test/algorithms/relational_operations/overlaps/overlaps_areal.cpp rename to test/algorithms/overlaps/overlaps_areal.cpp diff --git a/test/algorithms/relational_operations/overlaps/overlaps_box.cpp b/test/algorithms/overlaps/overlaps_box.cpp similarity index 100% rename from test/algorithms/relational_operations/overlaps/overlaps_box.cpp rename to test/algorithms/overlaps/overlaps_box.cpp diff --git a/test/algorithms/relational_operations/overlaps/overlaps_sph.cpp b/test/algorithms/overlaps/overlaps_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/overlaps/overlaps_sph.cpp rename to test/algorithms/overlaps/overlaps_sph.cpp diff --git a/test/algorithms/relational_operations/overlaps/test_overlaps.hpp b/test/algorithms/overlaps/test_overlaps.hpp similarity index 100% rename from test/algorithms/relational_operations/overlaps/test_overlaps.hpp rename to test/algorithms/overlaps/test_overlaps.hpp diff --git a/test/algorithms/relational_operations/relate/Jamfile.v2 b/test/algorithms/relate/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/relate/Jamfile.v2 rename to test/algorithms/relate/Jamfile.v2 diff --git a/test/algorithms/relational_operations/nan_cases.hpp b/test/algorithms/relate/nan_cases.hpp similarity index 100% rename from test/algorithms/relational_operations/nan_cases.hpp rename to test/algorithms/relate/nan_cases.hpp diff --git a/test/algorithms/relational_operations/relate/relate_areal_areal.cpp b/test/algorithms/relate/relate_areal_areal.cpp similarity index 100% rename from test/algorithms/relational_operations/relate/relate_areal_areal.cpp rename to test/algorithms/relate/relate_areal_areal.cpp diff --git a/test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp b/test/algorithms/relate/relate_areal_areal_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/relate/relate_areal_areal_sph.cpp rename to test/algorithms/relate/relate_areal_areal_sph.cpp diff --git a/test/algorithms/relational_operations/relate/relate_linear_areal.cpp b/test/algorithms/relate/relate_linear_areal.cpp similarity index 99% rename from test/algorithms/relational_operations/relate/relate_linear_areal.cpp rename to test/algorithms/relate/relate_linear_areal.cpp index a53e388fa..56017f6de 100644 --- a/test/algorithms/relational_operations/relate/relate_linear_areal.cpp +++ b/test/algorithms/relate/relate_linear_areal.cpp @@ -1,6 +1,7 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. +// Copyright (c) 2018 Adam Wulkiewicz, Lodz, Poland. // This file was modified by Oracle on 2013, 2014, 2015. // Modifications copyright (c) 2013-2015 Oracle and/or its affiliates. @@ -12,7 +13,7 @@ // http://www.boost.org/LICENSE_1_0.txt) #include "test_relate.hpp" -#include "../nan_cases.hpp" +#include "nan_cases.hpp" //TEST //#include diff --git a/test/algorithms/relational_operations/relate/relate_linear_areal_sph.cpp b/test/algorithms/relate/relate_linear_areal_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/relate/relate_linear_areal_sph.cpp rename to test/algorithms/relate/relate_linear_areal_sph.cpp diff --git a/test/algorithms/relational_operations/relate/relate_linear_linear.cpp b/test/algorithms/relate/relate_linear_linear.cpp similarity index 100% rename from test/algorithms/relational_operations/relate/relate_linear_linear.cpp rename to test/algorithms/relate/relate_linear_linear.cpp diff --git a/test/algorithms/relational_operations/relate/relate_linear_linear_sph.cpp b/test/algorithms/relate/relate_linear_linear_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/relate/relate_linear_linear_sph.cpp rename to test/algorithms/relate/relate_linear_linear_sph.cpp diff --git a/test/algorithms/relational_operations/relate/relate_pointlike_geometry.cpp b/test/algorithms/relate/relate_pointlike_geometry.cpp similarity index 99% rename from test/algorithms/relational_operations/relate/relate_pointlike_geometry.cpp rename to test/algorithms/relate/relate_pointlike_geometry.cpp index 41926fd26..8894b6850 100644 --- a/test/algorithms/relational_operations/relate/relate_pointlike_geometry.cpp +++ b/test/algorithms/relate/relate_pointlike_geometry.cpp @@ -1,18 +1,19 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. +// Copyright (c) 2018 Adam Wulkiewicz, Lodz, Poland. // This file was modified by Oracle on 2013, 2014, 2015, 2017. // Modifications copyright (c) 2013-2017 Oracle and/or its affiliates. +// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle + // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle - #include "test_relate.hpp" -#include "../nan_cases.hpp" +#include "nan_cases.hpp" //TEST //#include diff --git a/test/algorithms/relational_operations/relate/test_relate.hpp b/test/algorithms/relate/test_relate.hpp similarity index 100% rename from test/algorithms/relational_operations/relate/test_relate.hpp rename to test/algorithms/relate/test_relate.hpp diff --git a/test/algorithms/relational_operations/Jamfile.v2 b/test/algorithms/relational_operations/Jamfile.v2 deleted file mode 100644 index d816924bc..000000000 --- a/test/algorithms/relational_operations/Jamfile.v2 +++ /dev/null @@ -1,25 +0,0 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) -# -# Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. -# Copyright (c) 2008-2015 Bruno Lalande, Paris, France. -# Copyright (c) 2009-2015 Mateusz Loskot, London, UK. -# -# This file was modified by Oracle on 2014, 2015, 2016. -# Modifications copyright (c) 2014-2016, Oracle and/or its affiliates. -# -# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle -# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle -# -# Use, modification and distribution is subject to the Boost Software License, -# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -build-project covered_by ; -build-project crosses ; -build-project disjoint ; -build-project equals ; -build-project intersects ; -build-project overlaps ; -build-project relate ; -build-project touches ; -build-project within ; diff --git a/test/algorithms/relational_operations/touches/Jamfile.v2 b/test/algorithms/touches/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/touches/Jamfile.v2 rename to test/algorithms/touches/Jamfile.v2 diff --git a/test/algorithms/relational_operations/touches/test_touches.hpp b/test/algorithms/touches/test_touches.hpp similarity index 100% rename from test/algorithms/relational_operations/touches/test_touches.hpp rename to test/algorithms/touches/test_touches.hpp diff --git a/test/algorithms/relational_operations/touches/touches.cpp b/test/algorithms/touches/touches.cpp similarity index 100% rename from test/algorithms/relational_operations/touches/touches.cpp rename to test/algorithms/touches/touches.cpp diff --git a/test/algorithms/relational_operations/touches/touches_box.cpp b/test/algorithms/touches/touches_box.cpp similarity index 100% rename from test/algorithms/relational_operations/touches/touches_box.cpp rename to test/algorithms/touches/touches_box.cpp diff --git a/test/algorithms/relational_operations/touches/touches_multi.cpp b/test/algorithms/touches/touches_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/touches/touches_multi.cpp rename to test/algorithms/touches/touches_multi.cpp diff --git a/test/algorithms/relational_operations/touches/touches_self.cpp b/test/algorithms/touches/touches_self.cpp similarity index 100% rename from test/algorithms/relational_operations/touches/touches_self.cpp rename to test/algorithms/touches/touches_self.cpp diff --git a/test/algorithms/relational_operations/touches/touches_sph.cpp b/test/algorithms/touches/touches_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/touches/touches_sph.cpp rename to test/algorithms/touches/touches_sph.cpp diff --git a/test/algorithms/relational_operations/within/Jamfile.v2 b/test/algorithms/within/Jamfile.v2 similarity index 100% rename from test/algorithms/relational_operations/within/Jamfile.v2 rename to test/algorithms/within/Jamfile.v2 diff --git a/test/algorithms/relational_operations/within/test_within.hpp b/test/algorithms/within/test_within.hpp similarity index 100% rename from test/algorithms/relational_operations/within/test_within.hpp rename to test/algorithms/within/test_within.hpp diff --git a/test/algorithms/relational_operations/within/within.cpp b/test/algorithms/within/within.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within.cpp rename to test/algorithms/within/within.cpp diff --git a/test/algorithms/relational_operations/within/within_areal_areal.cpp b/test/algorithms/within/within_areal_areal.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_areal_areal.cpp rename to test/algorithms/within/within_areal_areal.cpp diff --git a/test/algorithms/relational_operations/within/within_linear_areal.cpp b/test/algorithms/within/within_linear_areal.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_linear_areal.cpp rename to test/algorithms/within/within_linear_areal.cpp diff --git a/test/algorithms/relational_operations/within/within_linear_linear.cpp b/test/algorithms/within/within_linear_linear.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_linear_linear.cpp rename to test/algorithms/within/within_linear_linear.cpp diff --git a/test/algorithms/relational_operations/within/within_multi.cpp b/test/algorithms/within/within_multi.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_multi.cpp rename to test/algorithms/within/within_multi.cpp diff --git a/test/algorithms/relational_operations/within/within_pointlike_geometry.cpp b/test/algorithms/within/within_pointlike_geometry.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_pointlike_geometry.cpp rename to test/algorithms/within/within_pointlike_geometry.cpp diff --git a/test/algorithms/relational_operations/within/within_sph.cpp b/test/algorithms/within/within_sph.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_sph.cpp rename to test/algorithms/within/within_sph.cpp diff --git a/test/algorithms/relational_operations/within/within_sph_geo.cpp b/test/algorithms/within/within_sph_geo.cpp similarity index 100% rename from test/algorithms/relational_operations/within/within_sph_geo.cpp rename to test/algorithms/within/within_sph_geo.cpp