boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-12 12:12:10 +00:00
Code Issues Projects Releases Wiki Activity

removed doubled algorithm index::overlap().

Browse Source 
[SVN r79137]
This commit is contained in:
Adam Wulkiewicz
2012-06-27 13:45:10 +00:00
parent f9b2279725
commit 34be8fbad5
4 changed files with 13 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/boost/geometry/extensions/index/algorithms/overlap.hpp
View File

@@ -1,35 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
//
// Boost.SpatialIndex - n-dimensional area/volume of boxes intersecion/overlap
//
// Copyright 2011 Adam Wulkiewicz.
// 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)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_OVERLAP_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_OVERLAP_HPP
#include <boost/geometry/algorithms/intersection.hpp>
#include <boost/geometry/extensions/index/algorithms/content.hpp>
namespace boost { namespace geometry { namespace index {
template <typename Box>
struct default_overlap_result
{
typedef typename default_area_result<Box>::type type;
};
template <typename Box>
typename default_overlap_result<Box>::type overlap(Box const& b1, Box const& b2)
{
Box inters;
geometry::assign_zero(inters);
geometry::intersection(b1, b2, inters);
return index::content(inters);
}
}}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_OVERLAP_HPP

27
include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp
View File

@@ -15,7 +15,7 @@
#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/algorithms/content.hpp>
#include <boost/geometry/extensions/index/algorithms/overlap.hpp>
#include <boost/geometry/extensions/index/algorithms/intersection_content.hpp>
#include <boost/geometry/extensions/index/algorithms/union_content.hpp>
#include <boost/geometry/extensions/index/rtree/node/node.hpp>
@@ -40,7 +40,6 @@ class choose_next_node<Value, Options, Box, Allocators, choose_by_overlap_diff_t
typedef typename Options::parameters_type parameters_type;
typedef typename index::default_content_result<Box>::type content_type;
typedef typename index::default_overlap_result<Box>::type overlap_type;
public:
template <typename Indexable>
@@ -70,7 +69,7 @@ private:
// choose index with smallest overlap change value, or content change or smallest content
size_t choosen_index = 0;
overlap_type smallest_overlap_diff = std::numeric_limits<overlap_type>::max();
content_type smallest_overlap_diff = std::numeric_limits<content_type>::max();
content_type smallest_content_diff = std::numeric_limits<content_type>::max();
content_type smallest_content = std::numeric_limits<content_type>::max();
@@ -87,8 +86,8 @@ private:
content_type content = index::content(ch_i.first);
content_type content_diff = index::content(box_exp) - content;
overlap_type overlap = 0;
overlap_type overlap_exp = 0;
content_type overlap = 0;
content_type overlap_exp = 0;
// calculate overlap
for ( size_t j = 0 ; j < children_count ; ++j )
@@ -97,12 +96,12 @@ private:
{
child_type const& ch_j = children[j];
overlap += index::overlap(ch_i.first, ch_j.first);
overlap_exp += index::overlap(box_exp, ch_j.first);
overlap += index::intersection_content(ch_i.first, ch_j.first);
overlap_exp += index::intersection_content(box_exp, ch_j.first);
}
}
overlap_type overlap_diff = overlap_exp - overlap;
content_type overlap_diff = overlap_exp - overlap;
// update result
if ( overlap_diff < smallest_overlap_diff ||
@@ -148,7 +147,7 @@ private:
// for overlap_cost_threshold child nodes find the one with smallest overlap value
size_t choosen_index = 0;
overlap_type smallest_overlap_diff = std::numeric_limits<overlap_type>::max();
content_type smallest_overlap_diff = std::numeric_limits<content_type>::max();
// for each node
for (size_t i = 0 ; i < parameters_type::overlap_cost_threshold ; ++i )
@@ -162,8 +161,8 @@ private:
// calculate expanded box of child node ch_i
geometry::expand(box_exp, indexable);
overlap_type overlap = 0;
overlap_type overlap_exp = 0;
content_type overlap = 0;
content_type overlap_exp = 0;
// calculate overlap
for ( size_t j = 0 ; j < children_count ; ++j )
@@ -172,12 +171,12 @@ private:
{
child_type const& ch_j = children[j];
overlap += index::overlap(ch_i.first, ch_j.first);
overlap_exp += index::overlap(box_exp, ch_j.first);
overlap += index::intersection_content(ch_i.first, ch_j.first);
overlap_exp += index::intersection_content(box_exp, ch_j.first);
}
}
overlap_type overlap_diff = overlap_exp - overlap;
content_type overlap_diff = overlap_exp - overlap;
// update result
if ( overlap_diff < smallest_overlap_diff )

3
test/algorithms/intersection_content.cpp
View File

@@ -40,9 +40,6 @@ void test_large_integers()
double double_value = bgi::intersection_content(double_box1, double_box2);
BOOST_CHECK_CLOSE(int_value, double_value, 0.0001);
// temp
BOOST_CHECK_CLOSE(bgi::overlap(int_box1, int_box2), bgi::overlap(double_box1, double_box2), 0.0001);
}
int test_main(int, char* [])

4
test/algorithms/test_intersection_content.hpp
View File

@@ -14,7 +14,6 @@
#include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/intersection_content.hpp>
#include <boost/geometry/extensions/index/algorithms/overlap.hpp>
template <typename Geometry>
void test_intersection_content(Geometry const& geometry1, Geometry const& geometry2,
@@ -34,9 +33,6 @@ void test_intersection_content(Geometry const& geometry1, Geometry const& geomet
#endif
BOOST_CHECK_CLOSE(value, expected_value, 0.0001);
// temp
BOOST_CHECK_CLOSE(bgi::overlap(geometry1, geometry2), expected_value, 0.0001);
}
template <typename Geometry>