boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-01-31 20:22:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/intvalid

Browse Source
This commit is contained in:
barendgehrels
2017-01-18 10:07:12 +01:00
parent 0e95caa36d 8fa80c52b4
commit 177da0d6cb
7 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/test/Jamfile.v2
View File

@@ -3,6 +3,7 @@
# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
# Copyright (c) 2013-2017 Adam Wulkiewicz, Lodz, Poland.
#
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -23,7 +24,6 @@ project boost-geometry-extensions-test
;
build-project algorithms ;
build-project arithmetic ;
build-project gis ;
build-project iterators ;
build-project nsphere ;

20
extensions/test/arithmetic/Jamfile.v2
View File

@@ -1,20 +0,0 @@
# Boost.Geometry (aka GGL, Generic Geometry Library)
#
# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
#
# 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)
test-suite boost-geometry-extensions-arithmetic
:
[ run cross_product.cpp ]
[ compile-fail cross_product.cpp
: # requirements
<define>TEST_FAIL_CROSS_PRODUCT
: # target name
cross_product_compile_fail
]
;

2
extensions/test/gis/latlong/cross_track.cpp
View File

@@ -54,7 +54,7 @@ void test_distance(
#if !defined(BOOST_MSVC)
BOOST_CONCEPT_ASSERT
(
(bg::concept::PointSegmentDistanceStrategy<strategy_type, Point, Point>)
(bg::concepts::PointSegmentDistanceStrategy<strategy_type, Point, Point>)
);
#endif

4
extensions/test/nsphere/nsphere-circle.cpp
View File

@@ -100,8 +100,8 @@ struct radius_access<custom_circle, 0>
template <typename S, typename RT, typename CT>
void check_nsphere(S& to_check, RT radius, CT center_x, CT center_y, CT center_z)
{
BOOST_CONCEPT_ASSERT( (bg::concept::ConstNsphere<S>) );
BOOST_CONCEPT_ASSERT( (bg::concept::Nsphere<S>) );
BOOST_CONCEPT_ASSERT( (bg::concepts::ConstNsphere<S>) );
BOOST_CONCEPT_ASSERT( (bg::concepts::Nsphere<S>) );
BOOST_CHECK_EQUAL(bg::get_radius<0>(to_check), radius);

6
include/boost/geometry/algorithms/detail/overlay/traversal.hpp
View File

@@ -140,10 +140,10 @@ struct traversal
{
for (int i = 0; i < 2; i++)
{
turn_operation_type& op = turn.operations[i];
if (op.visited.none())
turn_operation_type& turn_op = turn.operations[i];
if (turn_op.visited.none())
{
op.visited.set_visited();
turn_op.visited.set_visited();
}
}
}

8
test/arithmetic/Jamfile.v2
View File

@@ -3,7 +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) 2015 Adam Wulkiewicz, Lodz, Poland.
# Copyright (c) 2015-2017 Adam Wulkiewicz, Lodz, Poland.
#
# Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,6 +11,8 @@
test-suite boost-geometry-arithmetic
:
[ run general.cpp : : : : arithmetic_general ]
[ run dot_product.cpp : : : : arithmetic_dot_product ]
[ run general.cpp : : : : arithmetic_general ]
[ run dot_product.cpp : : : : arithmetic_dot_product ]
[ run cross_product.cpp : : : : arithmetic_cross_product ]
[ compile-fail cross_product.cpp : <define>TEST_FAIL_CROSS_PRODUCT : arithmetic_cross_product_cf ]
;

15
extensions/test/arithmetic/cross_product.cpp → test/arithmetic/cross_product.cpp
View File

@@ -2,6 +2,7 @@
// Unit Test
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,7 +11,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/extensions/arithmetic/cross_product.hpp>
#include <boost/geometry/arithmetic/cross_product.hpp>
#include <boost/geometry/algorithms/assign.hpp>
@@ -53,9 +54,11 @@ template <typename P>
void test_4d()
{
P p1;
bg::assign_values(p1, 20, 30, 10, 15);
bg::assign_values(p1, 20, 30, 10);
bg::set<3>(p1, 15);
P p2;
bg::assign_values(p2, 45, 70, 20, 35);
bg::assign_values(p2, 45, 70, 20);
bg::set<3>(p2, 35);
P c = bg::cross_product(p1, p2);
}
#endif
@@ -71,9 +74,9 @@ int test_main(int, char* [])
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
#ifdef TEST_FAIL_CROSS_PRODUCT
test_4d<bg::model::point<int, 3, bg::cs::cartesian> >();
test_4d<bg::model::point<float, 3, bg::cs::cartesian> >();
test_4d<bg::model::point<double, 3, bg::cs::cartesian> >();
test_4d<bg::model::point<int, 4, bg::cs::cartesian> >();
test_4d<bg::model::point<float, 4, bg::cs::cartesian> >();
test_4d<bg::model::point<double, 4, bg::cs::cartesian> >();
#endif
return 0;