From 4c418224548bdae9ee2128a54fc3d25b1a8834b8 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Thu, 23 Aug 2012 21:55:34 +0000 Subject: [PATCH] Modified docs, files descriptions, added quick_start example. [SVN r80164] --- doc/Jamfile.v2 | 10 +- doc/html/geometry_index/introduction.html | 8 +- doc/html/geometry_index/r_tree.html | 475 +----------------- .../geometry_index/r_tree/introduction.html | 50 ++ .../r_tree/nearest_neighbours_queries.html | 188 +++++++ .../r_tree/r_tree_creation.html | 184 +++++++ .../r_tree/rtree_quickstart.html | 132 +++++ .../r_tree/spatial_queries.html | 138 +++++ doc/html/index.html | 25 +- doc/imports.qbk | 11 + doc/index.qbk | 8 +- doc/introduction.qbk | 5 +- doc/rtree.qbk | 312 +----------- doc/rtree/creation.qbk | 95 ++++ doc/rtree/introduction.qbk | 18 + doc/rtree/nearest.qbk | 126 +++++ doc/rtree/query.qbk | 86 ++++ doc/rtree/quickstart.qbk | 47 ++ doc/src/examples/rtree/quick_start.cpp | 57 +++ .../comparable_distance_centroid.hpp | 7 +- .../algorithms/comparable_distance_far.hpp | 7 +- .../algorithms/comparable_distance_near.hpp | 7 +- .../extensions/index/algorithms/content.hpp | 4 +- .../index/algorithms/detail/diff_abs.hpp | 7 +- .../detail/smallest_for_indexable.hpp | 7 +- .../algorithms/detail/sum_for_indexable.hpp | 7 +- .../index/algorithms/intersection_content.hpp | 4 +- .../extensions/index/algorithms/is_valid.hpp | 7 +- .../extensions/index/algorithms/margin.hpp | 7 +- .../index/algorithms/minmaxdist.hpp | 4 +- .../index/algorithms/union_content.hpp | 9 +- .../geometry/extensions/index/assert.hpp | 5 +- .../extensions/index/distance_predicates.hpp | 7 +- .../index/filters/nearest_filter.hpp | 7 +- .../extensions/index/filters/query_filter.hpp | 7 +- .../geometry/extensions/index/indexable.hpp | 7 +- .../geometry/extensions/index/inserter.hpp | 7 +- .../extensions/index/nonassignable.hpp | 7 +- .../geometry/extensions/index/predicates.hpp | 7 +- .../extensions/index/pushable_array.hpp | 5 +- .../index/rtree/distance_predicates.hpp | 9 +- .../extensions/index/rtree/filters.hpp | 7 +- .../extensions/index/rtree/kmeans/kmeans.hpp | 7 +- .../extensions/index/rtree/kmeans/split.hpp | 7 +- .../extensions/index/rtree/linear/linear.hpp | 7 +- .../rtree/linear/redistribute_elements.hpp | 9 +- .../extensions/index/rtree/node/node.hpp | 7 +- .../index/rtree/node/node_default.hpp | 7 +- .../index/rtree/node/node_default_static.hpp | 7 +- .../node/node_default_static_variant.hpp | 7 +- .../index/rtree/node/node_default_variant.hpp | 7 +- .../extensions/index/rtree/options.hpp | 7 +- .../extensions/index/rtree/predicates.hpp | 7 +- .../index/rtree/quadratic/quadratic.hpp | 7 +- .../rtree/quadratic/redistribute_elements.hpp | 7 +- .../index/rtree/rstar/choose_next_node.hpp | 7 +- .../extensions/index/rtree/rstar/insert.hpp | 7 +- .../rtree/rstar/redistribute_elements.hpp | 7 +- .../extensions/index/rtree/rstar/rstar.hpp | 7 +- .../geometry/extensions/index/rtree/rtree.hpp | 9 +- .../geometry/extensions/index/rtree/tags.hpp | 7 +- .../index/rtree/visitors/are_boxes_ok.hpp | 7 +- .../index/rtree/visitors/are_levels_ok.hpp | 7 +- .../index/rtree/visitors/children_box.hpp | 7 +- .../extensions/index/rtree/visitors/copy.hpp | 7 +- .../index/rtree/visitors/destroy.hpp | 7 +- .../index/rtree/visitors/gl_draw.hpp | 7 +- .../index/rtree/visitors/insert.hpp | 7 +- .../index/rtree/visitors/is_leaf.hpp | 7 +- .../index/rtree/visitors/nearest.hpp | 7 +- .../extensions/index/rtree/visitors/print.hpp | 8 +- .../extensions/index/rtree/visitors/query.hpp | 7 +- .../index/rtree/visitors/remove.hpp | 7 +- .../extensions/index/translator/def.hpp | 7 +- .../extensions/index/translator/helpers.hpp | 7 +- .../extensions/index/translator/index.hpp | 7 +- .../index/translator/translator.hpp | 5 +- .../geometry/extensions/index/tuples.hpp | 5 +- test/Jamfile.v2 | 5 +- test/algorithms/Jamfile.v2 | 5 +- test/algorithms/content.cpp | 9 +- test/algorithms/intersection_content.cpp | 8 +- test/algorithms/is_valid.cpp | 8 +- test/algorithms/margin.cpp | 9 +- test/algorithms/minmaxdist.cpp | 8 +- test/algorithms/test_content.hpp | 3 +- test/algorithms/test_intersection_content.hpp | 3 +- test/algorithms/test_margin.hpp | 3 +- test/algorithms/test_union_content.hpp | 3 +- test/algorithms/union_content.cpp | 8 +- test/geometry_index_test_common.hpp | 10 +- test/rtree/Jamfile.v2 | 5 +- test/rtree/rtree2d_linear_d.cpp | 8 +- test/rtree/rtree2d_linear_f.cpp | 8 +- test/rtree/rtree2d_linear_i.cpp | 8 +- test/rtree/rtree2d_linear_tt.cpp | 8 +- test/rtree/rtree2d_quadratic_d.cpp | 8 +- test/rtree/rtree2d_quadratic_f.cpp | 8 +- test/rtree/rtree2d_quadratic_i.cpp | 8 +- test/rtree/rtree2d_quadratic_tt.cpp | 8 +- test/rtree/rtree2d_rstar_d.cpp | 8 +- test/rtree/rtree2d_rstar_f.cpp | 8 +- test/rtree/rtree2d_rstar_i.cpp | 8 +- test/rtree/rtree2d_rstar_tt.cpp | 8 +- test/rtree/rtree3d_linear_d.cpp | 8 +- test/rtree/rtree3d_linear_f.cpp | 8 +- test/rtree/rtree3d_linear_i.cpp | 8 +- test/rtree/rtree3d_linear_tt.cpp | 8 +- test/rtree/rtree3d_quadratic_d.cpp | 8 +- test/rtree/rtree3d_quadratic_f.cpp | 8 +- test/rtree/rtree3d_quadratic_i.cpp | 8 +- test/rtree/rtree3d_quadratic_tt.cpp | 8 +- test/rtree/rtree3d_rstar_d.cpp | 8 +- test/rtree/rtree3d_rstar_f.cpp | 8 +- test/rtree/rtree3d_rstar_i.cpp | 8 +- test/rtree/rtree3d_rstar_tt.cpp | 8 +- test/rtree/test_rtree.hpp | 3 +- 117 files changed, 1458 insertions(+), 1204 deletions(-) create mode 100644 doc/html/geometry_index/r_tree/introduction.html create mode 100644 doc/html/geometry_index/r_tree/nearest_neighbours_queries.html create mode 100644 doc/html/geometry_index/r_tree/r_tree_creation.html create mode 100644 doc/html/geometry_index/r_tree/rtree_quickstart.html create mode 100644 doc/html/geometry_index/r_tree/spatial_queries.html create mode 100644 doc/imports.qbk create mode 100644 doc/rtree/creation.qbk create mode 100644 doc/rtree/introduction.qbk create mode 100644 doc/rtree/nearest.qbk create mode 100644 doc/rtree/query.qbk create mode 100644 doc/rtree/quickstart.qbk create mode 100644 doc/src/examples/rtree/quick_start.cpp diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 2da6b592f..b30e99393 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -1,8 +1,7 @@ -# Boost.Geometry Index (Spatial Indexes) +# Boost.Geometry Index +# +# Copyright (c) 2011-2012 Adam Wulkiewicz. # -# Copyright (c) 2008 Federico J. Fernandez. -# Copyright (c) 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) @@ -16,16 +15,19 @@ boostbook geometry_index-doc : index.qbk : + Jamfile.v2 # off # on # off # index.on.type=1 html pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html + chunk.section.depth=2 chunk.first.sections=1 toc.section.depth=3 toc.max.depth=2 generate.section.toc.level=4 boost.root=http://www.boost.org/doc/libs/release enable_index + $(here) ; diff --git a/doc/html/geometry_index/introduction.html b/doc/html/geometry_index/introduction.html index 51e8b0631..0f8691293 100644 --- a/doc/html/geometry_index/introduction.html +++ b/doc/html/geometry_index/introduction.html @@ -3,10 +3,10 @@ Introduction - - - - + + + + diff --git a/doc/html/geometry_index/r_tree.html b/doc/html/geometry_index/r_tree.html index 1984cacc1..5b228da05 100644 --- a/doc/html/geometry_index/r_tree.html +++ b/doc/html/geometry_index/r_tree.html @@ -3,10 +3,11 @@ R-tree - - - + + + + @@ -19,472 +20,46 @@
-PrevUpHome +PrevUpHomeNext
-
Introduction
-
R-tree creation
+
Introduction
+
Quick Start
+
R-tree creation
-
Quick - start
-
R-tree +
R-tree template parameters
-
Values, +
Values, Indexables and default Translator
-
Inserting +
Inserting and splitting algorithms
+
Inserting + and removing Values
-
Inserting - and removing Values
-
Spatial queries
+
Spatial queries
-
Basic +
Basic queries
-
Spatial +
Spatial predicates
-
Nearest - neighbors queries
+
Nearest + neighbours queries
-
k - nearest neighbors
-
One - nearest neighbor
-
Distances +
k + nearest neighbours
+
One + nearest neighbour
+
Distances predicates
-
Using +
Using spatial predicates
-
-
-

- R-tree is a self-balancing search tree with nodes stored with their axis - aligned bounding boxes. Each node's box describes the space occupied by children - nodes. At the bottom of the structure, there are leaf-nodes which contains - values (geometric objects representations). Minimal and maximal numbers of - values/children which may be stored inside the node are user defined. -

-

- In order to use the R-tree one must include folowing file. -

-
#include <boost/geometry/extensions/index/rtree/rtree.hpp>
-
-
-
-
-
-
Quick - start
-
R-tree - template parameters
-
Values, - Indexables and default Translator
-
Inserting - and splitting algorithms
-
-
-
-

- In order to create a R-tree object storing values of type std::pair<Box, size_t> one may use the following code: -

-
using namespace boost::geometry;
-typedef std::pair<Box, size_t> Value;
-index::rtree< Value, index::quadratic<32, 8> > rt;
-
-
-
-
-

- R-tree has 4 parameters: -

-
rtree<Value, Parameters, Translator, Allocator>
-
-
    -
  • - Value - type of object - which will be stored in the container. -
    • -
  • - Parameters - compile-time - parameters, e.g. inserting/splitting algorithm with min and max nodes' - elements numbers. -
    • -
  • - Translator - type of - object translating Value - objects to Indexable - objects (Point - or Box) - which R-tree can handle. -
    • -
  • - Allocator - the allocator. -
    • -
-
-
-
-

- R-tree may store Values of any type as long as there is passed - the Translator which knows how to interpret those Values - and extract an object understandable by the R-tree. Those objects are called - Indexables and they are simply of type adapted to Point - or Box - concept. Default Translator index::translator::def<Value> is able to handle Point, - Box, - std::pair<...>, - pointer, iterator or smart pointer. -

-
    -
  • - Indexable = Point - | Box -
    • -
  • - BasicValue = - Indexable | - std::pair<Indexable, T> | std::pair<T, Indexable> -
    • -
  • - Value = BasicValue - | BasicValue* | Iterator<BasicValue> - | SmartPtr<BasicValue> -
    • -
-

- Examples of Value types: -

-
geometry::model::point<...>
-geometry::model::point_xy<...>
-geometry::model::box<...>
-std::pair<geometry::model::box<...>, size_t>
-
-
-
-
-

- Values may be inserted to the R-tree in many various ways. - Final structure of nodes depends on algorithms used in the process, especially - nodes' splitting algorithm. Currently, three well-known types of R-trees - may be created. -

-

- Linear - classic R-tree using splitting algorithm of linear complexity -

-
index::rtree< Value, index::linear<32, 8> > rt;
-
-

- Quadratic - classic R-tree using splitting algorithm of quadratic complexity -

-
index::rtree< Value, index::quadratic<32, 8> > rt;
-
-

- R*-tree - splitting algorithm minimizing nodes' overlap with forced reinsertions -

-
index::rtree< Value, index::rstar<32, 8> > rt;
-
-
-
-
-
-

- Create -

-
using namespace boost::geometry;
-typedef std::pair<Box, int> Value;
-index::rtree< Value, index::quadratic<32, 8> > rt;
-
-

- Insert and remove by method call -

-
Value v = std::make_pair(Box(...), 0);
-rt.insert(v);
-rt.remove(v);
-
-

- or by function call -

-
Value v = std::make_pair(Box(...), 0);
-index::insert(rt, v);
-index::remove(rt, v);
-
-
-
-
-
-
Basic - queries
-
Spatial - predicates
-
-
-
-

- There are three ways to perform a spatial query. Following queries returns - Values intersecting some box_region. -

-

- Method call -

-
std::vector<Value> returned_values;
-Box box_region(...);
-rt.query(box_region, std::back_inserter(returned_values));
-
-

- Function call -

-
std::vector<Value> returned_values;
-Box box_region(...);
-index::query(rt, box_region, std::back_inserter(returned_values));
-
-

- Use of operator | - (as with ranges) -

-
Box box_region(...);
-BOOST_FOREACH(Value & v, rt | index::query_filtered(box_region))
-  ; // do something with v
-
-
-
-
-

- It is possible to define other relations between queried Values - and region/regions of interest. Names of predicates corresponds to names - of Boost.Geometry - algorithms. -

-
rt.query(box, std::back_inserter(result)); // default case - intersects
-rt.query(index::intersects(box), std::back_inserter(result)); // same as default
-rt.query(index::covered_by(box), std::back_inserter(result));
-rt.query(index::disjont(box), std::back_inserter(result));
-rt.query(index::overlaps(box), std::back_inserter(result));
-rt.query(index::within(box), std::back_inserter(result));
-
-

- All predicates may be negated, e.g.: -

-
rt.query(index::not_intersects(box), std::back_inserter(result));
-// or
-rt.query(!index::intersects(box), std::back_inserter(result));
-// the same as
-rt.query(index::disjoint(box), std::back_inserter(result));
-
-

- It's possible to use some number of predicates by passing std::pair<Pred1, Pred2> -

-
rt.query(
-  std::make_pair(index::intersects(box1), !index::within(box2))
-  , std::back_inserter(result));
-
-

- or boost::tuple<Pred1, Pred2, Pred3, ...> -

-
rt.query(
-  boost::make_tuple(
-    index::intersects(box1), !index::within(box2), index::overlaps(box3))
-  , std::back_inserter(result));
-
-

- There is also a unique predicate index::value(...) taking user-defined function/functor - which checks if Value should be returned by the query. -

-
bool fun(__value const& v)
-{
-  return v.is_red();
-}
-
-// ...
-
-rt.query(
-  boost::make_pair(index::intersects(box), index::value(fun))
-  , std::back_inserter(result));
-
-
-
-
-
-
-
k - nearest neighbors
-
One - nearest neighbor
-
Distances - predicates
-
Using - spatial predicates
-
-
-
-

- There are three ways of performing knn queries. Following queries returns - k Values closest to some point in space. For Boxes - Indexables closest point of a Box - is taken into account by default. -

-

- Method call -

-
std::vector<Value> returned_values;
-Point pt(...);
-rt.nearest(pt, k, std::back_inserter(returned_values));
-
-

- Function call -

-
std::vector<Value> returned_values;
-Point pt(...);
-index::nearest(rt, pt, k, std::back_inserter(returned_values));
-
-

- Use of operator | -

-
Point pt(...);
-BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k))
-  ; // do something with v
-
-
-
-
-

- Another type of nearest neighbor query is searching for the one closest - Value. If it is found, 1 is returned by the method or function. - This kind of query has only two forms. -

-

- Method call -

-
Value returned_value;
-Point pt(...);
-size_t n = rt.nearest(pt, returned_value);
-
-

- Function call -

-
Value Value returned_value;
-Point pt(...);
-size_t n = index::nearest(rt, pt, returned_value);
-
-
-
-
-

- It is possible to define if calculated distance between query point and - Value should be greater, lesser or between some other distances. - Those are called DistancesPredicates - and may be defined as follows. -

-
std::vector<__Value__> returned_values;
-Point pt(...);
-
-/* default - without bounds */
-index::nearest(rt, pt, k, std::back_inserter(returned_values));
-
-/* same as default */
-index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values));
-
-/* distance must be greater than or equal to 10 */
-index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
-
-/* distance must be lesser than or equal to 500 */
-index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));
-
-/* distance must be between 10 and 500 */
-index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
-
-

- Furthermore, it's possible to define if the closest, furthest or centroidal - point of the non-point Indexable should be taken into account - in the routine calculating distance. -

-
std::vector<Value> returned_values;
-Point pt(...);
-
-/* default - distance between Indexable's closest point and a query point
-must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
-
-/* same as default - distance between Indexable's closest point and a query point
-must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::near(10)), k, std::back_inserter(returned_values));
-
-/* distance between Indexable's furthest point and a query point
-must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::far(10)), k, std::back_inserter(returned_values));
-
-/* distance between Indexable's centroid and a query point
-must be greater than 10 */
-index::nearest(rt, index::min_bounded(pt, index::centroid(10)), k, std::back_inserter(returned_values));
-
-
-
-
-

- It is possible to use spatial predicates described before in nearest neighbors - queries. -

-
Value returned_value;
-std::vector<Value> returned_values;
-
-Point pt(...);
-Box b(...);
-
-size_t n1 = rt.nearest(index::bounded(pt, index::far(1), 10), index::intersects(b), returned_value);
-
-size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values));
-
-BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b)))
-  ; // do something with v
-
-
-
@@ -496,7 +71,7 @@ must be greater than 10 */
-PrevUpHome +PrevUpHomeNext
diff --git a/doc/html/geometry_index/r_tree/introduction.html b/doc/html/geometry_index/r_tree/introduction.html new file mode 100644 index 000000000..cc12a4724 --- /dev/null +++ b/doc/html/geometry_index/r_tree/introduction.html @@ -0,0 +1,50 @@ + + + +Introduction + + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHomeNext +
+
+
+

+ R-tree is a self-balancing search tree. Each tree's node store a box descring + the space occupied by children nodes. At the bottom of the structure, there + are leaf-nodes which contains values (geometric objects representations). + Minimal and maximal numbers of values/children which may be stored inside + each node are user defined. +

+
+ + + +
Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

+ Distributed under 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html b/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html new file mode 100644 index 000000000..a6e000f36 --- /dev/null +++ b/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html @@ -0,0 +1,188 @@ + + + +Nearest neighbours queries + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHome +
+
+
+
+
k + nearest neighbours
+
One + nearest neighbour
+
Distances + predicates
+
Using + spatial predicates
+
+
+
+

+ There are three ways of performing knn queries. Following queries returns + k Values closest to some point in space. For Boxes + Indexables the distance to the nearest point is calculated + by default. +

+

+ Method call +

+
std::vector<Value> returned_values;
+Point pt(...);
+rt.nearest(pt, k, std::back_inserter(returned_values));
+
+

+ Function call +

+
std::vector<Value> returned_values;
+Point pt(...);
+index::nearest(rt, pt, k, std::back_inserter(returned_values));
+
+

+ Use of operator | +

+
Point pt(...);
+BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k))
+  ; // do something with v
+
+
+
+
+

+ Another type of nearest neighbour query is searching for the one closest + Value. If it is found, 1 is returned by the method or function. + This kind of query has only two forms. +

+

+ Method call +

+
Value returned_value;
+Point pt(...);
+size_t n = rt.nearest(pt, returned_value);
+
+

+ Function call +

+
Value Value returned_value;
+Point pt(...);
+size_t n = index::nearest(rt, pt, returned_value);
+
+
+
+
+

+ It is possible to define if calculated distance between query point and + Value should be greater, lesser or between some other distances. + Those are called DistancesPredicates + and may be defined as follows. +

+
std::vector<__Value__> returned_values;
+Point pt(...);
+
+/* default - without bounds */
+index::nearest(rt, pt, k, std::back_inserter(returned_values));
+
+/* same as default */
+index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values));
+
+/* distance must be greater than or equal to 10 */
+index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+
+/* distance must be lesser than or equal to 500 */
+index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values));
+
+/* distance must be between 10 and 500 */
+index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values));
+
+

+ Furthermore, it's possible to define if the closest, furthest or centroidal + point of the non-point Indexable should be taken into account + in the routine calculating distance. +

+
std::vector<Value> returned_values;
+Point pt(...);
+
+/* default - distance between Indexable's closest point and a query point
+must be greater than 10 */
+index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values));
+
+/* same as default - distance between Indexable's closest point and a query point
+must be greater than 10 */
+index::nearest(rt, index::min_bounded(pt, index::near(10)), k, std::back_inserter(returned_values));
+
+/* distance between Indexable's furthest point and a query point
+must be greater than 10 */
+index::nearest(rt, index::min_bounded(pt, index::far(10)), k, std::back_inserter(returned_values));
+
+/* distance between Indexable's centroid and a query point
+must be greater than 10 */
+index::nearest(rt, index::min_bounded(pt, index::centroid(10)), k, std::back_inserter(returned_values));
+
+
+
+
+

+ It is possible to use spatial predicates described before in nearest neighbours + queries. +

+
Value returned_value;
+std::vector<Value> returned_values;
+
+Point pt(...);
+Box b(...);
+
+size_t n1 = rt.nearest(index::bounded(pt, index::far(1), 10), index::intersects(b), returned_value);
+
+size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values));
+
+BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b)))
+  ; // do something with v
+
+
+
+ + + +
Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

+ Distributed under 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) +

+
+
+
+PrevUpHome +
+ + diff --git a/doc/html/geometry_index/r_tree/r_tree_creation.html b/doc/html/geometry_index/r_tree/r_tree_creation.html new file mode 100644 index 000000000..a31e3c53a --- /dev/null +++ b/doc/html/geometry_index/r_tree/r_tree_creation.html @@ -0,0 +1,184 @@ + + + +R-tree creation + + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHomeNext +
+
+
+
+
R-tree + template parameters
+
Values, + Indexables and default Translator
+
Inserting + and splitting algorithms
+
Inserting + and removing Values
+
+
+
+

+ R-tree has 4 parameters: +

+
rtree<Value, Parameters, Translator, Allocator>
+
+
    +
  • + Value - type of object + which will be stored in the container. +
    • +
  • + Parameters - compile-time + parameters, e.g. inserting/splitting algorithm with min and max nodes' + elements numbers. +
    • +
  • + Translator - type of + object translating Value + objects to Indexable + objects (Point + or Box) + which R-tree can handle. +
    • +
  • + Allocator - the allocator. +
    • +
+
+
+
+

+ R-tree may store Values of any type as long the Translator + is passed as parameter. It knows how to interpret those Values + and extract an object understandable by the R-tree. Those objects are called + Indexables. Each type adapted to Point + or Box + concept is an Indexable. Default Translator + index::translator::def<Value> + is able to handle Point, + Box, + std::pair<...>, + pointer, iterator or smart pointer. +

+
    +
  • + Indexable = Point + | Box +
    • +
  • + BasicValue = + Indexable | + std::pair<Indexable, T> | std::pair<T, Indexable> +
    • +
  • + Value = BasicValue + | BasicValue* | Iterator<BasicValue> + | SmartPtr<BasicValue> +
    • +
+

+ Examples of Value types: +

+
geometry::model::point<...>
+geometry::model::point_xy<...>
+geometry::model::box<...>
+std::pair<geometry::model::box<...>, size_t>
+
+
+
+
+

+ Values may be inserted to the R-tree in many various ways. + Final internal structure of the R-tree depends on algorithms used in the + insertion process. The most important is nodes' splitting algorithm. Currently, + three well-known types of R-trees may be created. +

+

+ Linear - classic R-tree using splitting algorithm of linear complexity +

+
index::rtree< Value, index::linear<32, 8> > rt;
+
+

+ Quadratic - classic R-tree using splitting algorithm of quadratic complexity +

+
index::rtree< Value, index::quadratic<32, 8> > rt;
+
+

+ R*-tree - splitting algorithm minimizing nodes' overlap with forced reinsertions +

+
index::rtree< Value, index::rstar<32, 8> > rt;
+
+
+
+
+

+ Following code creates an R-tree using quadratic algorithm. +

+
using namespace boost::geometry;
+typedef std::pair<Box, int> Value;
+index::rtree< Value, index::quadratic<32, 8> > rt;
+
+

+ To insert or remove Value's by method calls one may use the following code. +

+
Value v = std::make_pair(Box(...), 0);
+rt.insert(v);
+rt.remove(v);
+
+

+ To insert or remove Value's by function calls one may use the following + code. +

+
Value v = std::make_pair(Box(...), 0);
+index::insert(rt, v);
+index::remove(rt, v);
+
+
+
+ + + +
Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

+ Distributed under 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/geometry_index/r_tree/rtree_quickstart.html b/doc/html/geometry_index/r_tree/rtree_quickstart.html new file mode 100644 index 000000000..857993868 --- /dev/null +++ b/doc/html/geometry_index/r_tree/rtree_quickstart.html @@ -0,0 +1,132 @@ + + + +Quick Start + + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHomeNext +
+
+
+

+ This Quick Start section shows simple way to creating a typical R-tree and + perform spatial query. +

+

+ The code below assumes that following files are included and namespaces used. +

+

+

+
#include <vector>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <boost/geometry/extensions/index/rtree/rtree.hpp>
+
+namespace bg = boost::geometry;
+namespace bgi = boost::geometry::index;
+
+

+

+

+ It is possible to store user-defined types in the R-tree. To keep it simple + we will use predefined Point + and Box. +

+

+

+
typedef bg::model::point<float, 2, bg::cs::cartesian> point;
+typedef bg::model::box<point> box;
+typedef std::pair<box, unsigned> value;
+
+

+

+

+ R-tree may be created using various algorithm and parameters. In this example + we will use quadratic algorithm. Maximum number of elements in nodes are + set to 32, minimum to 8. +

+

+

+
bgi::rtree< value, bgi::quadratic<32, 8> > rtree;
+
+

+

+

+ Inserting values into the R-tree may be done by calling insert() method. +

+

+

+
// create some box
+// this typically will be an envelope of some geometry
+box b(point(0, 0), point(10, 10));
+// insert new value
+rtree.insert(std::make_pair(b, 0));
+
+

+

+

+ There are various types of queries that may be performed, they can be even + combined together in one call. For simplicity, default one is used. +

+

+

+
// find values intersecting a box
+std::vector<value> result;
+rtree.query(b, std::back_inserter(result));
+
+

+

+

+ Default k-nearest neighbors query may be performed as follows. +

+

+

+
// find 5 nearest values to a point
+rtree.nearest(point(0, 0), 5, std::back_inserter(result));
+
+

+

+

+ + More +

+

+ More information about the R-tree implementation, other algorithms and queries + may be found in other parts of this documentation. +

+
+ + + +
Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

+ Distributed under 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/geometry_index/r_tree/spatial_queries.html b/doc/html/geometry_index/r_tree/spatial_queries.html new file mode 100644 index 000000000..d158c340d --- /dev/null +++ b/doc/html/geometry_index/r_tree/spatial_queries.html @@ -0,0 +1,138 @@ + + + +Spatial queries + + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHomeNext +
+
+
+
+
Basic + queries
+
Spatial + predicates
+
+
+
+

+ There are three ways to perform a spatial query. Following queries returns + Values intersecting some box_region. +

+

+ Method call +

+
std::vector<Value> returned_values;
+Box box_region(...);
+rt.query(box_region, std::back_inserter(returned_values));
+
+

+ Function call +

+
std::vector<Value> returned_values;
+Box box_region(...);
+index::query(rt, box_region, std::back_inserter(returned_values));
+
+

+ Use of pipe operator generating a range +

+
Box box_region(...);
+BOOST_FOREACH(Value & v, rt | index::query_filtered(box_region))
+  ; // do something with v
+
+
+
+
+

+ It is possible to define other relations between queried Values + and region/regions of interest. Names of predicates corresponds to names + of Boost.Geometry + algorithms. +

+
rt.query(box, std::back_inserter(result)); // default case - intersects
+rt.query(index::intersects(box), std::back_inserter(result)); // same as default
+rt.query(index::covered_by(box), std::back_inserter(result));
+rt.query(index::disjont(box), std::back_inserter(result));
+rt.query(index::overlaps(box), std::back_inserter(result));
+rt.query(index::within(box), std::back_inserter(result));
+
+

+ All predicates may be negated, e.g.: +

+
rt.query(index::not_intersects(box), std::back_inserter(result));
+// or
+rt.query(!index::intersects(box), std::back_inserter(result));
+// the same as
+rt.query(index::disjoint(box), std::back_inserter(result));
+
+

+ It's possible to use some number of predicates by passing std::pair<Pred1, Pred2> +

+
rt.query(
+  std::make_pair(index::intersects(box1), !index::within(box2))
+  , std::back_inserter(result));
+
+

+ or boost::tuple<Pred1, Pred2, Pred3, ...> +

+
rt.query(
+  boost::make_tuple(
+    index::intersects(box1), !index::within(box2), index::overlaps(box3))
+  , std::back_inserter(result));
+
+

+ There is also a unique predicate index::value(...) taking user-defined function/functor + which checks if Value should be returned by the query. +

+
bool fun(Value const& v)
+{
+  return v.is_red();
+}
+
+// ...
+
+rt.query(
+  boost::make_pair(index::intersects(box), index::value(fun))
+  , std::back_inserter(result));
+
+
+
+ + + +
Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

+ Distributed under 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/index.html b/doc/html/index.html index 74bcd3da9..2dec2b327 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ -Chapter 1. Geometry Index 0.7 +Chapter 1. Geometry Index - - + + @@ -21,7 +21,7 @@

-Chapter 1. Geometry Index 0.7

+Chapter 1. Geometry Index

Adam Wulkiewicz

@@ -30,7 +30,7 @@

Copyright © 2011 Adam Wulkiewicz, Federico J. Fernandez

-

+

Distributed under 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)

@@ -42,19 +42,18 @@
Introduction
R-tree
-
Introduction
-
R-tree creation
-
Inserting - and removing Values
-
Spatial queries
-
Nearest - neighbors queries
+
Introduction
+
Quick Start
+
R-tree creation
+
Spatial queries
+
Nearest + neighbours queries
- +

Last revised: November 30, 2011 at 13:38:40 GMT

Last revised: August 23, 2012 at 21:48:12 GMT
diff --git a/doc/imports.qbk b/doc/imports.qbk new file mode 100644 index 000000000..f05ec3443 --- /dev/null +++ b/doc/imports.qbk @@ -0,0 +1,11 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[import src/examples/rtree/quick_start.cpp] diff --git a/doc/index.qbk b/doc/index.qbk index feb00e062..35683effd 100644 --- a/doc/index.qbk +++ b/doc/index.qbk @@ -1,8 +1,7 @@ [/============================================================================ - Boost.Geometry Index (Spatial Indexes) + Boost.Geometry Index - Copyright (c) 2008 Federico J. Fernandez. - Copyright (c) 2011 Adam Wulkiewicz. + Copyright (c) 2011-2012 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 @@ -11,7 +10,6 @@ [library Geometry Index [quickbook 1.5] - [version 0.7] [authors [Wulkiewicz, Adam], [Fernandez, Federico J.]] [copyright 2011 Adam Wulkiewicz, Federico J. Fernandez] [purpose Documentation of Boost.Geometry Index library] @@ -42,6 +40,8 @@ [def __cgeometry__ [@http://www.boost.org/libs/geometry/doc/html/index.html geometry]] [def __cboost__ [@http://www.boost.org/libs/libraries.htm boost]] +[include imports.qbk] + [include introduction.qbk] [include rtree.qbk] diff --git a/doc/introduction.qbk b/doc/introduction.qbk index cbb53fad2..6c695d2a7 100644 --- a/doc/introduction.qbk +++ b/doc/introduction.qbk @@ -1,8 +1,7 @@ [/============================================================================ - Boost.Geometry Index (Spatial Indexes) + Boost.Geometry Index - Copyright (c) 2008 Federico J. Fernandez. - Copyright (c) 2011 Adam Wulkiewicz. + Copyright (c) 2011-2012 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 diff --git a/doc/rtree.qbk b/doc/rtree.qbk index 69049b17c..07b5274c1 100644 --- a/doc/rtree.qbk +++ b/doc/rtree.qbk @@ -1,8 +1,7 @@ [/============================================================================ - Boost.Geometry Index (Spatial Indexes) + Boost.Geometry Index - Copyright (c) 2008 Federico J. Fernandez. - Copyright (c) 2011 Adam Wulkiewicz. + Copyright (c) 2011-2012 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 @@ -11,307 +10,10 @@ [section R-tree] -[section Introduction] - -__rtree__ is a self-balancing search tree with nodes stored with their axis aligned -bounding boxes. Each node's box describes the space occupied by children nodes. -At the bottom of the structure, there are leaf-nodes which contains values -(geometric objects representations). Minimal and maximal numbers of values/children -which may be stored inside the node are user defined. - -In order to use the __rtree__ one must include folowing file. - - #include +[include rtree/introduction.qbk] +[include rtree/quickstart.qbk] +[include rtree/creation.qbk] +[include rtree/query.qbk] +[include rtree/nearest.qbk] [endsect] - -[section R-tree creation] - -[section Quick start] - -In order to create a __rtree__ object storing values of type `std::pair<__box__, size_t>` -one may use the following code: - - using namespace __cboost__::__cgeometry__; - typedef std::pair<__box__, size_t> Value; - index::rtree< Value, index::quadratic<32, 8> > rt; - -[endsect] - -[section R-tree template parameters] - -__rtree__ has 4 parameters: - - rtree - -* `Value` - type of object which will be stored in the container. -* `Parameters` - compile-time parameters, e.g. inserting/splitting - algorithm with min and max nodes' elements numbers. -* `Translator` - type of object translating `Value` objects to - `Indexable` objects (`__point__` or `__box__`) which __rtree__ can handle. -* `Allocator` - the allocator. - -[endsect] - -[section Values, Indexables and default Translator] - -__rtree__ may store `__value__`s of any type as long as there is passed -the `__translator__` which knows how to interpret those `__value__`s -and extract an object understandable by the __rtree__. Those objects are called -`__indexable__`s and they are simply of type adapted to `__point__` -or `__box__` concept. Default `__translator__` `index::translator::def` -is able to handle `__point__`, `__box__`, `std::pair<...>`, pointer, iterator -or smart pointer. - -* `__indexable__ = __point__ | __box__` -* `BasicValue = Indexable | std::pair<__indexable__, T> | std::pair` -* `__value__ = BasicValue | BasicValue* | Iterator | SmartPtr` - -Examples of `__value__` types: - - geometry::model::point<...> - geometry::model::point_xy<...> - geometry::model::box<...> - std::pair, size_t> - -[endsect] - -[section Inserting and splitting algorithms] - -`__value__`s may be inserted to the __rtree__ in many various ways. Final structure of nodes depends -on algorithms used in the process, especially nodes' splitting algorithm. Currently, three -well-known types of R-trees may be created. - -Linear - classic __rtree__ using splitting algorithm of linear complexity - - index::rtree< __value__, index::linear<32, 8> > rt; - -Quadratic - classic __rtree__ using splitting algorithm of quadratic complexity - - index::rtree< __value__, index::quadratic<32, 8> > rt; - -R*-tree - splitting algorithm minimizing nodes' overlap with forced reinsertions - - index::rtree< __value__, index::rstar<32, 8> > rt; - -[endsect] - -[endsect] [/ R-tree creation /] - -[section Inserting and removing Values] - -Create - - using namespace boost::geometry; - typedef std::pair __value__; - index::rtree< __value__, index::quadratic<32, 8> > rt; - -Insert and remove by method call - - __value__ v = std::make_pair(__box__(...), 0); - rt.insert(v); - rt.remove(v); - -or by function call - - __value__ v = std::make_pair(__box__(...), 0); - index::insert(rt, v); - index::remove(rt, v); - -[endsect] - -[section Spatial queries] - -[section Basic queries] - -There are three ways to perform a spatial query. Following queries returns -`__value__`s intersecting some box_region. - -Method call - - std::vector<__value__> returned_values; - __box__ box_region(...); - rt.query(box_region, std::back_inserter(returned_values)); - -Function call - - std::vector<__value__> returned_values; - __box__ box_region(...); - index::query(rt, box_region, std::back_inserter(returned_values)); - -Use of `operator |` (as with ranges) - - __box__ box_region(...); - BOOST_FOREACH(__value__ & v, rt | index::query_filtered(box_region)) - ; // do something with v -[endsect] - -[section Spatial predicates] - -It is possible to define other relations between queried `__value__`s and region/regions -of interest. Names of predicates corresponds to names of __boost_geometry__ algorithms. - - rt.query(box, std::back_inserter(result)); // default case - intersects - rt.query(index::intersects(box), std::back_inserter(result)); // same as default - rt.query(index::covered_by(box), std::back_inserter(result)); - rt.query(index::disjont(box), std::back_inserter(result)); - rt.query(index::overlaps(box), std::back_inserter(result)); - rt.query(index::within(box), std::back_inserter(result)); - -All predicates may be negated, e.g.: - - rt.query(index::not_intersects(box), std::back_inserter(result)); - // or - rt.query(!index::intersects(box), std::back_inserter(result)); - // the same as - rt.query(index::disjoint(box), std::back_inserter(result)); - -It's possible to use some number of predicates by passing `std::pair` - - rt.query( - std::make_pair(index::intersects(box1), !index::within(box2)) - , std::back_inserter(result)); - -or `boost::tuple` - - rt.query( - boost::make_tuple( - index::intersects(box1), !index::within(box2), index::overlaps(box3)) - , std::back_inserter(result)); - -There is also a unique predicate `index::value(...)` taking user-defined function/functor -which checks if `__value__` should be returned by the query. - - bool fun(__value const& v) - { - return v.is_red(); - } - - // ... - - rt.query( - boost::make_pair(index::intersects(box), index::value(fun)) - , std::back_inserter(result)); - -[endsect] - -[endsect] [/ Spatial queries /] - -[section Nearest neighbors queries] - -[section k nearest neighbors] - -There are three ways of performing knn queries. Following queries returns -k `__value__`s closest to some point in space. For `__box__`es -`__indexable__`s closest point of a `__box__` is taken into account by default. - -Method call - - std::vector<__value__> returned_values; - __point__ pt(...); - rt.nearest(pt, k, std::back_inserter(returned_values)); - -Function call - - std::vector<__value__> returned_values; - __point__ pt(...); - index::nearest(rt, pt, k, std::back_inserter(returned_values)); - -Use of `operator |` - - __point__ pt(...); - BOOST_FOREACH(__value__ & v, rt | index::nearest_filtered(pt, k)) - ; // do something with v - -[endsect] - -[section One nearest neighbor] - -Another type of nearest neighbor query is searching for the one closest `__value__`. -If it is found, 1 is returned by the method or function. This kind of query -has only two forms. - -Method call - - __value__ returned_value; - __point__ pt(...); - size_t n = rt.nearest(pt, returned_value); - -Function call - - __value__ Value returned_value; - __point__ pt(...); - size_t n = index::nearest(rt, pt, returned_value); - -[endsect] - -[section Distances predicates] - -It is possible to define if calculated distance between query point and `__value__` should be -greater, lesser or between some other distances. Those are called `DistancesPredicate`s and -may be defined as follows. - - std::vector<__Value__> returned_values; - __point__ pt(...); - - /* default - without bounds */ - index::nearest(rt, pt, k, std::back_inserter(returned_values)); - - /* same as default */ - index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values)); - - /* distance must be greater than or equal to 10 */ - index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values)); - - /* distance must be lesser than or equal to 500 */ - index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values)); - - /* distance must be between 10 and 500 */ - index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values)); - -Furthermore, it's possible to define if the closest, furthest or centroidal point of the -non-point `__indexable__` should be taken into account in the routine calculating distance. - - std::vector<__value__> returned_values; - __point__ pt(...); - - /* default - distance between Indexable's closest point and a query point - must be greater than 10 */ - index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values)); - - /* same as default - distance between Indexable's closest point and a query point - must be greater than 10 */ - index::nearest(rt, index::min_bounded(pt, index::near(10)), k, std::back_inserter(returned_values)); - - /* distance between Indexable's furthest point and a query point - must be greater than 10 */ - index::nearest(rt, index::min_bounded(pt, index::far(10)), k, std::back_inserter(returned_values)); - - /* distance between Indexable's centroid and a query point - must be greater than 10 */ - index::nearest(rt, index::min_bounded(pt, index::centroid(10)), k, std::back_inserter(returned_values)); - -[endsect] - -[section Using spatial predicates] - -It is possible to use spatial predicates described before in nearest neighbors queries. - - __value__ returned_value; - std::vector<__value__> returned_values; - - __point__ pt(...); - __box__ b(...); - - size_t n1 = rt.nearest(index::bounded(pt, index::far(1), 10), index::intersects(b), returned_value); - - size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values)); - - BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b))) - ; // do something with v - -[endsect] - -[endsect] [/ Nearest neighbors queries /] - -[endsect] [/ R-tree /] diff --git a/doc/rtree/creation.qbk b/doc/rtree/creation.qbk new file mode 100644 index 000000000..73d614090 --- /dev/null +++ b/doc/rtree/creation.qbk @@ -0,0 +1,95 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[section R-tree creation] + +[section R-tree template parameters] + +__rtree__ has 4 parameters: + + rtree + +* `Value` - type of object which will be stored in the container. +* `Parameters` - compile-time parameters, e.g. inserting/splitting + algorithm with min and max nodes' elements numbers. +* `Translator` - type of object translating `Value` objects to + `Indexable` objects (`__point__` or `__box__`) which __rtree__ can handle. +* `Allocator` - the allocator. + +[endsect] + +[section Values, Indexables and default Translator] + +__rtree__ may store `__value__`s of any type as long the `__translator__` +is passed as parameter. It knows how to interpret those `__value__`s +and extract an object understandable by the __rtree__. Those objects are called +`__indexable__`s. Each type adapted to `__point__` or `__box__` concept is an `__indexable__`. +Default `__translator__` `index::translator::def` +is able to handle `__point__`, `__box__`, `std::pair<...>`, pointer, iterator +or smart pointer. + +* `__indexable__ = __point__ | __box__` +* `BasicValue = Indexable | std::pair<__indexable__, T> | std::pair` +* `__value__ = BasicValue | BasicValue* | Iterator | SmartPtr` + +Examples of `__value__` types: + + geometry::model::point<...> + geometry::model::point_xy<...> + geometry::model::box<...> + std::pair, size_t> + +[endsect] + +[section Inserting and splitting algorithms] + +`__value__`s may be inserted to the __rtree__ in many various ways. Final internal structure +of the __rtree__ depends on algorithms used in the insertion process. The most important is +nodes' splitting algorithm. Currently, three well-known types of R-trees may be created. + +Linear - classic __rtree__ using splitting algorithm of linear complexity + + index::rtree< __value__, index::linear<32, 8> > rt; + +Quadratic - classic __rtree__ using splitting algorithm of quadratic complexity + + index::rtree< __value__, index::quadratic<32, 8> > rt; + +R*-tree - splitting algorithm minimizing nodes' overlap with forced reinsertions + + index::rtree< __value__, index::rstar<32, 8> > rt; + +[endsect] + +[section Inserting and removing Values] + +Following code creates an __rtree__ using quadratic algorithm. + + using namespace boost::geometry; + typedef std::pair __value__; + index::rtree< __value__, index::quadratic<32, 8> > rt; + +To insert or remove __value__'s by method calls one may use the following +code. + + __value__ v = std::make_pair(__box__(...), 0); + rt.insert(v); + rt.remove(v); + +To insert or remove __value__'s by function calls one may use the following +code. + + __value__ v = std::make_pair(__box__(...), 0); + index::insert(rt, v); + index::remove(rt, v); + +[endsect] + +[endsect] [/ R-tree creation /] diff --git a/doc/rtree/introduction.qbk b/doc/rtree/introduction.qbk new file mode 100644 index 000000000..dc283360f --- /dev/null +++ b/doc/rtree/introduction.qbk @@ -0,0 +1,18 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[section Introduction] + +__rtree__ is a self-balancing search tree. Each tree's node store a box descring the space occupied by children nodes. +At the bottom of the structure, there are leaf-nodes which contains values +(geometric objects representations). Minimal and maximal numbers of values/children +which may be stored inside each node are user defined. + +[endsect] diff --git a/doc/rtree/nearest.qbk b/doc/rtree/nearest.qbk new file mode 100644 index 000000000..2ecdf5717 --- /dev/null +++ b/doc/rtree/nearest.qbk @@ -0,0 +1,126 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[section Nearest neighbours queries] + +[section k nearest neighbours] + +There are three ways of performing knn queries. Following queries returns +k `__value__`s closest to some point in space. For `__box__`es +`__indexable__`s the distance to the nearest point is calculated by default. + +Method call + + std::vector<__value__> returned_values; + __point__ pt(...); + rt.nearest(pt, k, std::back_inserter(returned_values)); + +Function call + + std::vector<__value__> returned_values; + __point__ pt(...); + index::nearest(rt, pt, k, std::back_inserter(returned_values)); + +Use of `operator |` + + __point__ pt(...); + BOOST_FOREACH(__value__ & v, rt | index::nearest_filtered(pt, k)) + ; // do something with v + +[endsect] + +[section One nearest neighbour] + +Another type of nearest neighbour query is searching for the one closest `__value__`. +If it is found, 1 is returned by the method or function. This kind of query +has only two forms. + +Method call + + __value__ returned_value; + __point__ pt(...); + size_t n = rt.nearest(pt, returned_value); + +Function call + + __value__ Value returned_value; + __point__ pt(...); + size_t n = index::nearest(rt, pt, returned_value); + +[endsect] + +[section Distances predicates] + +It is possible to define if calculated distance between query point and `__value__` should be +greater, lesser or between some other distances. Those are called `DistancesPredicate`s and +may be defined as follows. + + std::vector<__Value__> returned_values; + __point__ pt(...); + + /* default - without bounds */ + index::nearest(rt, pt, k, std::back_inserter(returned_values)); + + /* same as default */ + index::nearest(rt, index::unbounded(pt), k, std::back_inserter(returned_values)); + + /* distance must be greater than or equal to 10 */ + index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values)); + + /* distance must be lesser than or equal to 500 */ + index::nearest(rt, index::max_bounded(pt, 500), k, std::back_inserter(returned_values)); + + /* distance must be between 10 and 500 */ + index::nearest(rt, index::bounded(pt, 10, 500), k, std::back_inserter(returned_values)); + +Furthermore, it's possible to define if the closest, furthest or centroidal point of the +non-point `__indexable__` should be taken into account in the routine calculating distance. + + std::vector<__value__> returned_values; + __point__ pt(...); + + /* default - distance between Indexable's closest point and a query point + must be greater than 10 */ + index::nearest(rt, index::min_bounded(pt, 10), k, std::back_inserter(returned_values)); + + /* same as default - distance between Indexable's closest point and a query point + must be greater than 10 */ + index::nearest(rt, index::min_bounded(pt, index::near(10)), k, std::back_inserter(returned_values)); + + /* distance between Indexable's furthest point and a query point + must be greater than 10 */ + index::nearest(rt, index::min_bounded(pt, index::far(10)), k, std::back_inserter(returned_values)); + + /* distance between Indexable's centroid and a query point + must be greater than 10 */ + index::nearest(rt, index::min_bounded(pt, index::centroid(10)), k, std::back_inserter(returned_values)); + +[endsect] + +[section Using spatial predicates] + +It is possible to use spatial predicates described before in nearest neighbours queries. + + __value__ returned_value; + std::vector<__value__> returned_values; + + __point__ pt(...); + __box__ b(...); + + size_t n1 = rt.nearest(index::bounded(pt, index::far(1), 10), index::intersects(b), returned_value); + + size_t n2 = index::nearest(rt, pt, k, index::within(b), std::back_inserter(returned_values)); + + BOOST_FOREACH(Value & v, rt | index::nearest_filtered(pt, k, index::covered_by(b))) + ; // do something with v + +[endsect] + +[endsect] [/ Nearest neighbours queries /] diff --git a/doc/rtree/query.qbk b/doc/rtree/query.qbk new file mode 100644 index 000000000..65d687f7f --- /dev/null +++ b/doc/rtree/query.qbk @@ -0,0 +1,86 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[section Spatial queries] + +[section Basic queries] + +There are three ways to perform a spatial query. Following queries returns +`__value__`s intersecting some box_region. + +Method call + + std::vector<__value__> returned_values; + __box__ box_region(...); + rt.query(box_region, std::back_inserter(returned_values)); + +Function call + + std::vector<__value__> returned_values; + __box__ box_region(...); + index::query(rt, box_region, std::back_inserter(returned_values)); + +Use of pipe operator generating a range + + __box__ box_region(...); + BOOST_FOREACH(__value__ & v, rt | index::query_filtered(box_region)) + ; // do something with v +[endsect] + +[section Spatial predicates] + +It is possible to define other relations between queried `__value__`s and region/regions +of interest. Names of predicates corresponds to names of __boost_geometry__ algorithms. + + rt.query(box, std::back_inserter(result)); // default case - intersects + rt.query(index::intersects(box), std::back_inserter(result)); // same as default + rt.query(index::covered_by(box), std::back_inserter(result)); + rt.query(index::disjont(box), std::back_inserter(result)); + rt.query(index::overlaps(box), std::back_inserter(result)); + rt.query(index::within(box), std::back_inserter(result)); + +All predicates may be negated, e.g.: + + rt.query(index::not_intersects(box), std::back_inserter(result)); + // or + rt.query(!index::intersects(box), std::back_inserter(result)); + // the same as + rt.query(index::disjoint(box), std::back_inserter(result)); + +It's possible to use some number of predicates by passing `std::pair` + + rt.query( + std::make_pair(index::intersects(box1), !index::within(box2)) + , std::back_inserter(result)); + +or `boost::tuple` + + rt.query( + boost::make_tuple( + index::intersects(box1), !index::within(box2), index::overlaps(box3)) + , std::back_inserter(result)); + +There is also a unique predicate `index::value(...)` taking user-defined function/functor +which checks if `__value__` should be returned by the query. + + bool fun(__value__ const& v) + { + return v.is_red(); + } + + // ... + + rt.query( + boost::make_pair(index::intersects(box), index::value(fun)) + , std::back_inserter(result)); + +[endsect] + +[endsect] [/ Spatial queries /] diff --git a/doc/rtree/quickstart.qbk b/doc/rtree/quickstart.qbk new file mode 100644 index 000000000..2bbb5dda2 --- /dev/null +++ b/doc/rtree/quickstart.qbk @@ -0,0 +1,47 @@ +[/============================================================================ + Boost.Geometry Index + + Copyright (c) 2011-2012 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) +=============================================================================/] + +[section:rtree_quickstart Quick Start] + +This Quick Start section shows simple way to creating a typical R-tree and perform +spatial query. + +The code below assumes that following files are included and namespaces used. + +[rtree_quickstart_include] + +It is possible to store user-defined types in the R-tree. To keep it simple we will +use predefined __point__ and __box__. + +[rtree_quickstart_valuetype] + +R-tree may be created using various algorithm and parameters. In this example we will +use quadratic algorithm. Maximum number of elements in nodes are set to 32, minimum to 8. + +[rtree_quickstart_create] + +Inserting values into the R-tree may be done by calling insert() method. + +[rtree_quickstart_insert] + +There are various types of queries that may be performed, they can be even combined together +in one call. For simplicity, default one is used. + +[rtree_quickstart_query] + +Default k-nearest neighbors query may be performed as follows. + +[rtree_quickstart_nearest] + +[h3 More] +More information about the R-tree implementation, other algorithms and queries may be found in +other parts of this documentation. + +[endsect] diff --git a/doc/src/examples/rtree/quick_start.cpp b/doc/src/examples/rtree/quick_start.cpp new file mode 100644 index 000000000..25523f8b4 --- /dev/null +++ b/doc/src/examples/rtree/quick_start.cpp @@ -0,0 +1,57 @@ +// Boost.Geometry Index +// +// Quickbook Examples +// +// Copyright (c) 2011-2012 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 +// http://www.boost.org/LICENSE_1_0.txt) + +//[rtree_quickstart_include + +#include + +#include +#include +#include + +#include + +namespace bg = boost::geometry; +namespace bgi = boost::geometry::index; +//] + +int main(void) +{ + //[rtree_quickstart_valuetype + typedef bg::model::point point; + typedef bg::model::box box; + typedef std::pair value; + //] + + //[rtree_quickstart_create + bgi::rtree< value, bgi::quadratic<32, 8> > rtree; + //] + + //[rtree_quickstart_insert + // create some box + // this typically will be an envelope of some geometry + box b(point(0, 0), point(10, 10)); + // insert new value + rtree.insert(std::make_pair(b, 0)); + //] + + //[rtree_quickstart_query + // find values intersecting a box + std::vector result; + rtree.query(b, std::back_inserter(result)); + //] + + //[rtree_quickstart_nearest + // find 5 nearest values to a point + rtree.nearest(point(0, 0), 5, std::back_inserter(result)); + //] + + return 0; +} diff --git a/include/boost/geometry/extensions/index/algorithms/comparable_distance_centroid.hpp b/include/boost/geometry/extensions/index/algorithms/comparable_distance_centroid.hpp index 156edece2..36620535b 100644 --- a/include/boost/geometry/extensions/index/algorithms/comparable_distance_centroid.hpp +++ b/include/boost/geometry/extensions/index/algorithms/comparable_distance_centroid.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - squared distance between point and centroid of the box or point +// squared distance between point and centroid of the box or point +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/comparable_distance_far.hpp b/include/boost/geometry/extensions/index/algorithms/comparable_distance_far.hpp index a80e98e3b..30fb83e74 100644 --- a/include/boost/geometry/extensions/index/algorithms/comparable_distance_far.hpp +++ b/include/boost/geometry/extensions/index/algorithms/comparable_distance_far.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - squared distance between point and furthest point of the box or point +// squared distance between point and furthest point of the box or point +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/comparable_distance_near.hpp b/include/boost/geometry/extensions/index/algorithms/comparable_distance_near.hpp index a6021c82e..8b809d41d 100644 --- a/include/boost/geometry/extensions/index/algorithms/comparable_distance_near.hpp +++ b/include/boost/geometry/extensions/index/algorithms/comparable_distance_near.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - squared distance between point and nearest point of the box or point +// squared distance between point and nearest point of the box or point +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/content.hpp b/include/boost/geometry/extensions/index/algorithms/content.hpp index 52aa49710..12c9471f0 100644 --- a/include/boost/geometry/extensions/index/algorithms/content.hpp +++ b/include/boost/geometry/extensions/index/algorithms/content.hpp @@ -1,6 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - n-dimensional box's content (2d-area/3d-volume/...) +// n-dimensional box's content (hypervolume) - 2d area, 3d volume, ... // // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // diff --git a/include/boost/geometry/extensions/index/algorithms/detail/diff_abs.hpp b/include/boost/geometry/extensions/index/algorithms/detail/diff_abs.hpp index 4c89b31c1..0490976a7 100644 --- a/include/boost/geometry/extensions/index/algorithms/detail/diff_abs.hpp +++ b/include/boost/geometry/extensions/index/algorithms/detail/diff_abs.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - Abs of difference +// Abs of difference +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/detail/smallest_for_indexable.hpp b/include/boost/geometry/extensions/index/algorithms/detail/smallest_for_indexable.hpp index aeae612fa..1181f6193 100644 --- a/include/boost/geometry/extensions/index/algorithms/detail/smallest_for_indexable.hpp +++ b/include/boost/geometry/extensions/index/algorithms/detail/smallest_for_indexable.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - Get smallest value calculated for indexable's dimensions, used in R-tree k nearest neighbors query +// Get smallest value calculated for indexable's dimensions, used in R-tree k nearest neighbors query +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/detail/sum_for_indexable.hpp b/include/boost/geometry/extensions/index/algorithms/detail/sum_for_indexable.hpp index 4a6c11b0f..44c64fd64 100644 --- a/include/boost/geometry/extensions/index/algorithms/detail/sum_for_indexable.hpp +++ b/include/boost/geometry/extensions/index/algorithms/detail/sum_for_indexable.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - Sum values calculated for indexable's dimensions, used e.g. in R-tree k nearest neighbors query +// Sum values calculated for indexable's dimensions, used e.g. in R-tree k nearest neighbors query +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/intersection_content.hpp b/include/boost/geometry/extensions/index/algorithms/intersection_content.hpp index 3cc969195..60762473e 100644 --- a/include/boost/geometry/extensions/index/algorithms/intersection_content.hpp +++ b/include/boost/geometry/extensions/index/algorithms/intersection_content.hpp @@ -1,6 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - boxes union/intersection area/volume +// boxes union/intersection area/volume // // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // diff --git a/include/boost/geometry/extensions/index/algorithms/is_valid.hpp b/include/boost/geometry/extensions/index/algorithms/is_valid.hpp index 77f6ede62..4468b3684 100644 --- a/include/boost/geometry/extensions/index/algorithms/is_valid.hpp +++ b/include/boost/geometry/extensions/index/algorithms/is_valid.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - n-dimensional box's / point validity check +// n-dimensional box's / point validity check +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/margin.hpp b/include/boost/geometry/extensions/index/algorithms/margin.hpp index a86d15811..aee9c4dc7 100644 --- a/include/boost/geometry/extensions/index/algorithms/margin.hpp +++ b/include/boost/geometry/extensions/index/algorithms/margin.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - n-dimensional box's margin value, 2d perimeter, 3d surface, etc... +// n-dimensional box's margin value (hypersurface), 2d perimeter, 3d surface, etc... +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/algorithms/minmaxdist.hpp b/include/boost/geometry/extensions/index/algorithms/minmaxdist.hpp index 71e7dd8ca..fd2b43c13 100644 --- a/include/boost/geometry/extensions/index/algorithms/minmaxdist.hpp +++ b/include/boost/geometry/extensions/index/algorithms/minmaxdist.hpp @@ -1,6 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - minmaxdist used in R-tree k nearest neighbors query +// minmaxdist used in R-tree k nearest neighbors query // // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // diff --git a/include/boost/geometry/extensions/index/algorithms/union_content.hpp b/include/boost/geometry/extensions/index/algorithms/union_content.hpp index b25f5e23d..30070d4b0 100644 --- a/include/boost/geometry/extensions/index/algorithms/union_content.hpp +++ b/include/boost/geometry/extensions/index/algorithms/union_content.hpp @@ -1,9 +1,10 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - boxes union/sum area/volume +// boxes union/sum area/volume +// +// Copyright (c) 2008 Federico J. Fernandez. +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// Copyright 2008 Federico J. Fernandez. -// 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) diff --git a/include/boost/geometry/extensions/index/assert.hpp b/include/boost/geometry/extensions/index/assert.hpp index d614165ea..e42dc6210 100644 --- a/include/boost/geometry/extensions/index/assert.hpp +++ b/include/boost/geometry/extensions/index/assert.hpp @@ -1,8 +1,7 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - ASSERT +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/distance_predicates.hpp b/include/boost/geometry/extensions/index/distance_predicates.hpp index 1df5c6b03..70901c720 100644 --- a/include/boost/geometry/extensions/index/distance_predicates.hpp +++ b/include/boost/geometry/extensions/index/distance_predicates.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - Spatial index distance predicates, calculators and checkers used in nearest query +// Spatial index distance predicates, calculators and checkers used in nearest neighbor query +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/filters/nearest_filter.hpp b/include/boost/geometry/extensions/index/filters/nearest_filter.hpp index f16774937..49afbb18a 100644 --- a/include/boost/geometry/extensions/index/filters/nearest_filter.hpp +++ b/include/boost/geometry/extensions/index/filters/nearest_filter.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - nearest neighbour filter implementation +// Nearest neighbour filter implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/filters/query_filter.hpp b/include/boost/geometry/extensions/index/filters/query_filter.hpp index 185278cd0..025cfa069 100644 --- a/include/boost/geometry/extensions/index/filters/query_filter.hpp +++ b/include/boost/geometry/extensions/index/filters/query_filter.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - query filter implementation +// Query filter implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/indexable.hpp b/include/boost/geometry/extensions/index/indexable.hpp index 5092b5086..1729c3699 100644 --- a/include/boost/geometry/extensions/index/indexable.hpp +++ b/include/boost/geometry/extensions/index/indexable.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - indexable traits and functions +// Indexable's traits and related functions +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/inserter.hpp b/include/boost/geometry/extensions/index/inserter.hpp index 73fe21fc7..15f4b176b 100644 --- a/include/boost/geometry/extensions/index/inserter.hpp +++ b/include/boost/geometry/extensions/index/inserter.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - inserter +// Insert iterator +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/nonassignable.hpp b/include/boost/geometry/extensions/index/nonassignable.hpp index a272c9289..c6ee9ebeb 100644 --- a/include/boost/geometry/extensions/index/nonassignable.hpp +++ b/include/boost/geometry/extensions/index/nonassignable.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - nonassignable +// Spatial query predicates +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/predicates.hpp b/include/boost/geometry/extensions/index/predicates.hpp index 57b0d088d..07350416e 100644 --- a/include/boost/geometry/extensions/index/predicates.hpp +++ b/include/boost/geometry/extensions/index/predicates.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - Spatial index query predicates +// Spatial query predicates +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/pushable_array.hpp b/include/boost/geometry/extensions/index/pushable_array.hpp index 80fcc258f..fa859149f 100644 --- a/include/boost/geometry/extensions/index/pushable_array.hpp +++ b/include/boost/geometry/extensions/index/pushable_array.hpp @@ -1,8 +1,7 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - pushable array +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/distance_predicates.hpp b/include/boost/geometry/extensions/index/rtree/distance_predicates.hpp index 3b19559f5..fd4f90a42 100644 --- a/include/boost/geometry/extensions/index/rtree/distance_predicates.hpp +++ b/include/boost/geometry/extensions/index/rtree/distance_predicates.hpp @@ -1,9 +1,10 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - Spatial index distance predicates, calculators and checkers -// used in nearest query - rtree's nodes specializations +// Spatial index distance predicates, calculators and checkers +// used in nearest query - specialized for nodes +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/filters.hpp b/include/boost/geometry/extensions/index/rtree/filters.hpp index 1c63b0fa4..6cda2401d 100644 --- a/include/boost/geometry/extensions/index/rtree/filters.hpp +++ b/include/boost/geometry/extensions/index/rtree/filters.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - rtree queries filters implementation +// R-tree queries filters implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/kmeans/kmeans.hpp b/include/boost/geometry/extensions/index/rtree/kmeans/kmeans.hpp index 2577d9fec..7e2ff2285 100644 --- a/include/boost/geometry/extensions/index/rtree/kmeans/kmeans.hpp +++ b/include/boost/geometry/extensions/index/rtree/kmeans/kmeans.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree +// R-tree kmeans algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/kmeans/split.hpp b/include/boost/geometry/extensions/index/rtree/kmeans/split.hpp index 0f1842f25..55512ec5e 100644 --- a/include/boost/geometry/extensions/index/rtree/kmeans/split.hpp +++ b/include/boost/geometry/extensions/index/rtree/kmeans/split.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree kmeans split algorithm implementation +// R-tree kmeans split algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// Copyright 2011, 2012 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) diff --git a/include/boost/geometry/extensions/index/rtree/linear/linear.hpp b/include/boost/geometry/extensions/index/rtree/linear/linear.hpp index bf8db77ca..1f249bd04 100644 --- a/include/boost/geometry/extensions/index/rtree/linear/linear.hpp +++ b/include/boost/geometry/extensions/index/rtree/linear/linear.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree +// R-tree linear algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/linear/redistribute_elements.hpp b/include/boost/geometry/extensions/index/rtree/linear/redistribute_elements.hpp index afe978151..022f9aea0 100644 --- a/include/boost/geometry/extensions/index/rtree/linear/redistribute_elements.hpp +++ b/include/boost/geometry/extensions/index/rtree/linear/redistribute_elements.hpp @@ -1,9 +1,10 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree linear split algorithm implementation +// R-tree linear split algorithm implementation +// +// Copyright (c) 2008 Federico J. Fernandez. +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// Copyright 2008 Federico J. Fernandez. -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/node/node.hpp b/include/boost/geometry/extensions/index/rtree/node/node.hpp index 2f5c9a943..5b25b003d 100644 --- a/include/boost/geometry/extensions/index/rtree/node/node.hpp +++ b/include/boost/geometry/extensions/index/rtree/node/node.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree nodes +// R-tree nodes +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/node/node_default.hpp b/include/boost/geometry/extensions/index/rtree/node/node_default.hpp index 0360aaf29..1c1954633 100644 --- a/include/boost/geometry/extensions/index/rtree/node/node_default.hpp +++ b/include/boost/geometry/extensions/index/rtree/node/node_default.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree polymorphic nodes +// R-tree nodes based on run-time polymorphism, storing std::vectors +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/node/node_default_static.hpp b/include/boost/geometry/extensions/index/rtree/node/node_default_static.hpp index 854680811..540cc751a 100644 --- a/include/boost/geometry/extensions/index/rtree/node/node_default_static.hpp +++ b/include/boost/geometry/extensions/index/rtree/node/node_default_static.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree polymorphic nodes with static-size containers +// R-tree nodes based on runtime-polymorphism, storing static-size containers +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/node/node_default_static_variant.hpp b/include/boost/geometry/extensions/index/rtree/node/node_default_static_variant.hpp index ba7a6dba0..2a97c255c 100644 --- a/include/boost/geometry/extensions/index/rtree/node/node_default_static_variant.hpp +++ b/include/boost/geometry/extensions/index/rtree/node/node_default_static_variant.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree variant nodes with static-size containers +// R-tree nodes based on Boost.Variant, storing static-size containers +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp b/include/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp index b5fff6942..51e08d1f8 100644 --- a/include/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp +++ b/include/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree variant nodes +// R-tree nodes based on Boost.Variant, storing std::vectors +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/options.hpp b/include/boost/geometry/extensions/index/rtree/options.hpp index 64ebae231..96ca9e54b 100644 --- a/include/boost/geometry/extensions/index/rtree/options.hpp +++ b/include/boost/geometry/extensions/index/rtree/options.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - rtree variants options +// R-tree options, algorithms, parameters +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/predicates.hpp b/include/boost/geometry/extensions/index/rtree/predicates.hpp index 2d6c6ae27..106d938b7 100644 --- a/include/boost/geometry/extensions/index/rtree/predicates.hpp +++ b/include/boost/geometry/extensions/index/rtree/predicates.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - Spatial index query predicates +// Spatial query predicates checks specialized for nodes +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/quadratic/quadratic.hpp b/include/boost/geometry/extensions/index/rtree/quadratic/quadratic.hpp index 5927a2b27..071311d39 100644 --- a/include/boost/geometry/extensions/index/rtree/quadratic/quadratic.hpp +++ b/include/boost/geometry/extensions/index/rtree/quadratic/quadratic.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree +// R-tree quadratic algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/quadratic/redistribute_elements.hpp b/include/boost/geometry/extensions/index/rtree/quadratic/redistribute_elements.hpp index f7cec8b47..bf0e8a77c 100644 --- a/include/boost/geometry/extensions/index/rtree/quadratic/redistribute_elements.hpp +++ b/include/boost/geometry/extensions/index/rtree/quadratic/redistribute_elements.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree quadratic split algorithm implementation +// R-tree quadratic split algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp b/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp index 1c781ea82..d2811b86d 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R*-tree ChooseNextNode algorithm +// R-tree R*-tree next node choosing algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp b/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp index 2aad1f797..57f7a41fd 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R*-tree insert +// R-tree R*-tree insert algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp b/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp index b8d04196f..049eea0b9 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R*-tree split algorithm implementation +// R-tree R*-tree split algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp b/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp index 973d9a572..a8db3364e 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R*-tree +// R-tree R*-tree algorithm implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/rtree.hpp b/include/boost/geometry/extensions/index/rtree/rtree.hpp index 77021eadb..3153a3905 100644 --- a/include/boost/geometry/extensions/index/rtree/rtree.hpp +++ b/include/boost/geometry/extensions/index/rtree/rtree.hpp @@ -1,9 +1,10 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree implementation +// R-tree implementation +// +// Copyright (c) 2008 Federico J. Fernandez. +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// Copyright 2008 Federico J. Fernandez. -// Copyright 2011, 2012 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) diff --git a/include/boost/geometry/extensions/index/rtree/tags.hpp b/include/boost/geometry/extensions/index/rtree/tags.hpp index 682368f72..7170755a2 100644 --- a/include/boost/geometry/extensions/index/rtree/tags.hpp +++ b/include/boost/geometry/extensions/index/rtree/tags.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - tags related to rtree used in various files +// Tags used by the R-tree implementation. +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/are_boxes_ok.hpp b/include/boost/geometry/extensions/index/rtree/visitors/are_boxes_ok.hpp index 0c12b170f..85aa5eb05 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/are_boxes_ok.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/are_boxes_ok.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree boxes checking visitor +// R-tree boxes validating visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/are_levels_ok.hpp b/include/boost/geometry/extensions/index/rtree/visitors/are_levels_ok.hpp index 946a4303c..16a443ace 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/are_levels_ok.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/are_levels_ok.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree levels checking visitor +// R-tree levels validating visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/children_box.hpp b/include/boost/geometry/extensions/index/rtree/visitors/children_box.hpp index 626553643..860d5e9cc 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/children_box.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/children_box.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree node children box calculating visitor +// R-tree node children box calculating visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/copy.hpp b/include/boost/geometry/extensions/index/rtree/visitors/copy.hpp index 12fa86435..a2cda3647 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/copy.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/copy.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree copying visitor +// R-tree deep copying visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/destroy.hpp b/include/boost/geometry/extensions/index/rtree/visitors/destroy.hpp index eac919b6d..7be482930 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/destroy.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/destroy.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree destroy visitor +// R-tree destroying visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/gl_draw.hpp b/include/boost/geometry/extensions/index/rtree/visitors/gl_draw.hpp index 9b51e51a1..6b2a8121a 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/gl_draw.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/gl_draw.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree GL-draw visitor +// R-tree OpenGL drawing visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/insert.hpp b/include/boost/geometry/extensions/index/rtree/visitors/insert.hpp index 2823bacf4..300b9b83a 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/insert.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/insert.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree insert details +// R-tree inserting visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/is_leaf.hpp b/include/boost/geometry/extensions/index/rtree/visitors/is_leaf.hpp index f07bc7d15..9fd479b4f 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/is_leaf.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/is_leaf.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree is leaf visitor +// R-tree leaf node checking visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/nearest.hpp b/include/boost/geometry/extensions/index/rtree/visitors/nearest.hpp index abbf33676..b789a706f 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/nearest.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/nearest.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree k nearest neighbors query +// R-tree k nearest neighbour querying visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/print.hpp b/include/boost/geometry/extensions/index/rtree/visitors/print.hpp index 71d7658d4..8c48ecb08 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/print.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/print.hpp @@ -1,9 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree printing visitor +// R-tree ostreaming visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// Copyright 2008 Federico J. Fernandez. -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/query.hpp b/include/boost/geometry/extensions/index/rtree/visitors/query.hpp index 9b420e54b..b7aa9643d 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/query.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/query.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree spatial query +// R-tree querying visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/rtree/visitors/remove.hpp b/include/boost/geometry/extensions/index/rtree/visitors/remove.hpp index db267702b..59827d6ee 100644 --- a/include/boost/geometry/extensions/index/rtree/visitors/remove.hpp +++ b/include/boost/geometry/extensions/index/rtree/visitors/remove.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.Index - R-tree remove +// R-tree removing visitor implementation +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/translator/def.hpp b/include/boost/geometry/extensions/index/translator/def.hpp index c20fff09c..d880e2b13 100644 --- a/include/boost/geometry/extensions/index/translator/def.hpp +++ b/include/boost/geometry/extensions/index/translator/def.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - default value to bounding object translation +// Default translator +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/translator/helpers.hpp b/include/boost/geometry/extensions/index/translator/helpers.hpp index 1bc57ccd3..02610f31e 100644 --- a/include/boost/geometry/extensions/index/translator/helpers.hpp +++ b/include/boost/geometry/extensions/index/translator/helpers.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - translators helper functions +// Translators helper functions +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/translator/index.hpp b/include/boost/geometry/extensions/index/translator/index.hpp index 73116c564..8245e3c38 100644 --- a/include/boost/geometry/extensions/index/translator/index.hpp +++ b/include/boost/geometry/extensions/index/translator/index.hpp @@ -1,8 +1,9 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - container index value to bounding object translation +// Translator translating random-access container index value to Indexable object +// +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/translator/translator.hpp b/include/boost/geometry/extensions/index/translator/translator.hpp index 6a8654606..8caef4dab 100644 --- a/include/boost/geometry/extensions/index/translator/translator.hpp +++ b/include/boost/geometry/extensions/index/translator/translator.hpp @@ -1,8 +1,7 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - translators +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/include/boost/geometry/extensions/index/tuples.hpp b/include/boost/geometry/extensions/index/tuples.hpp index 5d0f4c0a0..3e63c49bc 100644 --- a/include/boost/geometry/extensions/index/tuples.hpp +++ b/include/boost/geometry/extensions/index/tuples.hpp @@ -1,8 +1,7 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // -// Boost.SpatialIndex - tags related to rtree used in various files +// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // -// 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) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 8eeb345e3..c38dfdf12 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -1,8 +1,5 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) +# Boost.Geometry Index # -# 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. # # Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index a1eecfe3b..43c9a4217 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -1,8 +1,5 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) +# Boost.Geometry Index # -# 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. # # Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/content.cpp b/test/algorithms/content.cpp index d49253d01..1d52cc5c2 100644 --- a/test/algorithms/content.cpp +++ b/test/algorithms/content.cpp @@ -1,19 +1,12 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) - #include #include diff --git a/test/algorithms/intersection_content.cpp b/test/algorithms/intersection_content.cpp index 864276d2b..4692f7a6b 100644 --- a/test/algorithms/intersection_content.cpp +++ b/test/algorithms/intersection_content.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/algorithms/is_valid.cpp b/test/algorithms/is_valid.cpp index 64ee21137..f2190cd7f 100644 --- a/test/algorithms/is_valid.cpp +++ b/test/algorithms/is_valid.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/algorithms/margin.cpp b/test/algorithms/margin.cpp index 39284901d..fa4205897 100644 --- a/test/algorithms/margin.cpp +++ b/test/algorithms/margin.cpp @@ -1,19 +1,12 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) - #include #include diff --git a/test/algorithms/minmaxdist.cpp b/test/algorithms/minmaxdist.cpp index 4fd0af130..df770cb83 100644 --- a/test/algorithms/minmaxdist.cpp +++ b/test/algorithms/minmaxdist.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/algorithms/test_content.hpp b/test/algorithms/test_content.hpp index 42143d575..9d880ae71 100644 --- a/test/algorithms/test_content.hpp +++ b/test/algorithms/test_content.hpp @@ -1,7 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/test_intersection_content.hpp b/test/algorithms/test_intersection_content.hpp index c07ff6ee8..9998e4543 100644 --- a/test/algorithms/test_intersection_content.hpp +++ b/test/algorithms/test_intersection_content.hpp @@ -1,7 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/test_margin.hpp b/test/algorithms/test_margin.hpp index 318478221..2dfef3b34 100644 --- a/test/algorithms/test_margin.hpp +++ b/test/algorithms/test_margin.hpp @@ -1,7 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/test_union_content.hpp b/test/algorithms/test_union_content.hpp index dfbf2432e..0310ae266 100644 --- a/test/algorithms/test_union_content.hpp +++ b/test/algorithms/test_union_content.hpp @@ -1,7 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, diff --git a/test/algorithms/union_content.cpp b/test/algorithms/union_content.cpp index 84313cc8e..6acac580f 100644 --- a/test/algorithms/union_content.cpp +++ b/test/algorithms/union_content.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/geometry_index_test_common.hpp b/test/geometry_index_test_common.hpp index c7680a2a2..0f21bdc20 100644 --- a/test/geometry_index_test_common.hpp +++ b/test/geometry_index_test_common.hpp @@ -1,18 +1,12 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index +// Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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 GEOMETRY_TEST_GEOMETRY_INDEX_TEST_COMMON_HPP #define GEOMETRY_TEST_GEOMETRY_INDEX_TEST_COMMON_HPP diff --git a/test/rtree/Jamfile.v2 b/test/rtree/Jamfile.v2 index c9004cc2b..b4bca41d0 100644 --- a/test/rtree/Jamfile.v2 +++ b/test/rtree/Jamfile.v2 @@ -1,8 +1,5 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) +# Boost.Geometry Index # -# 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. # # Use, modification and distribution is subject to the Boost Software License, diff --git a/test/rtree/rtree2d_linear_d.cpp b/test/rtree/rtree2d_linear_d.cpp index 81f38c00e..c73a356bc 100644 --- a/test/rtree/rtree2d_linear_d.cpp +++ b/test/rtree/rtree2d_linear_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_linear_f.cpp b/test/rtree/rtree2d_linear_f.cpp index 73c703468..8ea8d04ff 100644 --- a/test/rtree/rtree2d_linear_f.cpp +++ b/test/rtree/rtree2d_linear_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_linear_i.cpp b/test/rtree/rtree2d_linear_i.cpp index 3b48b6912..f1ea68bd0 100644 --- a/test/rtree/rtree2d_linear_i.cpp +++ b/test/rtree/rtree2d_linear_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_linear_tt.cpp b/test/rtree/rtree2d_linear_tt.cpp index 374991ff2..d8ade8b74 100644 --- a/test/rtree/rtree2d_linear_tt.cpp +++ b/test/rtree/rtree2d_linear_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_quadratic_d.cpp b/test/rtree/rtree2d_quadratic_d.cpp index b813fef75..0da13f9b3 100644 --- a/test/rtree/rtree2d_quadratic_d.cpp +++ b/test/rtree/rtree2d_quadratic_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_quadratic_f.cpp b/test/rtree/rtree2d_quadratic_f.cpp index 547d17094..b7cd17f6c 100644 --- a/test/rtree/rtree2d_quadratic_f.cpp +++ b/test/rtree/rtree2d_quadratic_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_quadratic_i.cpp b/test/rtree/rtree2d_quadratic_i.cpp index 4ae90d053..c3a5d9180 100644 --- a/test/rtree/rtree2d_quadratic_i.cpp +++ b/test/rtree/rtree2d_quadratic_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_quadratic_tt.cpp b/test/rtree/rtree2d_quadratic_tt.cpp index 9ab30853f..1ff26daa5 100644 --- a/test/rtree/rtree2d_quadratic_tt.cpp +++ b/test/rtree/rtree2d_quadratic_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_rstar_d.cpp b/test/rtree/rtree2d_rstar_d.cpp index ed23fa405..a9ffbb38d 100644 --- a/test/rtree/rtree2d_rstar_d.cpp +++ b/test/rtree/rtree2d_rstar_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_rstar_f.cpp b/test/rtree/rtree2d_rstar_f.cpp index 5be07e3a1..a9b436323 100644 --- a/test/rtree/rtree2d_rstar_f.cpp +++ b/test/rtree/rtree2d_rstar_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_rstar_i.cpp b/test/rtree/rtree2d_rstar_i.cpp index 00502cacc..0ede4c08f 100644 --- a/test/rtree/rtree2d_rstar_i.cpp +++ b/test/rtree/rtree2d_rstar_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree2d_rstar_tt.cpp b/test/rtree/rtree2d_rstar_tt.cpp index 4e6ff71f8..789581c08 100644 --- a/test/rtree/rtree2d_rstar_tt.cpp +++ b/test/rtree/rtree2d_rstar_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_linear_d.cpp b/test/rtree/rtree3d_linear_d.cpp index 7f202f6f0..0f9fa35e6 100644 --- a/test/rtree/rtree3d_linear_d.cpp +++ b/test/rtree/rtree3d_linear_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_linear_f.cpp b/test/rtree/rtree3d_linear_f.cpp index 459c37ee6..12d54f332 100644 --- a/test/rtree/rtree3d_linear_f.cpp +++ b/test/rtree/rtree3d_linear_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_linear_i.cpp b/test/rtree/rtree3d_linear_i.cpp index 191860bce..8b776b5ed 100644 --- a/test/rtree/rtree3d_linear_i.cpp +++ b/test/rtree/rtree3d_linear_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_linear_tt.cpp b/test/rtree/rtree3d_linear_tt.cpp index fb99c3186..12ddbd444 100644 --- a/test/rtree/rtree3d_linear_tt.cpp +++ b/test/rtree/rtree3d_linear_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_quadratic_d.cpp b/test/rtree/rtree3d_quadratic_d.cpp index 8d447ff38..721290dbe 100644 --- a/test/rtree/rtree3d_quadratic_d.cpp +++ b/test/rtree/rtree3d_quadratic_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_quadratic_f.cpp b/test/rtree/rtree3d_quadratic_f.cpp index 5b7e88210..9236da6fd 100644 --- a/test/rtree/rtree3d_quadratic_f.cpp +++ b/test/rtree/rtree3d_quadratic_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_quadratic_i.cpp b/test/rtree/rtree3d_quadratic_i.cpp index ef811af87..e38865a71 100644 --- a/test/rtree/rtree3d_quadratic_i.cpp +++ b/test/rtree/rtree3d_quadratic_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_quadratic_tt.cpp b/test/rtree/rtree3d_quadratic_tt.cpp index 093725739..9ed655257 100644 --- a/test/rtree/rtree3d_quadratic_tt.cpp +++ b/test/rtree/rtree3d_quadratic_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_rstar_d.cpp b/test/rtree/rtree3d_rstar_d.cpp index 6e6820315..7552edeb2 100644 --- a/test/rtree/rtree3d_rstar_d.cpp +++ b/test/rtree/rtree3d_rstar_d.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_rstar_f.cpp b/test/rtree/rtree3d_rstar_f.cpp index 4033e1463..f258ce1ae 100644 --- a/test/rtree/rtree3d_rstar_f.cpp +++ b/test/rtree/rtree3d_rstar_f.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_rstar_i.cpp b/test/rtree/rtree3d_rstar_i.cpp index 43f2a6a29..6688566a3 100644 --- a/test/rtree/rtree3d_rstar_i.cpp +++ b/test/rtree/rtree3d_rstar_i.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/rtree3d_rstar_tt.cpp b/test/rtree/rtree3d_rstar_tt.cpp index dbf564e76..2f03ed6a9 100644 --- a/test/rtree/rtree3d_rstar_tt.cpp +++ b/test/rtree/rtree3d_rstar_tt.cpp @@ -1,14 +1,8 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// 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) 2011-2012 Adam Wulkiewicz, Lodz, Poland. -// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library -// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. - // 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) diff --git a/test/rtree/test_rtree.hpp b/test/rtree/test_rtree.hpp index 5ec0f9023..a583654b4 100644 --- a/test/rtree/test_rtree.hpp +++ b/test/rtree/test_rtree.hpp @@ -1,7 +1,6 @@ -// Boost.Geometry (aka GGL, Generic Geometry Library) +// Boost.Geometry Index // Unit Test -// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License,