diff --git a/doc/Doxyfile b/doc/Doxyfile index 9cfc96a6d..eb34e0697 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -666,10 +666,9 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../boost/geometry/extensions/index/ \ - ../boost/geometry/extensions/index/rtree \ - ../boost/geometry/extensions/index/adaptors \ - ../boost/geometry/extensions/index/translator +INPUT = ../boost/geometry/index/ \ + ../boost/geometry/index/adaptors \ + ../boost/geometry/index/translator # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/doc/generated/rtree.qbk b/doc/generated/rtree.qbk index f613f5718..77217a4c9 100644 --- a/doc/generated/rtree.qbk +++ b/doc/generated/rtree.qbk @@ -38,7 +38,7 @@ Predefined algorithms with run-time parameters are: The Translator translates from Value to Indexable each time r-tree requires it. Which means that this operation is done for each Value access. Therefore the Translator should return the Indexable by const reference instead of a value. Default translator can translate all types adapted to Point or Box concepts (called Indexables). It also handles [^`std::pair`] and [^`boost::tuple`]. For example, if [^`std::pair`] is stored in the container, the default translator translates from [^`std::pair const&`] to [^`Box const&`]. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre @@ -70,7 +70,7 @@ The Translator translates from Value to Indexable each time r-tree requires it. [[[#classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d] `allocator_type`][The type of allocator used by the container. ]] [[[#classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6] `size_type`][Unsigned integral type used by the container. ]] [[[#classboost_1_1geometry_1_1index_1_1rtree_1ac011da09678f034a7fab487a9b973bfc] `indexable_type`][The Indexable type to which Value is translated. ]] -[[[#classboost_1_1geometry_1_1index_1_1rtree_1a42d0c9efffbc6f3935b5b9c3dd31e50d] `box_type`][The Box type used by the R-tree. ]] +[[[#classboost_1_1geometry_1_1index_1_1rtree_1a2803990c71c40e6770744d29e5bbd093] `envelope_type`][The Box type used by the R-tree. ]] ] [heading Constructor(s) and destructor] @@ -89,29 +89,29 @@ The Translator translates from Value to Indexable each time r-tree requires it. [heading Member(s)] [table -[[Function][Description]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1ab823a214501cb0f9fd00ba12a1ade179 `operator=(const rtree &)`]][The assignment operator. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a44bd4edee49db92c18b6bbbba77b42be `operator=(rtree &&)`]][The moving assignment. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1aad0285d25f96341a8dd6cc22feb3bd73 `swap(rtree &)`]][Swaps contents of two rtrees. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1af6d5bd81e46cb4ff89277c753133664c `insert(value_type const &)`]][Insert a value to the index. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a5263a3faac7b4f0090d4ad1d44cc540d `insert(Iterator, Iterator)`]][Insert a range of values to the index. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1abb624abd9268b41e815d40342b2634c2 `insert(Range const &)`]][Insert a range of values to the index. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1af6ca6909354a997f89411ef40ea5688a `remove(value_type const &)`]][Remove a value from the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a6e9123114697d65b16ebc49cd5371fbd `remove(Iterator, Iterator)`]][Remove a range of values from the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a5a57bb93b0b2d7ea1c659e925f918e9c `remove(Range const &)`]][Remove a range of values from the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a930bf17d595a91d8ae924383a0387920 `spatial_query(Predicates const &, OutIter)`]][Finds values meeting spatial predicates, e.g. intersecting some Box. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a788295b315bd0ddeb93b1cc050fdf909 `nearest_query(DistancesPredicates const &, value_type &)`]][Finds one value meeting distances predicates, e.g. nearest to some Point. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a6552331dca4d67647ef2a03bd0fbedcc `nearest_query(DistancesPredicates const &, Predicates const &, value_type &)`]][Finds one value meeting distances predicates and spatial predicates, e.g. nearest to some Point and intersecting some Box. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a3101652211c9f2d6ed8626dae6ff5f9d `nearest_query(DistancesPredicates const &, size_type, OutIter)`]][Finds k values meeting distances predicates, e.g. k nearest values to some Point. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a31c23b87b01f12282ef0df6404ab7301 `nearest_query(DistancesPredicates const &, size_type, Predicates const &, OutIter)`]][Finds k values meeting distances predicates and spatial predicates, e.g. k nearest values to some Point and intersecting some Box. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a89561a834563f2ed6fc782bad16143fd `size()`]][Returns the number of stored values. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1ae889567443b0ba0dbdb975564c55804c `empty()`]][Query if the container is empty. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1ae6027e42d28a4bf93e74b055c79e6b09 `clear()`]][Removes all values stored in the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1ad534a6ed759677548f50b86dfeba07c6 `box()`]][Returns the box containing all values stored in the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a17fce1fac81f6460d2c3a5744f4963ee `count(ValueOrIndexable const &)`]][Count Values or Indexables stored in the container. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a18910715f67608ff010556ac41f51606 `parameters()`]][Returns parameters. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1afc7e9a4bd53a58552c17c1e7cb997258 `translator()`]][Returns the translator object. ]] -[[[link classboost_1_1geometry_1_1index_1_1rtree_1a1eeb303253f4cabe3a89a82ed41247ff `get_allocator()`]][Returns allocator used by the rtree. ]] +[[Modifier][Function][Description]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1ab823a214501cb0f9fd00ba12a1ade179 `operator=(const rtree &)`]][The assignment operator. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1a44bd4edee49db92c18b6bbbba77b42be `operator=(rtree &&)`]][The moving assignment. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1aad0285d25f96341a8dd6cc22feb3bd73 `swap(rtree &)`]][Swaps contents of two rtrees. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1af6d5bd81e46cb4ff89277c753133664c `insert(value_type const &)`]][Insert a value to the index. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1a5263a3faac7b4f0090d4ad1d44cc540d `insert(Iterator, Iterator)`]][Insert a range of values to the index. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1abb624abd9268b41e815d40342b2634c2 `insert(Range const &)`]][Insert a range of values to the index. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1af6ca6909354a997f89411ef40ea5688a `remove(value_type const &)`]][Remove a value from the container. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1a6e9123114697d65b16ebc49cd5371fbd `remove(Iterator, Iterator)`]][Remove a range of values from the container. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1a5a57bb93b0b2d7ea1c659e925f918e9c `remove(Range const &)`]][Remove a range of values from the container. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a930bf17d595a91d8ae924383a0387920 `spatial_query(Predicates const &, OutIter)`]][Finds values meeting spatial predicates, e.g. intersecting some Box. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a788295b315bd0ddeb93b1cc050fdf909 `nearest_query(DistancesPredicates const &, value_type &)`]][Finds one value meeting distances predicates, e.g. nearest to some Point. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a6552331dca4d67647ef2a03bd0fbedcc `nearest_query(DistancesPredicates const &, Predicates const &, value_type &)`]][Finds one value meeting distances predicates and spatial predicates, e.g. nearest to some Point and intersecting some Box. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a3101652211c9f2d6ed8626dae6ff5f9d `nearest_query(DistancesPredicates const &, size_type, OutIter)`]][Finds k values meeting distances predicates, e.g. k nearest values to some Point. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a31c23b87b01f12282ef0df6404ab7301 `nearest_query(DistancesPredicates const &, size_type, Predicates const &, OutIter)`]][Finds k values meeting distances predicates and spatial predicates, e.g. k nearest values to some Point and intersecting some Box. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a89561a834563f2ed6fc782bad16143fd `size()`]][Returns the number of stored values. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1ae889567443b0ba0dbdb975564c55804c `empty()`]][Query if the container is empty. ]] +[[][[link classboost_1_1geometry_1_1index_1_1rtree_1ae6027e42d28a4bf93e74b055c79e6b09 `clear()`]][Removes all values stored in the container. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a131c273b6fc7e1c6d62cc5ebd015e77e `envelope()`]][Returns the box able to contain all values stored in the container. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a17fce1fac81f6460d2c3a5744f4963ee `count(ValueOrIndexable const &)`]][Count Values or Indexables stored in the container. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a18910715f67608ff010556ac41f51606 `parameters()`]][Returns parameters. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1afc7e9a4bd53a58552c17c1e7cb997258 `translator()`]][Returns the translator object. ]] +[[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a1eeb303253f4cabe3a89a82ed41247ff `get_allocator()`]][Returns allocator used by the rtree. ]] ] [#classboost_1_1geometry_1_1index_1_1rtree_1afa64d1b825b06d196b1164aec27c2d7b] @@ -124,7 +124,8 @@ The constructor. `rtree``(`[^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]] `parameters` = [^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]]`()``,` [^[link classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91 translator_type]]` const &` `translator` = [^[link classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91 translator_type]]`()``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``explicit ``[heading Parameter(s)] [table [[Type][Name][Description]] [[[^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]]][ `parameters` ][The parameters object. ]] @@ -207,7 +208,8 @@ The constructor. [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d allocator_type]] `allocator` = [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d allocator_type]]`()``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``explicit ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`Range const &`][ `rng` ][The range of Values. ]] @@ -631,7 +633,8 @@ Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[ [^[link classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6 size_type]] `spatial_query``(``Predicates const &` `pred``,` `OutIter` `out_it``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`Predicates const &`][ `pred` ][The spatial predicates or a Geometry. ]] @@ -683,7 +686,8 @@ MinRelation and MaxRelation describes bounds and can be generated by following f [^[link classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6 size_type]] `nearest_query``(``DistancesPredicates const &` `dpred``,` [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9979db9ef37591985256cb8ad31862bb value_type]]` &` `v``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point.]] @@ -749,7 +753,8 @@ Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[ [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9979db9ef37591985256cb8ad31862bb value_type]]` &` `v``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point. ]] @@ -799,7 +804,8 @@ MinRelation and MaxRelation describes bounds and can be generated by following f `OutIter` `out_it``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point. ]] @@ -869,7 +875,8 @@ Those predicates may be passed together in [^`std::pair`] or [^`boost::tuple`].[ `OutIter` `out_it``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point ]] @@ -894,7 +901,8 @@ Returns the number of stored values. [^[link classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6 size_type]] `size``()` ] -[heading Returns] +[heading Modifier(s)] +``const ``[heading Returns] The number of stored values. [heading Throws] Nothing. @@ -911,7 +919,8 @@ Query if the container is empty. `bool` `empty``()` ] -[heading Returns] +[heading Modifier(s)] +``const ``[heading Returns] true if the container is empty. [heading Throws] Nothing. @@ -933,19 +942,20 @@ Nothing. [endsect] -[#classboost_1_1geometry_1_1index_1_1rtree_1ad534a6ed759677548f50b86dfeba07c6] -[section box()] -Returns the box containing all values stored in the container. +[#classboost_1_1geometry_1_1index_1_1rtree_1a131c273b6fc7e1c6d62cc5ebd015e77e] +[section envelope()] +Returns the box able to contain all values stored in the container. [heading Description] -Returns the box containing all values stored in the container. If the container is empty the result of [^`geometry::assign_inverse()`] is returned.[heading Synopsis] +Returns the box able to contain all values stored in the container. If the container is empty the result of [^`geometry::assign_inverse()`] is returned.[heading Synopsis] [pre -[^[link classboost_1_1geometry_1_1index_1_1rtree_1a42d0c9efffbc6f3935b5b9c3dd31e50d box_type]]` const &` `box``()` +[^[link classboost_1_1geometry_1_1index_1_1rtree_1a2803990c71c40e6770744d29e5bbd093 envelope_type]]` const &` `envelope``()` ] -[heading Returns] -The box containing all values stored in the container or an invalid box if there are no values in the container. +[heading Modifier(s)] +``const ``[heading Returns] +The box able to contain all values stored in the container or an invalid box if there are no values in the container. [heading Throws] Nothing. @@ -962,7 +972,8 @@ For indexable_type it returns the number of values which indexables equals the p [^[link classboost_1_1geometry_1_1index_1_1rtree_1a5c1a657074c527ed65f858c1ab6b36e6 size_type]] `count``(``ValueOrIndexable const &` `vori``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``const ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`ValueOrIndexable const &`][ `vori` ][The value or indexable which will be counted.]] @@ -984,7 +995,8 @@ Returns parameters. [^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]]` const &` `parameters``()` ] -[heading Returns] +[heading Modifier(s)] +``const ``[heading Returns] The parameters object. [heading Throws] Nothing. @@ -1001,7 +1013,8 @@ Returns the translator object. [^[link classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91 translator_type]]` const &` `translator``()` ] -[heading Returns] +[heading Modifier(s)] +``const ``[heading Returns] The translator object. [heading Throws] Nothing. @@ -1018,7 +1031,8 @@ Returns allocator used by the rtree. [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d allocator_type]] `get_allocator``()` ] -[heading Returns] +[heading Modifier(s)] +``const ``[heading Returns] The allocator. [heading Throws] If allocator copy constructor throws. diff --git a/doc/generated/rtree_functions.qbk b/doc/generated/rtree_functions.qbk index 1db8f87c8..875e4b41c 100644 --- a/doc/generated/rtree_functions.qbk +++ b/doc/generated/rtree_functions.qbk @@ -18,7 +18,7 @@ [[[link group__rtree__functions_1ga0c65d7b29b1edf72f1d236ccf211f63c `clear(rtree<...> &)`]][Remove all values from the index. ]] [[[link group__rtree__functions_1gaec0b88a9d8b408753e3069134f1598c7 `size(rtree<...> const &)`]][Get the number of values stored in the index. ]] [[[link group__rtree__functions_1ga459e3d404fec7cbd66794714cbdd129e `empty(rtree<...> const &)`]][Query if there are no values stored in the index. ]] -[[[link group__rtree__functions_1gad039bb35d79bded11a1454601f6eed3a `box(rtree<...> const &)`]][Get the box containing all stored values or an invalid box if the index has no values. ]] +[[[link group__rtree__functions_1ga73a9002187db81c57c71f9ec204d57e4 `envelope(rtree<...> const &)`]][Get the box containing all stored values or an invalid box if the index has no values. ]] ] [#group__rtree__functions_1gac0ac9ed0e01f7494a5a3059e75d3c5cc] @@ -395,18 +395,18 @@ It calls [^[link classboost_1_1geometry_1_1index_1_1rtree_1ae889567443b0ba0dbdb9 true if there are no values in the index. [endsect] -[#group__rtree__functions_1gad039bb35d79bded11a1454601f6eed3a] -[section box(rtree<...> const &)] +[#group__rtree__functions_1ga73a9002187db81c57c71f9ec204d57e4] +[section envelope(rtree<...> const &)] Get the box containing all stored values or an invalid box if the index has no values. [heading Description] -It calls [^[link classboost_1_1geometry_1_1index_1_1rtree_1ad534a6ed759677548f50b86dfeba07c6 rtree::box()]].[heading Synopsis] +It calls [^[link classboost_1_1geometry_1_1index_1_1rtree_1a131c273b6fc7e1c6d62cc5ebd015e77e rtree::envelope()]].[heading Synopsis] [pre `template<``typename Value``,` `typename Options``,` `typename Translator``,` `typename Allocator``>` -`rtree::box_type const& boost::geometry::index::box``(``rtree< Value, Options, Translator, Allocator > const &` `tree``)` +`rtree::box_type const& boost::geometry::index::envelope``(``rtree< Value, Options, Translator, Allocator > const &` `tree``)` ] [heading Parameter(s)] diff --git a/doc/generated/rtree_linear.qbk b/doc/generated/rtree_linear.qbk index 5e307645f..6e90a4a2d 100644 --- a/doc/generated/rtree_linear.qbk +++ b/doc/generated/rtree_linear.qbk @@ -7,7 +7,7 @@ Linear r-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/rtree_quadratic.qbk b/doc/generated/rtree_quadratic.qbk index 82d6b2636..54880ba50 100644 --- a/doc/generated/rtree_quadratic.qbk +++ b/doc/generated/rtree_quadratic.qbk @@ -7,7 +7,7 @@ Quadratic r-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/rtree_rstar.qbk b/doc/generated/rtree_rstar.qbk index a02079630..1d434696e 100644 --- a/doc/generated/rtree_rstar.qbk +++ b/doc/generated/rtree_rstar.qbk @@ -7,7 +7,7 @@ R*-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/rtree_runtime_linear.qbk b/doc/generated/rtree_runtime_linear.qbk index a20dccd53..b6dc0a110 100644 --- a/doc/generated/rtree_runtime_linear.qbk +++ b/doc/generated/rtree_runtime_linear.qbk @@ -7,7 +7,7 @@ Linear r-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/rtree_runtime_quadratic.qbk b/doc/generated/rtree_runtime_quadratic.qbk index 5c39105e2..2a5102750 100644 --- a/doc/generated/rtree_runtime_quadratic.qbk +++ b/doc/generated/rtree_runtime_quadratic.qbk @@ -7,7 +7,7 @@ Quadratic r-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/rtree_runtime_rstar.qbk b/doc/generated/rtree_runtime_rstar.qbk index 8448ac1dc..491ce09cc 100644 --- a/doc/generated/rtree_runtime_rstar.qbk +++ b/doc/generated/rtree_runtime_rstar.qbk @@ -7,7 +7,7 @@ R*-tree creation algorithm parameters. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/translator_def.qbk b/doc/generated/translator_def.qbk index d16613078..a1d8ff7e2 100644 --- a/doc/generated/translator_def.qbk +++ b/doc/generated/translator_def.qbk @@ -10,7 +10,7 @@ The default translator. It translates Value object to Indexable object. The default version handles Values which are Indexables. This translator is also specialized for std::pair and boost::tuple. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre diff --git a/doc/generated/translator_index.qbk b/doc/generated/translator_index.qbk index 1d2ce0ca6..12c4725ca 100644 --- a/doc/generated/translator_index.qbk +++ b/doc/generated/translator_index.qbk @@ -10,7 +10,7 @@ The index translator. This translator translates from index of an element in an external Container to the Indexable. The container should have operator[](size\u005ftype) defined. Index translator uses [link structboost_1_1geometry_1_1index_1_1translator_1_1def translator::def]<...> to translate from Container::value\u005ftype to the Indexable which means that it can handle Indexables, std::pairs and boost::tuples stored in an external Container. [heading Header] -`#include ` +`#include ` [heading Synopsis] [pre @@ -43,7 +43,8 @@ The constructor. `index``(``Container const &` `c``)` ] -[heading Parameter(s)] +[heading Modifier(s)] +``explicit ``[heading Parameter(s)] [table [[Type][Name][Description]] [[`Container const &`][ `c` ][The container which stores indexed values. ]] diff --git a/doc/html/geometry_index/introduction.html b/doc/html/geometry_index/introduction.html index dd5718dbb..c00e43835 100644 --- a/doc/html/geometry_index/introduction.html +++ b/doc/html/geometry_index/introduction.html @@ -3,7 +3,7 @@ Introduction - + diff --git a/doc/html/geometry_index/r_tree.html b/doc/html/geometry_index/r_tree.html index 9c5468fb8..4d5f596cd 100644 --- a/doc/html/geometry_index/r_tree.html +++ b/doc/html/geometry_index/r_tree.html @@ -3,7 +3,7 @@ R-tree - + diff --git a/doc/html/geometry_index/r_tree/creation_and_modification.html b/doc/html/geometry_index/r_tree/creation_and_modification.html index 5d10c6375..263f4d250 100644 --- a/doc/html/geometry_index/r_tree/creation_and_modification.html +++ b/doc/html/geometry_index/r_tree/creation_and_modification.html @@ -3,7 +3,7 @@ Creation and modification - + @@ -55,7 +55,7 @@ 

rtree<Value, Parameters, Translator = translator::def<Value>, Allocator> = std::allocator<Value> >
-
    +
    • Value - type of object which will be stored in the container,
      • @@ -90,7 +90,7 @@ be handled by the default Translator - index::translator::def<Value> are defined as follows:

      -
        +
        • Indexable = Point | Box @@ -116,7 +116,7 @@ A Translator is a type which knows how to handle Values. It has two purposes:

          -
            +
            • it translates Value to a more suitable Indexable type which is needed by most of operations, @@ -134,7 +134,7 @@

              If comparison of two Values is required, the default translator:

              -
                +
                • for Point and Box diff --git a/doc/html/geometry_index/r_tree/introduction.html b/doc/html/geometry_index/r_tree/introduction.html index 035a9287c..28ae3b6fd 100644 --- a/doc/html/geometry_index/r_tree/introduction.html +++ b/doc/html/geometry_index/r_tree/introduction.html @@ -3,7 +3,7 @@ Introduction - + @@ -28,10 +28,10 @@

            R-tree is a tree data structure used for spatial searching. It was proposed - by Antonin Guttman in 1984 [1] as an expansion of B-tree for multi-dimensional data. It may + by Antonin Guttman in 1984 [1] as an expansion of B-tree for multi-dimensional data. It may be used to store points or volumetric data in order to perform a spatial query later. This query may return objects that are inside some area or are - close to some point in space [2]. + close to some point in space [2].

            The R-tree structure is presented on the image below. Each R-tree's node @@ -51,7 +51,7 @@

            The R-tree is a self-balanced data structure. The key part of balancing algorithm - is node splitting algorithm [3] [4]. Each algorithm produces different splits so the internal structure + is node splitting algorithm [3] [4]. Each algorithm produces different splits so the internal structure of a tree may be different for each one of them. In general more complex algorithms analyses elements better and produces less overlapping nodes. In the searching process less nodes must be traversed in order to find desired @@ -179,13 +179,13 @@

          - Implementation + Implementation details

          Key features of this implementation of the R-tree are:

          -
            +
            • capable to store arbitrary Value type,
              • @@ -207,7 +207,7 @@
            - Contributors + Contributors

            The spatial index was originally started by Federico J. Fernandez during @@ -215,7 +215,7 @@

            - Spatial + Spatial thanks

            @@ -224,20 +224,20 @@ list for their help.

            -
            -

            [1] +

            +

            [1] Guttman, A. (1984). R-Trees: A Dynamic Index Structure for Spatial Searching

            -

            [2] +

            [2] Cheung, K.; Fu, A. (1998). Enhanced Nearest Neighbour Search on the R-tree

            -

            [3] +

            [3] Greene, D. (1989). An implementation and performance analysis of spatial data access methods

            -

            [4] +

            [4] Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990). The R*-tree: an efficient and robust access method for points and rectangles

            diff --git a/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html b/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html index 16a6eba21..18130e9d5 100644 --- a/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html +++ b/doc/html/geometry_index/r_tree/nearest_neighbours_queries.html @@ -3,7 +3,7 @@ Nearest neighbours queries - + diff --git a/doc/html/geometry_index/r_tree/reference.html b/doc/html/geometry_index/r_tree/reference.html index ad1df612c..c81b25631 100644 --- a/doc/html/geometry_index/r_tree/reference.html +++ b/doc/html/geometry_index/r_tree/reference.html @@ -3,7 +3,7 @@ Reference - + @@ -47,12 +47,12 @@ boost::geometry::index::rtree

            - + The R-tree spatial index.

            - Description + Description

            This is self-balancing spatial index capable to store various types of @@ -60,7 +60,7 @@ The R-tree spatial index.

            - Parameters + Parameters

            The user must pass a type defining the Parameters which will be used in @@ -70,7 +70,7 @@ The R-tree spatial index.

            Predefined algorithms with compile-time parameters are:

            -
              +
              • boost::geometry::index::linear,
                • @@ -84,7 +84,7 @@ The R-tree spatial index.

                Predefined algorithms with run-time parameters are:

                -
                  +
                  - Translator + Translator

                  The Translator translates from Value to Indexable each time r-tree requires @@ -114,14 +114,14 @@ The R-tree spatial index.

                  - Header + Header

                  - #include <boost/geometry/extensions/index/rtree.hpp> + #include <boost/geometry/index/rtree.hpp>

                  - Synopsis + Synopsis 
                  template<typename Value,
          typename Parameters,
@@ -134,7 +134,7 @@ The R-tree spatial index.
                  - Template + Template parameter(s)
                  @@ -208,7 +208,7 @@ The R-tree spatial index.
                  - Typedef(s) + Typedef(s)
                  @@ -303,7 +303,7 @@ The R-tree spatial index.

                  - box_type + envelope_type

                  		@@ -316,7 +316,7 @@ The R-tree spatial index.
                  - Constructor(s) + Constructor(s) and destructor
                  @@ -458,14 +458,20 @@ The R-tree spatial index.
                  - Member(s) + Member(s)
                  + + + + + + + + + + + + + + + + + + + + + + + +
                  +

                  + Modifier +

                  +

                  Function @@ -479,6 +485,8 @@ The R-tree spatial index.

                  +

                  operator=(const rtree @@ -492,6 +500,8 @@ The R-tree spatial index.

                  +

                  operator=(rtree &&) @@ -504,6 +514,8 @@ The R-tree spatial index.

                  +

                  swap(rtree &) @@ -516,6 +528,8 @@ The R-tree spatial index.

                  +

                  insert(value_type const @@ -529,6 +543,8 @@ The R-tree spatial index.

                  +

                  insert(Iterator, @@ -542,6 +558,8 @@ The R-tree spatial index.

                  +

                  insert(Range const @@ -555,6 +573,8 @@ The R-tree spatial index.

                  +

                  remove(value_type const @@ -568,6 +588,8 @@ The R-tree spatial index.

                  +

                  remove(Iterator, @@ -581,6 +603,8 @@ The R-tree spatial index.

                  +

                  remove(Range const @@ -594,6 +618,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  spatial_query(Predicates const @@ -608,6 +637,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  nearest_query(DistancesPredicates const @@ -623,6 +657,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  nearest_query(DistancesPredicates const @@ -639,6 +678,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  nearest_query(DistancesPredicates const @@ -653,6 +697,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  nearest_query(DistancesPredicates const @@ -669,6 +718,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  size() @@ -681,6 +735,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  empty() @@ -693,6 +752,8 @@ The R-tree spatial index.

                  +

                  clear() @@ -707,16 +768,26 @@ The R-tree spatial index.

                  - box() + const

                  - Returns the box containing all values stored in the container. + envelope() +

                  +                   		+

                  + Returns the box able to contain all values stored in the container.

                  +

                  + const +

                  +

                  count(ValueOrIndexable const @@ -730,6 +801,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  parameters() @@ -742,6 +818,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  translator() @@ -754,6 +835,11 @@ The R-tree spatial index.

                  +

                  + const +

                  +

                  get_allocator() @@ -776,13 +862,22 @@ The R-tree spatial index.

                  - Synopsis + Synopsis 
                  rtree(parameters_type parameters = parameters_type(), translator_type const & translator = translator_type())
                  - Parameter(s) + Modifier(s) +
                  +

                  +

                  +
                  explicit
                  +

                  +

                  +
                  + + Parameter(s)
                  @@ -846,8 +941,8 @@ The R-tree spatial index.
                  - - Throws + + Throws

                  If allocator default constructor throws. @@ -863,7 +958,7 @@ The R-tree spatial index.

                  - Synopsis + Synopsis 
                  rtree(parameters_type parameters,
       translator_type const & translator,
@@ -871,7 +966,7 @@ The R-tree spatial index.
                  - Parameter(s) + Parameter(s)
                  @@ -953,7 +1048,7 @@ The R-tree spatial index.
                  - Throws + Throws

                  If allocator copy constructor throws. @@ -969,7 +1064,7 @@ The R-tree spatial index.

                  - Synopsis + Synopsis 
                  template<typename Iterator>
 rtree(Iterator first,
@@ -980,7 +1075,7 @@ The R-tree spatial index.
                  - Parameter(s) + Parameter(s)
                  @@ -1096,9 +1191,9 @@ The R-tree spatial index.
                  - Throws + Throws
                  -
                    +
                    • If allocator copy constructor throws.
                      • @@ -1123,7 +1218,7 @@ The R-tree spatial index.

                      - Synopsis + Synopsis 
                      template<typename Range>
 rtree(Range const & rng,
@@ -1133,7 +1228,16 @@ The R-tree spatial index.
                      - Parameter(s) + Modifier(s) +
                      +

                      +

                      +
                      explicit
                      +

                      +

                      +
                      + + Parameter(s)
                      @@ -1232,10 +1336,10 @@ The R-tree spatial index.
                      - - Throws + + Throws
                      -
                        +
                        • If allocator copy constructor throws.
                          • @@ -1259,13 +1363,13 @@ The R-tree spatial index.

                          - Synopsis + Synopsis 
                          ~rtree()
                          - Throws + Throws

                          Nothing. @@ -1281,20 +1385,20 @@ The R-tree spatial index.

                          - Description + Description

                          It uses parameters, translator and allocator from the source tree.

                          - Synopsis + Synopsis 
                          rtree(rtree const & src)
                          - Parameter(s) + Parameter(s)
                          @@ -1340,9 +1444,9 @@ The R-tree spatial index.
                          - Throws + Throws
                          -
                            +
                            • If allocator copy constructor throws.
                              • @@ -1367,20 +1471,20 @@ The R-tree spatial index.

                              - Description + Description

                              It uses Parameters and translator from the source tree.

                              - Synopsis + Synopsis 
                              rtree(rtree const & src, allocator_type const & allocator)
                              - Parameter(s) + Parameter(s)
                              @@ -1446,9 +1550,9 @@ The R-tree spatial index.
                              - Throws + Throws
                              -
                                +
                                • If allocator copy constructor throws.
                                  • @@ -1473,20 +1577,20 @@ The R-tree spatial index.

                                  - Description + Description

                                  It uses parameters, translator and allocator from the source tree.

                                  - Synopsis + Synopsis 
                                  rtree(rtree && src)
                                  - Parameter(s) + Parameter(s)
                                  @@ -1532,7 +1636,7 @@ The R-tree spatial index.
                                  - Throws + Throws

                                  Nothing. @@ -1548,20 +1652,20 @@ The R-tree spatial index.

                                  - Description + Description

                                  It uses parameters and translator from the source tree.

                                  - Synopsis + Synopsis 
                                  rtree(rtree && src, allocator_type const & allocator)
                                  - Parameter(s) + Parameter(s)
                                  @@ -1627,9 +1731,9 @@ The R-tree spatial index.
                                  - Throws + Throws
                                  -
                                    +
                                    • If allocator copy constructor throws.
                                      • @@ -1655,20 +1759,20 @@ The R-tree spatial index.

                                      - Description + Description

                                      It uses parameters and translator from the source tree.

                                      - Synopsis + Synopsis 
                                      rtree & operator=(const rtree & src)
                                      - Parameter(s) + Parameter(s)
                                      @@ -1714,9 +1818,9 @@ The R-tree spatial index.
                                      - Throws + Throws
                                      -
                                        +
                                        • If Value copy constructor throws.
                                          • @@ -1738,20 +1842,20 @@ The R-tree spatial index.

                                          - Description + Description

                                          It uses parameters and translator from the source tree.

                                          - Synopsis + Synopsis 
                                          rtree & operator=(rtree && src)
                                          - Parameter(s) + Parameter(s)
                                          @@ -1797,12 +1901,12 @@ The R-tree spatial index.
                                          - Throws + Throws

                                          Only if allocators aren't equal.

                                          -
                                            +
                                            • If Value copy constructor throws.
                                              • @@ -1824,20 +1928,20 @@ The R-tree spatial index.

                                              - Description + Description

                                              Parameters, translator and allocators are swapped as well.

                                              - Synopsis + Synopsis 
                                              void swap(rtree & other)
                                              - Parameter(s) + Parameter(s)
                                              @@ -1883,7 +1987,7 @@ The R-tree spatial index.
                                              - Throws + Throws

                                              If allocators swap throws. @@ -1899,13 +2003,13 @@ The R-tree spatial index.

                                              - Synopsis + Synopsis 
                                              void insert(value_type const & value)
                                              - Parameter(s) + Parameter(s)
                                              @@ -1951,9 +2055,9 @@ The R-tree spatial index.
                                              - Throws + Throws
                                              -
                                                +
                                                • If Value copy constructor or copy assignment throws.
                                                  • @@ -1986,14 +2090,14 @@ The R-tree spatial index.

                                                  - Synopsis + Synopsis 
                                                  template<typename Iterator>
 void insert(Iterator first, Iterator last)
                                                  - Parameter(s) + Parameter(s)
                                                  @@ -2057,9 +2161,9 @@ The R-tree spatial index.
                                                  - Throws + Throws
                                                  -
                                                    +
                                                    • If Value copy constructor or copy assignment throws.
                                                      • @@ -2092,14 +2196,14 @@ The R-tree spatial index.

                                                      - Synopsis + Synopsis 
                                                      template<typename Range>
 void insert(Range const & rng)
                                                      - Parameter(s) + Parameter(s)
                                                      @@ -2145,9 +2249,9 @@ The R-tree spatial index.
                                                      - Throws + Throws
                                                      -
                                                        +
                                                        • If Value copy constructor or copy assignment throws.
                                                          • @@ -2180,7 +2284,7 @@ The R-tree spatial index.

                                                          - Description + Description

                                                          In contrast to the std::set @@ -2189,13 +2293,13 @@ The R-tree spatial index.

                                                          - Synopsis + Synopsis 
                                                          size_type remove(value_type const & value)
                                                          - Parameter(s) + Parameter(s)
                                                          @@ -2241,16 +2345,16 @@ The R-tree spatial index.
                                                          - Returns + Returns

                                                          1 if the value was removed, 0 otherwise.

                                                          - Throws + Throws
                                                          -
                                                            +
                                                            • If Value copy constructor or copy assignment throws.
                                                              • @@ -2283,7 +2387,7 @@ The R-tree spatial index.

                                                              - Description + Description

                                                              In contrast to the std::set @@ -2294,14 +2398,14 @@ The R-tree spatial index.

                                                              - Synopsis + Synopsis 
                                                              template<typename Iterator>
 size_type remove(Iterator first, Iterator last)
                                                              - Parameter(s) + Parameter(s)
                                                              @@ -2365,16 +2469,16 @@ The R-tree spatial index.
                                                              - Returns + Returns

                                                              The number of removed values.

                                                              - Throws + Throws
                                                              -
                                                                +
                                                                • If Value copy constructor or copy assignment throws.
                                                                  • @@ -2407,7 +2511,7 @@ The R-tree spatial index.

                                                                  - Description + Description

                                                                  In contrast to the std::set @@ -2417,14 +2521,14 @@ The R-tree spatial index.

                                                                  - Synopsis + Synopsis 
                                                                  template<typename Range>
 size_type remove(Range const & rng)
                                                                  - Parameter(s) + Parameter(s)
                                                                  @@ -2470,16 +2574,16 @@ The R-tree spatial index.
                                                                  - Returns + Returns

                                                                  The number of removed values.

                                                                  - Throws + Throws
                                                                  -
                                                                    +
                                                                    • If Value copy constructor or copy assignment throws.
                                                                      • @@ -2512,7 +2616,7 @@ The R-tree spatial index.

                                                                      - Description + Description

                                                                      Spatial predicates may be a Geometry. In this case Values @@ -2522,7 +2626,7 @@ The R-tree spatial index.

                                                                      It may be generated by one of the functions listed below:

                                                                      -
                                                                        +
                                                                        • boost::geometry::index::covered_by(),
                                                                          • @@ -2564,14 +2668,23 @@ The R-tree spatial index.

                                                                          - Synopsis + Synopsis 
                                                                          template<typename Predicates, typename OutIter>
 size_type spatial_query(Predicates const & pred, OutIter out_it)
                                                                          - Parameter(s) + Modifier(s) +
                                                                          +

                                                                          +

                                                                          +
                                                                          const
                                                                          +

                                                                          +

                                                                          +
                                                                          + + Parameter(s)
                                                                          @@ -2635,17 +2748,17 @@ The R-tree spatial index.
                                                                          - - Returns + + Returns

                                                                          The number of values found.

                                                                          - - Throws + + Throws
                                                                          -
                                                                            +
                                                                            • If Value copy constructor or copy assignment throws.
                                                                              • @@ -2664,7 +2777,7 @@ The R-tree spatial index.

                                                                              - Description + Description

                                                                              Distances predicates may be a Point. In this the case the @@ -2675,7 +2788,7 @@ The R-tree spatial index. It is possible to define how distance to Value is calculated. This is done by passing PointRelation. It can be generated by following functions:

                                                                              -
                                                                                +
                                                                                • boost::geometry::index::to_nearest() - default, @@ -2692,7 +2805,7 @@ The R-tree spatial index. distance must be between min_distance and max_distance. This is done by passing DistancesPredicates which can be generated by following functions:

                                                                                  -
                                                                                    +
                                                                                    • boost::geometry::index::unbounded() - default, @@ -2711,7 +2824,7 @@ The R-tree spatial index. MinRelation and MaxRelation describes bounds and can be generated by following functions:

                                                                                      -
                                                                                        +
                                                                                        - Synopsis + Synopsis 
                                                                                        template<typename DistancesPredicates>
 size_type nearest_query(DistancesPredicates const & dpred, value_type & v)
                                                                                        - Parameter(s) + Modifier(s) +
                                                                                        +

                                                                                        +

                                                                                        +
                                                                                        const
                                                                                        +

                                                                                        +

                                                                                        +
                                                                                        + + Parameter(s)
                                                                                        @@ -2796,15 +2918,15 @@ The R-tree spatial index.
                                                                                        - - Returns + + Returns

                                                                                        The number of values found.

                                                                                        - - Throws + + Throws

                                                                                        If Value copy constructor or copy assignment throws. @@ -2821,7 +2943,7 @@ The R-tree spatial index.

                                                                                        - Description + Description

                                                                                        Distances predicates may be a Point. In this the case the @@ -2832,7 +2954,7 @@ The R-tree spatial index. It is possible to define how distance to Value is calculated. This is done by passing PointRelation. It can be generated by following functions:

                                                                                        -
                                                                                          +
                                                                                          • boost::geometry::index::to_nearest() - default, @@ -2849,7 +2971,7 @@ The R-tree spatial index. distance must be between min_distance and max_distance. This is done by passing DistancesPredicates which can be generated by following functions:

                                                                                            -
                                                                                              +
                                                                                              • boost::geometry::index::unbounded() - default, @@ -2868,7 +2990,7 @@ The R-tree spatial index. MinRelation and MaxRelation describes bounds and can be generated by following functions:

                                                                                                -
                                                                                                  +
                                                                                                  • boost::geometry::index::to_nearest(),
                                                                                                    • @@ -2887,7 +3009,7 @@ The R-tree spatial index.

                                                                                                    It may be generated by one of the functions listed below:

                                                                                                    -
                                                                                                      +
                                                                                                      • boost::geometry::index::covered_by(),
                                                                                                        • @@ -2929,7 +3051,7 @@ The R-tree spatial index.

                                                                                                        - Synopsis + Synopsis 
                                                                                                        template<typename DistancesPredicates, typename Predicates>
 size_type nearest_query(DistancesPredicates const & dpred,
@@ -2938,7 +3060,16 @@ The R-tree spatial index.
                                                                                                        - Parameter(s) + Modifier(s) +
                                                                                                        +

                                                                                                        +

                                                                                                        +
                                                                                                        const
                                                                                                        +

                                                                                                        +

                                                                                                        +
                                                                                                        + + Parameter(s)
                                                                                                        @@ -3020,15 +3151,15 @@ The R-tree spatial index.
                                                                                                        - - Returns + + Returns

                                                                                                        The number of values found.

                                                                                                        - - Throws + + Throws

                                                                                                        If Value copy constructor or copy assignment throws. @@ -3045,7 +3176,7 @@ The R-tree spatial index.

                                                                                                        - Description + Description

                                                                                                        Distances predicates may be a Point. In this the case the @@ -3056,7 +3187,7 @@ The R-tree spatial index. It is possible to define how distance to Value is calculated. This is done by passing PointRelation. It can be generated by following functions:

                                                                                                        -
                                                                                                          +
                                                                                                          • boost::geometry::index::to_nearest() - default, @@ -3073,7 +3204,7 @@ The R-tree spatial index. distance must be between min_distance and max_distance. This is done by passing DistancesPredicates which can be generated by following functions:

                                                                                                            -
                                                                                                              +
                                                                                                              • boost::geometry::index::unbounded() - default, @@ -3092,7 +3223,7 @@ The R-tree spatial index. MinRelation and MaxRelation describes bounds and can be generated by following functions:

                                                                                                                -
                                                                                                                  +
                                                                                                                  - Synopsis + Synopsis 
                                                                                                                  template<typename DistancesPredicates, typename OutIter>
 size_type nearest_query(DistancesPredicates const & dpred,
@@ -3114,7 +3245,16 @@ The R-tree spatial index.
                                                                                                                  - Parameter(s) + Modifier(s) +
                                                                                                                  +

                                                                                                                  +

                                                                                                                  +
                                                                                                                  const
                                                                                                                  +

                                                                                                                  +

                                                                                                                  +
                                                                                                                  + + Parameter(s)
                                                                                                                  @@ -3195,15 +3335,15 @@ The R-tree spatial index.
                                                                                                                  - - Returns + + Returns

                                                                                                                  The number of values found.

                                                                                                                  - - Throws + + Throws

                                                                                                                  If Value copy constructor or copy assignment throws. If OutIter dereference @@ -3221,7 +3361,7 @@ The R-tree spatial index.

                                                                                                                  - Description + Description

                                                                                                                  Distances predicates may be a Point. In this the case the @@ -3232,7 +3372,7 @@ The R-tree spatial index. It is possible to define how distance to Value is calculated. This is done by passing PointRelation. It can be generated by following functions:

                                                                                                                  -
                                                                                                                  - +

                                                                                                                  Last revised: January 18, 2013 at 20:09:35 GMT

                                                                                                                  Last revised: January 19, 2013 at 02:20:46 GMT
                                                                                                                  diff --git a/include/boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp b/include/boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp deleted file mode 100644 index 7e2ff2285..000000000 --- a/include/boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp +++ /dev/null @@ -1,16 +0,0 @@ -// Boost.Geometry Index -// -// R-tree kmeans algorithm implementation -// -// 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) - -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_KMEANS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_KMEANS_HPP - -#include - -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_KMEANS_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/linear/linear.hpp b/include/boost/geometry/extensions/index/detail/rtree/linear/linear.hpp deleted file mode 100644 index 4c6aaf44e..000000000 --- a/include/boost/geometry/extensions/index/detail/rtree/linear/linear.hpp +++ /dev/null @@ -1,16 +0,0 @@ -// Boost.Geometry Index -// -// R-tree linear algorithm implementation -// -// 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) - -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_LINEAR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_LINEAR_HPP - -#include - -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_LINEAR_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/quadratic/quadratic.hpp b/include/boost/geometry/extensions/index/detail/rtree/quadratic/quadratic.hpp deleted file mode 100644 index d7eaa03af..000000000 --- a/include/boost/geometry/extensions/index/detail/rtree/quadratic/quadratic.hpp +++ /dev/null @@ -1,16 +0,0 @@ -// Boost.Geometry Index -// -// R-tree quadratic algorithm implementation -// -// 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) - -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_QUADRATIC_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_QUADRATIC_HPP - -#include - -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_QUADRATIC_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/rstar/rstar.hpp b/include/boost/geometry/extensions/index/detail/rtree/rstar/rstar.hpp deleted file mode 100644 index 905c4e540..000000000 --- a/include/boost/geometry/extensions/index/detail/rtree/rstar/rstar.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Boost.Geometry Index -// -// R-tree R*-tree algorithm implementation -// -// 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) - -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP - -#include -#include -#include - -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP diff --git a/include/boost/geometry/extensions/index/adaptors/nearest_query.hpp b/include/boost/geometry/index/adaptors/nearest_query.hpp similarity index 91% rename from include/boost/geometry/extensions/index/adaptors/nearest_query.hpp rename to include/boost/geometry/index/adaptors/nearest_query.hpp index dfa34b31f..fd86465eb 100644 --- a/include/boost/geometry/extensions/index/adaptors/nearest_query.hpp +++ b/include/boost/geometry/index/adaptors/nearest_query.hpp @@ -2,14 +2,14 @@ // // Nearest neighbour query range adaptor // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP +#ifndef BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP +#define BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP /*! \defgroup adaptors Adaptors (boost::geometry::index::adaptors::) @@ -119,4 +119,4 @@ operator|( }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP +#endif // BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP diff --git a/include/boost/geometry/extensions/index/adaptors/spatial_query.hpp b/include/boost/geometry/index/adaptors/spatial_query.hpp similarity index 87% rename from include/boost/geometry/extensions/index/adaptors/spatial_query.hpp rename to include/boost/geometry/index/adaptors/spatial_query.hpp index b57ca3270..46331e02d 100644 --- a/include/boost/geometry/extensions/index/adaptors/spatial_query.hpp +++ b/include/boost/geometry/index/adaptors/spatial_query.hpp @@ -2,14 +2,14 @@ // // Spatial query range adaptor // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP +#ifndef BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP +#define BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP /*! \defgroup adaptors Adaptors (boost::geometry::index::adaptors::) @@ -85,4 +85,4 @@ operator|( }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP +#endif // BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_centroid.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp similarity index 82% rename from include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_centroid.hpp rename to include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp index 06283ea36..269a2c9c3 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_centroid.hpp +++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp @@ -2,17 +2,17 @@ // // squared distance between point and centroid of the box or point // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -73,5 +73,5 @@ comparable_distance_centroid(Point const& pt, Indexable const& i) }}}} // namespace boost::geometry::index::detail -#endif // #define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP +#endif // #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_far.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp similarity index 81% rename from include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_far.hpp rename to include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp index a945ac014..1646a82d6 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_far.hpp +++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp @@ -2,17 +2,17 @@ // // squared distance between point and furthest point of the box or point // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -63,4 +63,4 @@ comparable_distance_far(Point const& pt, Indexable const& i) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_near.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp similarity index 85% rename from include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_near.hpp rename to include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp index 71ccc1678..221d3ee3f 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_near.hpp +++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp @@ -2,16 +2,16 @@ // // squared distance between point and nearest point of the box or point // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -74,4 +74,4 @@ comparable_distance_near(Point const& pt, Indexable const& i) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/content.hpp b/include/boost/geometry/index/detail/algorithms/content.hpp similarity index 89% rename from include/boost/geometry/extensions/index/detail/algorithms/content.hpp rename to include/boost/geometry/index/detail/algorithms/content.hpp index 766b1d6a2..0677fe564 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/content.hpp +++ b/include/boost/geometry/index/detail/algorithms/content.hpp @@ -2,14 +2,14 @@ // // n-dimensional box's content (hypervolume) - 2d area, 3d volume, ... // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -82,4 +82,4 @@ typename default_content_result::type content(Indexable const& b) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp b/include/boost/geometry/index/detail/algorithms/diff_abs.hpp similarity index 63% rename from include/boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp rename to include/boost/geometry/index/detail/algorithms/diff_abs.hpp index 8beed4d0f..a89784d7f 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp +++ b/include/boost/geometry/index/detail/algorithms/diff_abs.hpp @@ -2,14 +2,14 @@ // // Abs of difference // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -21,4 +21,4 @@ inline T diff_abs(T const& v1, T const& v2) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp b/include/boost/geometry/index/detail/algorithms/intersection_content.hpp similarity index 69% rename from include/boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp rename to include/boost/geometry/index/detail/algorithms/intersection_content.hpp index 876e1ce25..955d6eb65 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp +++ b/include/boost/geometry/index/detail/algorithms/intersection_content.hpp @@ -2,17 +2,17 @@ // // boxes union/intersection area/volume // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -33,4 +33,4 @@ inline typename default_content_result::type intersection_content(Box const }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/is_valid.hpp b/include/boost/geometry/index/detail/algorithms/is_valid.hpp similarity index 87% rename from include/boost/geometry/extensions/index/detail/algorithms/is_valid.hpp rename to include/boost/geometry/index/detail/algorithms/is_valid.hpp index 63efed886..327e629af 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/is_valid.hpp +++ b/include/boost/geometry/index/detail/algorithms/is_valid.hpp @@ -2,14 +2,14 @@ // // n-dimensional box's / point validity check // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_IS_VALID_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_IS_VALID_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -76,4 +76,4 @@ inline bool is_valid(Indexable const& b) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP +#endif // BOOST_GEOMETRY_DETAIL_INDEX_ALGORITHMS_IS_VALID_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/margin.hpp b/include/boost/geometry/index/detail/algorithms/margin.hpp similarity index 91% rename from include/boost/geometry/extensions/index/detail/algorithms/margin.hpp rename to include/boost/geometry/index/detail/algorithms/margin.hpp index 6a91c1ed6..cebc2cfb7 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/margin.hpp +++ b/include/boost/geometry/index/detail/algorithms/margin.hpp @@ -2,14 +2,14 @@ // // n-dimensional box's margin value (hypersurface), 2d perimeter, 3d surface, etc... // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -96,4 +96,4 @@ typename default_margin_result::type margin(Box const& b) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/minmaxdist.hpp b/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp similarity index 87% rename from include/boost/geometry/extensions/index/detail/algorithms/minmaxdist.hpp rename to include/boost/geometry/index/detail/algorithms/minmaxdist.hpp index 28e7e9715..d2429cbb2 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/minmaxdist.hpp +++ b/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp @@ -2,21 +2,21 @@ // // minmaxdist used in R-tree k nearest neighbors query // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP #include #include -#include -#include -#include +#include +#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -116,4 +116,4 @@ minmaxdist(Point const& pt, Indexable const& i) }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/smallest_for_indexable.hpp b/include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp similarity index 87% rename from include/boost/geometry/extensions/index/detail/algorithms/smallest_for_indexable.hpp rename to include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp index 0e864934d..3ca335d5a 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/smallest_for_indexable.hpp +++ b/include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp @@ -2,14 +2,14 @@ // // 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 (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SMALLEST_FOR_INDEXABLE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SMALLEST_FOR_INDEXABLE_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SMALLEST_FOR_INDEXABLE_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SMALLEST_FOR_INDEXABLE_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -77,4 +77,4 @@ struct smallest_for_indexable }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SMALLEST_FOR_INDEXABLE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SMALLEST_FOR_INDEXABLE_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp b/include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp similarity index 86% rename from include/boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp rename to include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp index 014b871ca..4aef36352 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp +++ b/include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp @@ -2,14 +2,14 @@ // // 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 (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SUM_FOR_INDEXABLE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SUM_FOR_INDEXABLE_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SUM_FOR_INDEXABLE_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SUM_FOR_INDEXABLE_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -73,4 +73,4 @@ struct sum_for_indexable }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SUM_FOR_INDEXABLE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SUM_FOR_INDEXABLE_HPP diff --git a/include/boost/geometry/extensions/index/detail/algorithms/union_content.hpp b/include/boost/geometry/index/detail/algorithms/union_content.hpp similarity index 68% rename from include/boost/geometry/extensions/index/detail/algorithms/union_content.hpp rename to include/boost/geometry/index/detail/algorithms/union_content.hpp index 93b770704..3acdc3d19 100644 --- a/include/boost/geometry/extensions/index/detail/algorithms/union_content.hpp +++ b/include/boost/geometry/index/detail/algorithms/union_content.hpp @@ -3,17 +3,17 @@ // boxes union/sum area/volume // // Copyright (c) 2008 Federico J. Fernandez. -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -30,4 +30,4 @@ inline typename default_content_result::type union_content(Box const& b, Ge }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP diff --git a/include/boost/geometry/extensions/index/detail/assert.hpp b/include/boost/geometry/index/detail/assert.hpp similarity index 71% rename from include/boost/geometry/extensions/index/detail/assert.hpp rename to include/boost/geometry/index/detail/assert.hpp index bf3b3038a..1ac4f5490 100644 --- a/include/boost/geometry/extensions/index/detail/assert.hpp +++ b/include/boost/geometry/index/detail/assert.hpp @@ -1,6 +1,6 @@ // Boost.Geometry Index // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -8,8 +8,8 @@ #include -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP #define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG) \ BOOST_ASSERT_MSG(CONDITION, TEXT_MSG) @@ -24,4 +24,4 @@ #endif -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP diff --git a/include/boost/geometry/extensions/index/detail/distance_predicates.hpp b/include/boost/geometry/index/detail/distance_predicates.hpp similarity index 97% rename from include/boost/geometry/extensions/index/detail/distance_predicates.hpp rename to include/boost/geometry/index/detail/distance_predicates.hpp index d293183df..9d86a03f2 100644 --- a/include/boost/geometry/extensions/index/detail/distance_predicates.hpp +++ b/include/boost/geometry/index/detail/distance_predicates.hpp @@ -3,22 +3,22 @@ // Spatial index distance predicates, calculators and checkers // used in nearest query - specialized for envelopes // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_DISTANCE_PREDICATES_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_DISTANCE_PREDICATES_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_DISTANCE_PREDICATES_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_DISTANCE_PREDICATES_HPP -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include // TODO - optimization // For Boxes and Points all types of distances may be calculated @@ -863,4 +863,4 @@ struct distances_predicates_check< }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_DISTANCE_PREDICATES_HPP +#endif // BOOST_GEOMETRY_INDEX_RTREE_DISTANCE_PREDICATES_HPP diff --git a/include/boost/geometry/extensions/index/detail/indexable.hpp b/include/boost/geometry/index/detail/indexable.hpp similarity index 94% rename from include/boost/geometry/extensions/index/detail/indexable.hpp rename to include/boost/geometry/index/detail/indexable.hpp index b3a10452f..6d04b90ad 100644 --- a/include/boost/geometry/extensions/index/detail/indexable.hpp +++ b/include/boost/geometry/index/detail/indexable.hpp @@ -2,14 +2,14 @@ // // Indexable's traits and related functions // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -174,4 +174,4 @@ struct default_box_type }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP diff --git a/include/boost/geometry/extensions/index/detail/nonassignable.hpp b/include/boost/geometry/index/detail/nonassignable.hpp similarity index 66% rename from include/boost/geometry/extensions/index/detail/nonassignable.hpp rename to include/boost/geometry/index/detail/nonassignable.hpp index 345007b0d..944fc1547 100644 --- a/include/boost/geometry/extensions/index/detail/nonassignable.hpp +++ b/include/boost/geometry/index/detail/nonassignable.hpp @@ -2,14 +2,14 @@ // // Nonassignable base class. // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP namespace boost { namespace geometry { namespace index { namespace detail { @@ -20,4 +20,4 @@ class nonassignable }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP diff --git a/include/boost/geometry/extensions/index/detail/predicates.hpp b/include/boost/geometry/index/detail/predicates.hpp similarity index 97% rename from include/boost/geometry/extensions/index/detail/predicates.hpp rename to include/boost/geometry/index/detail/predicates.hpp index abe19c760..9ea3172ab 100644 --- a/include/boost/geometry/extensions/index/detail/predicates.hpp +++ b/include/boost/geometry/index/detail/predicates.hpp @@ -2,17 +2,17 @@ // // Spatial query predicates definition and checks. // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -522,4 +522,4 @@ inline bool predicates_check(Predicates const& p, Value const& v, Indexable cons }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP diff --git a/include/boost/geometry/extensions/index/detail/pushable_array.hpp b/include/boost/geometry/index/detail/pushable_array.hpp similarity index 93% rename from include/boost/geometry/extensions/index/detail/pushable_array.hpp rename to include/boost/geometry/index/detail/pushable_array.hpp index 6140ac96e..180d46580 100644 --- a/include/boost/geometry/extensions/index/detail/pushable_array.hpp +++ b/include/boost/geometry/index/detail/pushable_array.hpp @@ -1,17 +1,17 @@ // Boost.Geometry Index // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -168,4 +168,4 @@ private: }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/adaptors.hpp b/include/boost/geometry/index/detail/rtree/adaptors.hpp similarity index 86% rename from include/boost/geometry/extensions/index/detail/rtree/adaptors.hpp rename to include/boost/geometry/index/detail/rtree/adaptors.hpp index 85b14d670..0066766df 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/adaptors.hpp +++ b/include/boost/geometry/index/detail/rtree/adaptors.hpp @@ -2,20 +2,20 @@ // // R-tree queries range adaptors // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP #include #include -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -82,4 +82,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP diff --git a/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp b/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp new file mode 100644 index 000000000..3f61482b2 --- /dev/null +++ b/include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp @@ -0,0 +1,16 @@ +// Boost.Geometry Index +// +// R-tree kmeans algorithm implementation +// +// Copyright (c) 2011-2013 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) + +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_KMEANS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_KMEANS_HPP + +#include + +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_KMEANS_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/kmeans/split.hpp b/include/boost/geometry/index/detail/rtree/kmeans/split.hpp similarity index 86% rename from include/boost/geometry/extensions/index/detail/rtree/kmeans/split.hpp rename to include/boost/geometry/index/detail/rtree/kmeans/split.hpp index 55512ec5e..f19654972 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/kmeans/split.hpp +++ b/include/boost/geometry/index/detail/rtree/kmeans/split.hpp @@ -2,23 +2,21 @@ // // R-tree kmeans split algorithm implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { -namespace detail { namespace rtree { namespace visitors { - -namespace detail { +namespace detail { namespace rtree { namespace kmeans { @@ -82,10 +80,8 @@ public: } }; -} // namespace detail - -}}} // namespace detail::rtree::visitors +}} // namespace detail::rtree }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP diff --git a/include/boost/geometry/index/detail/rtree/linear/linear.hpp b/include/boost/geometry/index/detail/rtree/linear/linear.hpp new file mode 100644 index 000000000..1461692a1 --- /dev/null +++ b/include/boost/geometry/index/detail/rtree/linear/linear.hpp @@ -0,0 +1,16 @@ +// Boost.Geometry Index +// +// R-tree linear algorithm implementation +// +// Copyright (c) 2011-2013 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) + +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_LINEAR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_LINEAR_HPP + +#include + +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_LINEAR_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/linear/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp similarity index 96% rename from include/boost/geometry/extensions/index/detail/rtree/linear/redistribute_elements.hpp rename to include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp index a3f5fb8ba..17bc20a94 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/linear/redistribute_elements.hpp +++ b/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp @@ -3,22 +3,22 @@ // R-tree linear split algorithm implementation // // Copyright (c) 2008 Federico J. Fernandez. -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP #include -#include +#include -#include -#include -#include +#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -328,4 +328,4 @@ struct redistribute_elements +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include #include -#include +#include namespace boost { namespace geometry { namespace index { @@ -159,4 +159,4 @@ void copy_from_back(Container & container, Iterator it) }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/node_auto_ptr.hpp b/include/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp similarity index 81% rename from include/boost/geometry/extensions/index/detail/rtree/node/node_auto_ptr.hpp rename to include/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp index 7b7663660..4ae6707ef 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/node_auto_ptr.hpp +++ b/include/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp @@ -2,18 +2,18 @@ // // R-tree node auto ptr // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_AUTO_PTR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_AUTO_PTR_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_AUTO_PTR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_AUTO_PTR_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { @@ -75,4 +75,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_AUTO_PTR_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_AUTO_PTR_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_dynamic.hpp b/include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp similarity index 96% rename from include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_dynamic.hpp rename to include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp index 1a0a5f5cf..0f100de46 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_dynamic.hpp +++ b/include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp @@ -2,18 +2,18 @@ // // R-tree nodes based on run-time polymorphism, storing std::vectors // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { @@ -336,4 +336,4 @@ struct destroy_node< }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_static.hpp b/include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp similarity index 93% rename from include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_static.hpp rename to include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp index 7c6c6cfc0..9634341a3 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_static.hpp +++ b/include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp @@ -2,17 +2,17 @@ // // R-tree nodes based on runtime-polymorphism, storing static-size containers // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -181,4 +181,4 @@ struct create_node< }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_dynamic.hpp b/include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp similarity index 96% rename from include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_dynamic.hpp rename to include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp index 577e60c08..d8dac9287 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_dynamic.hpp +++ b/include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp @@ -2,18 +2,18 @@ // // R-tree nodes based on Boost.Variant, storing std::vectors // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { @@ -294,4 +294,4 @@ struct destroy_node< }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_static.hpp b/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp similarity index 92% rename from include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_static.hpp rename to include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp index 5f906fca3..64ba6b0c5 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_static.hpp +++ b/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp @@ -2,18 +2,18 @@ // // R-tree nodes based on Boost.Variant, storing static-size containers // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP -#include +#include -#include +#include namespace boost { namespace geometry { namespace index { @@ -172,4 +172,4 @@ struct create_node< }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp b/include/boost/geometry/index/detail/rtree/node/static_visitor.hpp similarity index 89% rename from include/boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp rename to include/boost/geometry/index/detail/rtree/node/static_visitor.hpp index cf089b3d2..c96ca3265 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp +++ b/include/boost/geometry/index/detail/rtree/node/static_visitor.hpp @@ -2,14 +2,14 @@ // // R-tree nodes static visitor related code // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP #include @@ -73,4 +73,4 @@ inline void apply_visitor(Visitor & v, }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/options.hpp b/include/boost/geometry/index/detail/rtree/options.hpp similarity index 92% rename from include/boost/geometry/extensions/index/detail/rtree/options.hpp rename to include/boost/geometry/index/detail/rtree/options.hpp index 4cad22fc5..061bbfb8a 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/options.hpp +++ b/include/boost/geometry/index/detail/rtree/options.hpp @@ -2,16 +2,16 @@ // // R-tree options, algorithms, parameters // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -152,4 +152,4 @@ struct options_type< index::runtime::rstar > }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP diff --git a/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp b/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp new file mode 100644 index 000000000..837ddbeec --- /dev/null +++ b/include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp @@ -0,0 +1,16 @@ +// Boost.Geometry Index +// +// R-tree quadratic algorithm implementation +// +// Copyright (c) 2011-2013 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) + +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_QUADRATIC_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_QUADRATIC_HPP + +#include + +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_QUADRATIC_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/quadratic/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp similarity index 94% rename from include/boost/geometry/extensions/index/detail/rtree/quadratic/redistribute_elements.hpp rename to include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp index 7d13f278e..eeda1adec 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/quadratic/redistribute_elements.hpp +++ b/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp @@ -2,23 +2,23 @@ // // R-tree quadratic split algorithm implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -289,4 +289,4 @@ struct redistribute_elements #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -241,4 +241,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/rstar/insert.hpp b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp similarity index 98% rename from include/boost/geometry/extensions/index/detail/rtree/rstar/insert.hpp rename to include/boost/geometry/index/detail/rtree/rstar/insert.hpp index 5de0738f3..a20646922 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/rstar/insert.hpp +++ b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp @@ -2,16 +2,16 @@ // // R-tree R*-tree insert algorithm implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -522,4 +522,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/rstar/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp similarity index 95% rename from include/boost/geometry/extensions/index/detail/rtree/rstar/redistribute_elements.hpp rename to include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp index 6958cd604..75c78f0b5 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/rstar/redistribute_elements.hpp +++ b/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp @@ -2,24 +2,24 @@ // // R-tree R*-tree split algorithm implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -405,4 +405,4 @@ struct redistribute_elements +#include +#include + +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_RSTAR_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/are_boxes_ok.hpp b/include/boost/geometry/index/detail/rtree/visitors/are_boxes_ok.hpp similarity index 89% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/are_boxes_ok.hpp rename to include/boost/geometry/index/detail/rtree/visitors/are_boxes_ok.hpp index 3a1dd50be..81596b84b 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/are_boxes_ok.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/are_boxes_ok.hpp @@ -2,17 +2,17 @@ // // R-tree boxes validating visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_BOXES_OK_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_BOXES_OK_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_BOXES_OK_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_BOXES_OK_HPP #include -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { @@ -117,6 +117,10 @@ private: } // namespace visitors +#ifndef BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE +#error "To use are_boxes_ok BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE should be defined before including the rtree" +#endif + template bool are_boxes_ok(index::rtree const& tree, bool exact_match = true) @@ -138,4 +142,4 @@ bool are_boxes_ok(index::rtree const& }}}}} // namespace boost::geometry::index::detail::rtree -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_BOXES_OK_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_BOXES_OK_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/are_levels_ok.hpp b/include/boost/geometry/index/detail/rtree/visitors/are_levels_ok.hpp similarity index 86% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/are_levels_ok.hpp rename to include/boost/geometry/index/detail/rtree/visitors/are_levels_ok.hpp index 01576d2dd..b2a0d4134 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/are_levels_ok.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/are_levels_ok.hpp @@ -2,16 +2,16 @@ // // R-tree levels validating visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_LEVELS_OK_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_LEVELS_OK_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_LEVELS_OK_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_LEVELS_OK_HPP -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { @@ -88,6 +88,10 @@ private: } // namespace visitors +#ifndef BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE +#error "To use are_levels_ok() BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE should be defined before including the rtree" +#endif + template bool are_levels_ok(index::rtree const& tree) { @@ -108,4 +112,4 @@ bool are_levels_ok(index::rtree const& }}}}} // namespace boost::geometry::index::detail::rtree -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_LEVELS_OK_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_LEVELS_OK_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/children_box.hpp b/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp similarity index 84% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/children_box.hpp rename to include/boost/geometry/index/detail/rtree/visitors/children_box.hpp index 5f83cf909..0536d0043 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/children_box.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/children_box.hpp @@ -2,16 +2,16 @@ // // R-tree node children box calculating visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -55,4 +55,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/copy.hpp b/include/boost/geometry/index/detail/rtree/visitors/copy.hpp similarity index 91% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/copy.hpp rename to include/boost/geometry/index/detail/rtree/visitors/copy.hpp index dddbe3c60..1819f4a95 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/copy.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/copy.hpp @@ -2,16 +2,16 @@ // // R-tree deep copying visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -91,4 +91,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/count.hpp b/include/boost/geometry/index/detail/rtree/visitors/count.hpp similarity index 93% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/count.hpp rename to include/boost/geometry/index/detail/rtree/visitors/count.hpp index 72e355919..2c1d8717f 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/count.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/count.hpp @@ -2,16 +2,16 @@ // // R-tree count visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -119,4 +119,4 @@ struct count }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp b/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp similarity index 87% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp rename to include/boost/geometry/index/detail/rtree/visitors/destroy.hpp index 462d58bff..2cc1e96b4 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/destroy.hpp @@ -2,16 +2,16 @@ // // R-tree destroying visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -68,4 +68,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/gl_draw.hpp b/include/boost/geometry/index/detail/rtree/visitors/gl_draw.hpp similarity index 84% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/gl_draw.hpp rename to include/boost/geometry/index/detail/rtree/visitors/gl_draw.hpp index cf8ec843a..a5fabdc01 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/gl_draw.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/gl_draw.hpp @@ -2,16 +2,16 @@ // // R-tree OpenGL drawing visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -26,7 +26,7 @@ struct gl_draw_point template struct gl_draw_point { - static inline void apply(Point const& p, typename index::traits::coordinate_type::type z) + static inline void apply(Point const& p, typename index::detail::traits::coordinate_type::type z) { glBegin(GL_POINT); glVertex3f(geometry::get<0>(p), geometry::get<1>(p), z); @@ -41,7 +41,7 @@ struct gl_draw_box template struct gl_draw_box { - static inline void apply(Box const& b, typename index::traits::coordinate_type::type z) + static inline void apply(Box const& b, typename index::detail::traits::coordinate_type::type z) { glBegin(GL_LINE_LOOP); glVertex3f(geometry::get(b), geometry::get(b), z); @@ -60,9 +60,9 @@ struct gl_draw_indexable template struct gl_draw_indexable { - static const size_t dimension = index::traits::dimension::value; + static const size_t dimension = index::detail::traits::dimension::value; - static inline void apply(Indexable const& i, typename index::traits::coordinate_type::type z) + static inline void apply(Indexable const& i, typename index::detail::traits::coordinate_type::type z) { gl_draw_box::apply(i, z); } @@ -71,9 +71,9 @@ struct gl_draw_indexable template struct gl_draw_indexable { - static const size_t dimension = index::traits::dimension::value; + static const size_t dimension = index::detail::traits::dimension::value; - static inline void apply(Indexable const& i, typename index::traits::coordinate_type::type z) + static inline void apply(Indexable const& i, typename index::detail::traits::coordinate_type::type z) { gl_draw_point::apply(i, z); } @@ -84,11 +84,11 @@ struct gl_draw_indexable namespace detail { template -inline void gl_draw_indexable(Indexable const& i, typename index::traits::coordinate_type::type z) +inline void gl_draw_indexable(Indexable const& i, typename index::detail::traits::coordinate_type::type z) { dispatch::gl_draw_indexable< Indexable, - typename index::traits::tag::type + typename index::detail::traits::tag::type >::apply(i, z); } @@ -103,7 +103,7 @@ struct gl_draw : public rtree::visitor::max)(), - typename index::traits::coordinate_type::type z_coord_level_multiplier = 1 + typename index::detail::traits::coordinate_type::type z_coord_level_multiplier = 1 ) : tr(t) , level_f(level_first) @@ -180,7 +180,7 @@ struct gl_draw : public rtree::visitor::type z_mul; + typename index::detail::traits::coordinate_type::type z_mul; size_t level; }; @@ -191,7 +191,7 @@ template const& tree, size_t level_first = 0, size_t level_last = (std::numeric_limits::max)(), - typename index::traits::coordinate_type< + typename index::detail::traits::coordinate_type< typename rtree::box_type >::type z_coord_level_multiplier = 1 ) @@ -218,4 +218,4 @@ void gl_draw(rtree const& tree, }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp similarity index 98% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp rename to include/boost/geometry/index/detail/rtree/visitors/insert.hpp index 1766fef3a..84b25398a 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp @@ -2,18 +2,18 @@ // // R-tree inserting visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP -#include +#include -#include +#include namespace boost { namespace geometry { namespace index { @@ -504,4 +504,4 @@ public: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp b/include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp similarity index 77% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp rename to include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp index 7c22e3747..ce8608f22 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp @@ -2,16 +2,16 @@ // // R-tree leaf node checking visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_IS_LEAF_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_IS_LEAF_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP -#include +#include namespace boost { namespace geometry { namespace index { @@ -40,4 +40,4 @@ struct is_leaf : public rtree::visitor +#include -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { @@ -338,4 +338,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_NEAREST_QUERY_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/print.hpp b/include/boost/geometry/index/detail/rtree/visitors/print.hpp similarity index 92% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/print.hpp rename to include/boost/geometry/index/detail/rtree/visitors/print.hpp index 8c48ecb08..c28c0a0fc 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/print.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/print.hpp @@ -2,14 +2,14 @@ // // R-tree ostreaming visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_PRINT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_PRINT_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_PRINT_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_PRINT_HPP #include @@ -71,7 +71,7 @@ struct print_indexable template struct print_indexable { - static const size_t dimension = index::traits::dimension::value; + static const size_t dimension = index::detail::traits::dimension::value; static inline void apply(std::ostream &os, Indexable const& i) { @@ -86,7 +86,7 @@ struct print_indexable template struct print_indexable { - static const size_t dimension = index::traits::dimension::value; + static const size_t dimension = index::detail::traits::dimension::value; static inline void apply(std::ostream &os, Indexable const& i) { @@ -194,4 +194,4 @@ std::ostream & operator<<(std::ostream & os, rtree +#include -#include +#include #include @@ -328,4 +328,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_REMOVE_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP diff --git a/include/boost/geometry/extensions/index/detail/rtree/visitors/spatial_query.hpp b/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp similarity index 86% rename from include/boost/geometry/extensions/index/detail/rtree/visitors/spatial_query.hpp rename to include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp index 15e40e966..3ceec4d45 100644 --- a/include/boost/geometry/extensions/index/detail/rtree/visitors/spatial_query.hpp +++ b/include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp @@ -2,18 +2,18 @@ // // R-tree spatial query visitor implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP -#include +#include -#include +#include namespace boost { namespace geometry { namespace index { @@ -78,4 +78,4 @@ struct spatial_query }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP diff --git a/include/boost/geometry/extensions/index/detail/static_vector.hpp b/include/boost/geometry/index/detail/static_vector.hpp similarity index 98% rename from include/boost/geometry/extensions/index/detail/static_vector.hpp rename to include/boost/geometry/index/detail/static_vector.hpp index 675012b01..7f336d70c 100644 --- a/include/boost/geometry/extensions/index/detail/static_vector.hpp +++ b/include/boost/geometry/index/detail/static_vector.hpp @@ -1,13 +1,13 @@ // Boost.Geometry Index // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP #include #include @@ -28,7 +28,7 @@ #include #include -#include +#include namespace boost { namespace geometry { namespace index { namespace detail { @@ -803,4 +803,4 @@ private: }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP diff --git a/include/boost/geometry/extensions/index/detail/tags.hpp b/include/boost/geometry/index/detail/tags.hpp similarity index 67% rename from include/boost/geometry/extensions/index/detail/tags.hpp rename to include/boost/geometry/index/detail/tags.hpp index a49532008..4d462df7e 100644 --- a/include/boost/geometry/extensions/index/detail/tags.hpp +++ b/include/boost/geometry/index/detail/tags.hpp @@ -2,14 +2,14 @@ // // Tags used by the predicates checks implementation. // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_TAGS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_TAGS_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_TAGS_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_TAGS_HPP namespace boost { namespace geometry { namespace index { @@ -22,4 +22,4 @@ struct envelope_tag {}; }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_TAGS_HPP +#endif // BOOST_GEOMETRY_INDEX_RTREE_TAGS_HPP diff --git a/include/boost/geometry/extensions/index/detail/tuples.hpp b/include/boost/geometry/index/detail/tuples.hpp similarity index 93% rename from include/boost/geometry/extensions/index/detail/tuples.hpp rename to include/boost/geometry/index/detail/tuples.hpp index 31e6bfec4..d2100e775 100644 --- a/include/boost/geometry/extensions/index/detail/tuples.hpp +++ b/include/boost/geometry/index/detail/tuples.hpp @@ -1,13 +1,13 @@ // Boost.Geometry Index // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TUPLES_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TUPLES_HPP +#ifndef BOOST_GEOMETRY_INDEX_DETAIL_TUPLES_HPP +#define BOOST_GEOMETRY_INDEX_DETAIL_TUPLES_HPP #include #include @@ -168,4 +168,4 @@ struct add_unique }}}} // namespace boost::geometry::index::detail -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_TAGS_HPP +#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_TAGS_HPP diff --git a/include/boost/geometry/extensions/index/distance_predicates.hpp b/include/boost/geometry/index/distance_predicates.hpp similarity index 96% rename from include/boost/geometry/extensions/index/distance_predicates.hpp rename to include/boost/geometry/index/distance_predicates.hpp index 7faad08ce..45f58b7c5 100644 --- a/include/boost/geometry/extensions/index/distance_predicates.hpp +++ b/include/boost/geometry/index/distance_predicates.hpp @@ -2,16 +2,16 @@ // // Spatial index distance predicates, calculators and checkers used in nearest neighbor query // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP +#ifndef BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP +#define BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP -#include +#include /*! \defgroup distance_predicates Distance predicates (boost::geometry::index::) @@ -197,4 +197,4 @@ bounded(PointRelation const& pr, MinRelation const& minr, MaxRelation const& max }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP +#endif // BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP diff --git a/include/boost/geometry/extensions/index/inserter.hpp b/include/boost/geometry/index/inserter.hpp similarity index 87% rename from include/boost/geometry/extensions/index/inserter.hpp rename to include/boost/geometry/index/inserter.hpp index 35497afb5..7c489bc3f 100644 --- a/include/boost/geometry/extensions/index/inserter.hpp +++ b/include/boost/geometry/index/inserter.hpp @@ -2,14 +2,14 @@ // // Insert iterator // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP +#ifndef BOOST_GEOMETRY_INDEX_INSERTER_HPP +#define BOOST_GEOMETRY_INDEX_INSERTER_HPP #include @@ -75,4 +75,4 @@ insert_iterator inserter(Container & c) }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP +#endif // BOOST_GEOMETRY_INDEX_INSERTER_HPP diff --git a/include/boost/geometry/extensions/index/parameters.hpp b/include/boost/geometry/index/parameters.hpp similarity index 96% rename from include/boost/geometry/extensions/index/parameters.hpp rename to include/boost/geometry/index/parameters.hpp index 7b8a9a594..60d7d33cc 100644 --- a/include/boost/geometry/extensions/index/parameters.hpp +++ b/include/boost/geometry/index/parameters.hpp @@ -2,14 +2,14 @@ // // R-tree algorithms parameters // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP +#ifndef BOOST_GEOMETRY_INDEX_PARAMETERS_HPP +#define BOOST_GEOMETRY_INDEX_PARAMETERS_HPP #include @@ -205,4 +205,4 @@ private: }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP +#endif // BOOST_GEOMETRY_INDEX_PARAMETERS_HPP diff --git a/include/boost/geometry/extensions/index/predicates.hpp b/include/boost/geometry/index/predicates.hpp similarity index 95% rename from include/boost/geometry/extensions/index/predicates.hpp rename to include/boost/geometry/index/predicates.hpp index ee8554ba6..c992e5a9b 100644 --- a/include/boost/geometry/extensions/index/predicates.hpp +++ b/include/boost/geometry/index/predicates.hpp @@ -2,14 +2,14 @@ // // Spatial query predicates // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP +#ifndef BOOST_GEOMETRY_INDEX_PREDICATES_HPP +#define BOOST_GEOMETRY_INDEX_PREDICATES_HPP #include #include @@ -18,7 +18,7 @@ // TODO: awulkiew - temporary #include -#include +#include /*! \defgroup predicates Spatial predicates (boost::geometry::index::) @@ -256,4 +256,4 @@ operator!(boost::geometry::index::detail::not_within const& p) return boost::geometry::index::detail::within(p.geometry); } -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP +#endif // BOOST_GEOMETRY_INDEX_PREDICATES_HPP diff --git a/include/boost/geometry/extensions/index/rtree.hpp b/include/boost/geometry/index/rtree.hpp similarity index 95% rename from include/boost/geometry/extensions/index/rtree.hpp rename to include/boost/geometry/index/rtree.hpp index 977a06d8d..5e3e6601f 100644 --- a/include/boost/geometry/extensions/index/rtree.hpp +++ b/include/boost/geometry/index/rtree.hpp @@ -3,14 +3,14 @@ // R-tree implementation // // Copyright (c) 2008 Federico J. Fernandez. -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP +#ifndef BOOST_GEOMETRY_INDEX_RTREE_HPP +#define BOOST_GEOMETRY_INDEX_RTREE_HPP #include @@ -19,34 +19,34 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include //#include -#include +#include // TODO change the name to bounding_tree @@ -116,11 +116,12 @@ public: /*! \brief The Indexable type to which Value is translated. */ typedef typename translator::indexable_type::type indexable_type; /*! \brief The Box type used by the R-tree. */ - typedef typename index::detail::default_box_type::type box_type; + typedef typename index::detail::default_box_type::type envelope_type; #if !defined(BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE) private: #endif + typedef envelope_type box_type; typedef typename detail::rtree::options_type::type options_type; typedef typename options_type::node_tag node_tag; typedef detail::rtree::allocators allocators_type; @@ -908,18 +909,18 @@ public: } /*! - \brief Returns the box containing all values stored in the container. + \brief Returns the box able to contain all values stored in the container. - Returns the box containing all values stored in the container. + Returns the box able to contain all values stored in the container. If the container is empty the result of \c geometry::assign_inverse() is returned. - \return The box containing all values stored in the container or an invalid box if + \return The box able to contain all values stored in the container or an invalid box if there are no values in the container. \par Throws Nothing. */ - inline box_type const& box() const + inline envelope_type const& envelope() const { return m_box; } @@ -1542,7 +1543,7 @@ inline bool empty(rtree const& tree) /*! \brief Get the box containing all stored values or an invalid box if the index has no values. -It calls \c rtree::box(). +It calls \c rtree::envelope(). \ingroup rtree_functions @@ -1552,9 +1553,9 @@ It calls \c rtree::box(). */ template inline typename rtree::box_type const& -box(rtree const& tree) +envelope(rtree const& tree) { - return tree.box(); + return tree.envelope(); } }}} // namespace boost::geometry::index @@ -1593,13 +1594,13 @@ struct indexed_access, mi static inline coordinate_type get(index::rtree const& tree) { - return geometry::get(tree.box()); + return geometry::get(tree.envelope()); } static inline void set(index::rtree & tree, coordinate_type const& value) { - return geometry::set(tree.box(), value); + return geometry::set(tree.envelope(), value); } }; @@ -1614,13 +1615,13 @@ struct indexed_access, ma static inline coordinate_type get(index::rtree const& tree) { - return geometry::get(tree.box()); + return geometry::get(tree.envelope()); } static inline void set(index::rtree & tree, coordinate_type const& value) { - return geometry::set(tree.box(), value); + return geometry::set(tree.envelope(), value); } }; @@ -1629,4 +1630,4 @@ struct indexed_access, ma }} //namespace boost::geometry -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP +#endif // BOOST_GEOMETRY_INDEX_RTREE_HPP diff --git a/include/boost/geometry/extensions/index/translator/def.hpp b/include/boost/geometry/index/translator/def.hpp similarity index 92% rename from include/boost/geometry/extensions/index/translator/def.hpp rename to include/boost/geometry/index/translator/def.hpp index 87f238312..1ff01b4eb 100644 --- a/include/boost/geometry/extensions/index/translator/def.hpp +++ b/include/boost/geometry/index/translator/def.hpp @@ -2,16 +2,16 @@ // // Default translator // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP +#ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP +#define BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP -#include +#include namespace boost { namespace geometry { namespace index { namespace translator { @@ -150,4 +150,4 @@ struct def< boost::tuple > }}}} // namespace boost::geometry::index::translator -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP +#endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP diff --git a/include/boost/geometry/extensions/index/translator/helpers.hpp b/include/boost/geometry/index/translator/helpers.hpp similarity index 93% rename from include/boost/geometry/extensions/index/translator/helpers.hpp rename to include/boost/geometry/index/translator/helpers.hpp index c439d0405..494cfe02e 100644 --- a/include/boost/geometry/extensions/index/translator/helpers.hpp +++ b/include/boost/geometry/index/translator/helpers.hpp @@ -2,14 +2,14 @@ // // Translators helper functions // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP +#ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP +#define BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP #include @@ -21,7 +21,7 @@ #include -#include +#include namespace boost { namespace geometry { namespace index { namespace translator { @@ -191,4 +191,4 @@ struct equals< std::pair > }}}} // namespace boost::geometry::index::translator -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP +#endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP diff --git a/include/boost/geometry/extensions/index/translator/index.hpp b/include/boost/geometry/index/translator/index.hpp similarity index 83% rename from include/boost/geometry/extensions/index/translator/index.hpp rename to include/boost/geometry/index/translator/index.hpp index b49d774bb..e20d90ee6 100644 --- a/include/boost/geometry/extensions/index/translator/index.hpp +++ b/include/boost/geometry/index/translator/index.hpp @@ -2,16 +2,16 @@ // // Translator translating random-access container index value to Indexable object // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP +#ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP +#define BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP -#include +#include namespace boost { namespace geometry { namespace index { namespace translator { @@ -60,4 +60,4 @@ private: }}}} // namespace boost::geometry::index::translator -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP +#endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP diff --git a/include/boost/geometry/extensions/index/translator/translator.hpp b/include/boost/geometry/index/translator/translator.hpp similarity index 60% rename from include/boost/geometry/extensions/index/translator/translator.hpp rename to include/boost/geometry/index/translator/translator.hpp index 8caef4dab..07aa78241 100644 --- a/include/boost/geometry/extensions/index/translator/translator.hpp +++ b/include/boost/geometry/index/translator/translator.hpp @@ -1,16 +1,16 @@ // Boost.Geometry Index // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP +#ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP +#define BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP -#include -#include +#include +#include namespace boost { namespace geometry { namespace index { namespace translator { @@ -26,4 +26,4 @@ struct indexable_type }}}} // namespace boost::geometry::index::translator -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP +#endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 390409723..f1bab92bd 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -1,6 +1,6 @@ # Boost.Geometry Index # -# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +# Copyright (c) 2011-2013 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 diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index 43c9a4217..fb92b276e 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -1,6 +1,6 @@ # Boost.Geometry Index # -# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +# Copyright (c) 2011-2013 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 diff --git a/test/algorithms/content.cpp b/test/algorithms/content.cpp index 1d52cc5c2..0d8cc0818 100644 --- a/test/algorithms/content.cpp +++ b/test/algorithms/content.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -27,8 +27,8 @@ void test_large_integers() bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, double_box); - double int_value = bgi::content(int_box); - double double_value = bgi::content(double_box); + double int_value = bgi::detail::content(int_box); + double double_value = bgi::detail::content(double_box); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); } diff --git a/test/algorithms/intersection_content.cpp b/test/algorithms/intersection_content.cpp index 4692f7a6b..b53873bcd 100644 --- a/test/algorithms/intersection_content.cpp +++ b/test/algorithms/intersection_content.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -30,8 +30,8 @@ void test_large_integers() bg::read_wkt(box_li2, int_box2); bg::read_wkt(box_li2, double_box2); - double int_value = bgi::intersection_content(int_box1, int_box2); - double double_value = bgi::intersection_content(double_box1, double_box2); + double int_value = bgi::detail::intersection_content(int_box1, int_box2); + double double_value = bgi::detail::intersection_content(double_box1, double_box2); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); } diff --git a/test/algorithms/is_valid.cpp b/test/algorithms/is_valid.cpp index f2190cd7f..ff3dae0ba 100644 --- a/test/algorithms/is_valid.cpp +++ b/test/algorithms/is_valid.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -11,7 +11,7 @@ #include -#include +#include #include #include @@ -22,7 +22,7 @@ template void test(Geometry const& geometry, bool expected_value) { - bool value = bgi::is_valid(geometry); + bool value = bgi::detail::is_valid(geometry); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; @@ -63,13 +63,13 @@ void test_large_integers() bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, double_box); - BOOST_CHECK(bgi::is_valid(int_box) == bgi::is_valid(double_box)); + BOOST_CHECK(bgi::detail::is_valid(int_box) == bgi::detail::is_valid(double_box)); std::string const box_li2 = "POLYGON((1872000 528000, 1536119 192000))"; bg::read_wkt(box_li2, int_box); bg::read_wkt(box_li2, double_box); - BOOST_CHECK(bgi::is_valid(int_box) == bgi::is_valid(double_box)); + BOOST_CHECK(bgi::detail::is_valid(int_box) == bgi::detail::is_valid(double_box)); } int test_main(int, char* []) diff --git a/test/algorithms/margin.cpp b/test/algorithms/margin.cpp index fa4205897..225676f68 100644 --- a/test/algorithms/margin.cpp +++ b/test/algorithms/margin.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -27,8 +27,8 @@ void test_large_integers() bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, double_box); - double int_value = bgi::margin(int_box); - double double_value = bgi::margin(double_box); + double int_value = bgi::detail::margin(int_box); + double double_value = bgi::detail::margin(double_box); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); } diff --git a/test/algorithms/minmaxdist.cpp b/test/algorithms/minmaxdist.cpp index df770cb83..dd7e8e5e2 100644 --- a/test/algorithms/minmaxdist.cpp +++ b/test/algorithms/minmaxdist.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -11,7 +11,7 @@ #include -#include +#include #include #include @@ -23,7 +23,7 @@ template void test(Point const& pt, Indexable const& indexable, typename bg::default_distance_result::type expected_value) { - typename bg::default_distance_result::type value = bgi::minmaxdist(pt, indexable); + typename bg::default_distance_result::type value = bgi::detail::minmaxdist(pt, indexable); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; @@ -65,7 +65,7 @@ void test_large_integers() bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, double_box); - BOOST_CHECK(bgi::minmaxdist(int_pt, int_box) == bgi::minmaxdist(double_pt, double_box)); + BOOST_CHECK(bgi::detail::minmaxdist(int_pt, int_box) == bgi::detail::minmaxdist(double_pt, double_box)); } int test_main(int, char* []) diff --git a/test/algorithms/test_content.hpp b/test/algorithms/test_content.hpp index 9d880ae71..226bbcd36 100644 --- a/test/algorithms/test_content.hpp +++ b/test/algorithms/test_content.hpp @@ -1,33 +1,33 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_TEST_CONTENT_HPP #include -#include +#include //#include template void test_content(Geometry const& geometry, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { - typename bgi::default_content_result::type value = bgi::content(geometry); + typename bgi::detail::default_content_result::type value = bgi::detail::content(geometry); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename bg::coordinate_type::type).name() << " " - << typeid(typename bgi::default_content_result::type).name() + << typeid(typename bgi::detail::default_content_result::type).name() << " " << "content : " << value << std::endl; @@ -39,7 +39,7 @@ void test_content(Geometry const& geometry, template void test_geometry(std::string const& wkt, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { Geometry geometry; bg::read_wkt(wkt, geometry); diff --git a/test/algorithms/test_intersection_content.hpp b/test/algorithms/test_intersection_content.hpp index 9998e4543..5a074b7c1 100644 --- a/test/algorithms/test_intersection_content.hpp +++ b/test/algorithms/test_intersection_content.hpp @@ -1,30 +1,30 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_INTERSECTION_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_INTERSECTION_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_INTERSECTION_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_TEST_INTERSECTION_CONTENT_HPP #include -#include +#include template void test_intersection_content(Geometry const& geometry1, Geometry const& geometry2, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { - typename bgi::default_content_result::type value = bgi::intersection_content(geometry1, geometry2); + typename bgi::detail::default_content_result::type value = bgi::detail::intersection_content(geometry1, geometry2); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename bg::coordinate_type::type).name() << " " - << typeid(typename bgi::default_content_result::type).name() + << typeid(typename bgi::detail::default_content_result::type).name() << " " << "intersection_content : " << value << std::endl; @@ -36,7 +36,7 @@ void test_intersection_content(Geometry const& geometry1, Geometry const& geomet template void test_geometry(std::string const& wkt1, std::string const& wkt2, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { Geometry geometry1, geometry2; bg::read_wkt(wkt1, geometry1); diff --git a/test/algorithms/test_margin.hpp b/test/algorithms/test_margin.hpp index 2dfef3b34..7c0cb0d52 100644 --- a/test/algorithms/test_margin.hpp +++ b/test/algorithms/test_margin.hpp @@ -1,32 +1,32 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_MARGIN_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_MARGIN_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_MARGIN_HPP +#define BOOST_GEOMETRY_INDEX_TEST_MARGIN_HPP #include -#include +#include //#include template void test_margin(Geometry const& geometry, - typename bgi::default_margin_result::type expected_value) + typename bgi::detail::default_margin_result::type expected_value) { - typename bgi::default_margin_result::type value = bgi::margin(geometry); + typename bgi::detail::default_margin_result::type value = bgi::detail::margin(geometry); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename bg::coordinate_type::type).name() << " " - << typeid(typename bgi::default_margin_result::type).name() + << typeid(typename bgi::detail::default_margin_result::type).name() << " " << "content : " << value << std::endl; @@ -38,7 +38,7 @@ void test_margin(Geometry const& geometry, template void test_geometry(std::string const& wkt, - typename bgi::default_margin_result::type expected_value) + typename bgi::detail::default_margin_result::type expected_value) { Geometry geometry; bg::read_wkt(wkt, geometry); diff --git a/test/algorithms/test_union_content.hpp b/test/algorithms/test_union_content.hpp index 0310ae266..fe0268795 100644 --- a/test/algorithms/test_union_content.hpp +++ b/test/algorithms/test_union_content.hpp @@ -1,30 +1,30 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_UNION_CONTENT_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_UNION_CONTENT_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_UNION_CONTENT_HPP +#define BOOST_GEOMETRY_INDEX_TEST_UNION_CONTENT_HPP #include -#include +#include template void test_union_content(Geometry const& geometry1, Geometry const& geometry2, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { - typename bgi::default_content_result::type value = bgi::union_content(geometry1, geometry2); + typename bgi::detail::default_content_result::type value = bgi::detail::union_content(geometry1, geometry2); #ifdef GEOMETRY_TEST_DEBUG std::ostringstream out; out << typeid(typename bg::coordinate_type::type).name() << " " - << typeid(typename bgi::default_content_result::type).name() + << typeid(typename bgi::detail::default_content_result::type).name() << " " << "union_content : " << value << std::endl; @@ -36,7 +36,7 @@ void test_union_content(Geometry const& geometry1, Geometry const& geometry2, template void test_geometry(std::string const& wkt1, std::string const& wkt2, - typename bgi::default_content_result::type expected_value) + typename bgi::detail::default_content_result::type expected_value) { Geometry geometry1, geometry2; bg::read_wkt(wkt1, geometry1); diff --git a/test/algorithms/union_content.cpp b/test/algorithms/union_content.cpp index 6acac580f..4939e57ad 100644 --- a/test/algorithms/union_content.cpp +++ b/test/algorithms/union_content.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -30,8 +30,8 @@ void test_large_integers() bg::read_wkt(box_li2, int_box2); bg::read_wkt(box_li2, double_box2); - double int_value = bgi::union_content(int_box1, int_box2); - double double_value = bgi::union_content(double_box1, double_box2); + double int_value = bgi::detail::union_content(int_box1, int_box2); + double double_value = bgi::detail::union_content(double_box1, double_box2); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); } diff --git a/test/geometry_index_test_common.hpp b/test/geometry_index_test_common.hpp index 770657d48..492d48530 100644 --- a/test/geometry_index_test_common.hpp +++ b/test/geometry_index_test_common.hpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -12,7 +12,7 @@ #include #define BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE -#include +#include #include diff --git a/test/rtree/Jamfile.v2 b/test/rtree/Jamfile.v2 index 543f40c70..a99fd208d 100644 --- a/test/rtree/Jamfile.v2 +++ b/test/rtree/Jamfile.v2 @@ -1,6 +1,6 @@ # Boost.Geometry Index # -# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +# Copyright (c) 2011-2013 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 diff --git a/test/rtree/rtree_exceptions.cpp b/test/rtree/rtree_exceptions.cpp index 365dae009..85a8e130e 100644 --- a/test/rtree/rtree_exceptions.cpp +++ b/test/rtree/rtree_exceptions.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 diff --git a/test/rtree/test_rtree.hpp b/test/rtree/test_rtree.hpp index 668ab3e03..404a913fe 100644 --- a/test/rtree/test_rtree.hpp +++ b/test/rtree/test_rtree.hpp @@ -1,14 +1,14 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_RTREE_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_RTREE_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_RTREE_HPP +#define BOOST_GEOMETRY_INDEX_TEST_RTREE_HPP #include @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include //#include //#include @@ -1291,7 +1291,7 @@ struct test_geometry_algorithms<2> }; template -void test_rtree_box(Parameters const& parameters) +void test_rtree_envelope(Parameters const& parameters) { typedef bgi::rtree Tree; typedef typename Tree::box_type B; @@ -1304,15 +1304,21 @@ void test_rtree_box(Parameters const& parameters) std::vector input; B qbox; - BOOST_CHECK(bg::equals(t.box(), b)); + BOOST_CHECK(bg::equals(t.envelope(), b)); generate_rtree(t, input, qbox); BOOST_FOREACH(Value const& v, input) bg::expand(b, t.translator()(v)); - BOOST_CHECK(bg::equals(t.box(), b)); + BOOST_CHECK(bg::equals(t.envelope(), b)); + { + using namespace bg; + B temp_b; + envelope(t, temp_b); + BOOST_CHECK(equals(temp_b, b)); + } BOOST_CHECK(bg::equals(bg::return_envelope(t), b)); BOOST_CHECK(bg::equals(bg::return_centroid

                                                                                                                  (t), bg::return_centroid

                                                                                                                  (b))); test_geometry_algorithms::value>::apply(t, b); @@ -1328,21 +1334,21 @@ void test_rtree_box(Parameters const& parameters) BOOST_FOREACH(Value const& v, input) bg::expand(b, t.translator()(v)); - BOOST_CHECK(bg::equals(t.box(), b)); + BOOST_CHECK(bg::equals(t.envelope(), b)); Tree t2(t); - BOOST_CHECK(bg::equals(t2.box(), b)); + BOOST_CHECK(bg::equals(t2.envelope(), b)); t2.clear(); t2 = t; - BOOST_CHECK(bg::equals(t2.box(), b)); + BOOST_CHECK(bg::equals(t2.envelope(), b)); t2.clear(); t2 = boost::move(t); - BOOST_CHECK(bg::equals(t2.box(), b)); + BOOST_CHECK(bg::equals(t2.envelope(), b)); t.clear(); bg::assign_inverse(b); - BOOST_CHECK(bg::equals(t.box(), b)); + BOOST_CHECK(bg::equals(t.envelope(), b)); } // run all tests for one Algorithm for some number of rtrees @@ -1366,7 +1372,7 @@ void test_rtree_for_point(Parameters const& parameters = Parameters()) test_count_rtree_values(parameters); test_rtree_count(parameters); - test_rtree_box(parameters); + test_rtree_envelope(parameters); } template @@ -1386,7 +1392,7 @@ void test_rtree_for_box(Parameters const& parameters = Parameters()) test_count_rtree_values(parameters); test_rtree_count(parameters); - test_rtree_box(parameters); + test_rtree_envelope(parameters); } #endif diff --git a/test/rtree/test_rtree_exceptions.hpp b/test/rtree/test_rtree_exceptions.hpp index 138a27de8..b90f217c8 100644 --- a/test/rtree/test_rtree_exceptions.hpp +++ b/test/rtree/test_rtree_exceptions.hpp @@ -3,18 +3,18 @@ // R-tree nodes based on runtime-polymorphism, storing static-size containers // test version throwing exceptions on creation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_RTREE_EXCEPTIONS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_RTREE_EXCEPTIONS_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_RTREE_EXCEPTIONS_HPP +#define BOOST_GEOMETRY_INDEX_TEST_RTREE_EXCEPTIONS_HPP #include -#include +#include #include @@ -262,4 +262,4 @@ struct create_node< }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_RTREE_EXCEPTIONS_HPP +#endif // BOOST_GEOMETRY_INDEX_TEST_RTREE_EXCEPTIONS_HPP diff --git a/test/rtree/test_throwing.hpp b/test/rtree/test_throwing.hpp index acc9d4a7a..1dc56f1a9 100644 --- a/test/rtree/test_throwing.hpp +++ b/test/rtree/test_throwing.hpp @@ -2,14 +2,14 @@ // // Throwing objects implementation // -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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) -#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_THROWING_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_THROWING_HPP +#ifndef BOOST_GEOMETRY_INDEX_TEST_THROWING_HPP +#define BOOST_GEOMETRY_INDEX_TEST_THROWING_HPP // value @@ -141,7 +141,7 @@ struct generate_value< std::pair, throwing_value> > // //}}} // namespace boost::geometry::index -#include +#include struct throwing_static_vector_exception : public std::exception { @@ -195,4 +195,4 @@ public: } }; -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_THROWING_HPP +#endif // BOOST_GEOMETRY_INDEX_TEST_THROWING_HPP diff --git a/test/static_vector.cpp b/test/static_vector.cpp index ae54323df..03ea50e0e 100644 --- a/test/static_vector.cpp +++ b/test/static_vector.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Unit Test -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -10,9 +10,9 @@ #include #include -#include +#include -using namespace boost::geometry::index; +using namespace boost::geometry::index::detail; class value_ndc { diff --git a/tests/additional_glut_vis.cpp b/tests/additional_glut_vis.cpp index ce4c1b672..9ab8b195d 100644 --- a/tests/additional_glut_vis.cpp +++ b/tests/additional_glut_vis.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Additional tests -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -13,16 +13,16 @@ #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace bg = boost::geometry; namespace bgi = bg::index; @@ -494,8 +494,8 @@ void mouse(int button, int state, int x, int y) bgi::detail::rtree::visitors::detail::print_indexable(std::cout, b); std::cout << '\n'; - std::cout << ( bgi::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); - std::cout << ( bgi::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); + std::cout << ( bgi::detail::rtree::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); + std::cout << ( bgi::detail::rtree::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); std::cout << "\n"; search_valid = false; @@ -515,8 +515,8 @@ void mouse(int button, int state, int x, int y) bgi::detail::rtree::visitors::detail::print_indexable(std::cout, b); std::cout << '\n'; - std::cout << ( bgi::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); - std::cout << ( bgi::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); + std::cout << ( bgi::detail::rtree::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); + std::cout << ( bgi::detail::rtree::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); std::cout << "\n"; search_valid = false; @@ -558,8 +558,8 @@ void keyboard(unsigned char key, int x, int y) std::cout << '\n'; } - std::cout << ( bgi::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); - std::cout << ( bgi::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); + std::cout << ( bgi::detail::rtree::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" ); + std::cout << ( bgi::detail::rtree::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" ); std::cout << "\n"; search_valid = false; diff --git a/tests/additional_sizes_and_times.cpp b/tests/additional_sizes_and_times.cpp index 05d24995f..41bbc22c2 100644 --- a/tests/additional_sizes_and_times.cpp +++ b/tests/additional_sizes_and_times.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Additional tests -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -10,11 +10,12 @@ #include #include -#include -#include +#define BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE +#include +#include -#include -#include +#include +#include #include #include @@ -181,11 +182,11 @@ int main() } // check - if ( bgi::are_boxes_ok(t) ) + if ( bgi::detail::rtree::are_boxes_ok(t) ) std::cout << "BOXES OK\n"; else std::cout << "WRONG BOXES\n"; - if ( bgi::are_levels_ok(t) ) + if ( bgi::detail::rtree::are_levels_ok(t) ) std::cout << "LEVELS OK\n"; else std::cout << "WRONG LEVELS\n"; @@ -201,7 +202,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); + t.spatial_query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; @@ -228,7 +229,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t_copy.query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); + t_copy.spatial_query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; @@ -247,7 +248,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query(!bgi::disjoint(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); + t.spatial_query(!bgi::disjoint(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; @@ -265,7 +266,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query(B(P(x - 10, y - 10), P(x + 10, y + 10)), std::back_inserter(result)); + t.spatial_query(B(P(x - 10, y - 10), P(x + 10, y + 10)), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; @@ -283,7 +284,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query( + t.spatial_query( std::make_pair( B(P(x - 10, y - 10), P(x + 10, y + 10)), bgi::value(test_pred< std::pair >()) @@ -305,7 +306,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query( + t.spatial_query( boost::make_tuple( B(P(x - 10, y - 10), P(x + 10, y + 10)), bgi::value(test_pred< std::pair >()) @@ -355,7 +356,7 @@ int main() float x = coords[i].first + 100; float y = coords[i].second + 100; std::pair result; - temp += t.nearest(bgi::unbounded(P(x, y)), result); + temp += t.nearest_query(bgi::unbounded(P(x, y)), result); } std::cout << "time: " << tim.elapsed() << "s\n"; std::cout << "found: " << temp << "\n"; @@ -372,7 +373,7 @@ int main() float x = coords[i].first + 100; float y = coords[i].second + 100; std::vector< std::pair > result; - temp += t.nearest(P(x, y), 5, std::back_inserter(result)); + temp += t.nearest_query(P(x, y), 5, std::back_inserter(result)); } std::cout << "time: " << tim.elapsed() << "s\n"; std::cout << "found: " << temp << "\n"; @@ -397,7 +398,7 @@ int main() it != v.end(); ++it ) { - distance_type cd = bgi::comparable_distance_near(P(x, y), it->first); + distance_type cd = bgi::detail::comparable_distance_near(P(x, y), it->first); if ( cd < dist ) { @@ -428,11 +429,11 @@ int main() } // check - if ( bgi::are_boxes_ok(t) ) + if ( bgi::detail::rtree::are_boxes_ok(t) ) std::cout << "BOXES OK\n"; else std::cout << "WRONG BOXES\n"; - if ( bgi::are_levels_ok(t) ) + if ( bgi::detail::rtree::are_levels_ok(t) ) std::cout << "LEVELS OK\n"; else std::cout << "WRONG LEVELS\n"; @@ -448,7 +449,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); + t.spatial_query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; @@ -472,11 +473,11 @@ int main() } // check - if ( bgi::are_boxes_ok(t) ) + if ( bgi::detail::rtree::are_boxes_ok(t) ) std::cout << "BOXES OK\n"; else std::cout << "WRONG BOXES\n"; - if ( bgi::are_levels_ok(t) ) + if ( bgi::detail::rtree::are_levels_ok(t) ) std::cout << "LEVELS OK\n"; else std::cout << "WRONG LEVELS\n"; @@ -492,7 +493,7 @@ int main() float x = coords[i].first; float y = coords[i].second; std::deque< std::pair > result; - t.query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); + t.spatial_query(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))), std::back_inserter(result)); temp += result.size(); } std::cout << "time: " << tim.elapsed() << "s\n"; diff --git a/tests/additional_speed.cpp b/tests/additional_speed.cpp index e362fd3af..642342c13 100644 --- a/tests/additional_speed.cpp +++ b/tests/additional_speed.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Additional tests -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland. // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -10,11 +10,8 @@ #include #include -#include -#include - -#include -#include +#include +#include #include #include diff --git a/tests/main.cpp b/tests/main.cpp deleted file mode 100644 index 0fc440ff3..000000000 --- a/tests/main.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#define BOOST_TEST_MODULE test_module_boost_geometry_index -#include - -#include - -BOOST_AUTO_TEST_CASE( first_test_case ) -{ - ::srand( (unsigned)::time(NULL) ); -} - -#define TEST_PRINT_INFO - -#include -#include -#include - -#include - -BOOST_AUTO_TEST_CASE( last_test_case ) -{ - -#ifdef _MSC_VER - std::cin.get(); -#endif - -} diff --git a/tests/rtree_filters.hpp b/tests/rtree_filters.hpp deleted file mode 100644 index 6dd0c82a8..000000000 --- a/tests/rtree_filters.hpp +++ /dev/null @@ -1,70 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#ifndef TESTS_RTREE_FILTERS_HPP -#define TESTS_RTREE_FILTERS_HPP - -#include -#include - -#include -#include - -#include - -#include -#include - -//template -//void tests_rtree_filters_hpp_print_range(R const& r) -//{ -// BOOST_FOREACH(typename boost::iterator_value::type const& b, r) -// { -// float min_x = b.min_corner().template get<0>(); -// float min_y = b.min_corner().template get<1>(); -// float max_x = b.max_corner().template get<0>(); -// float max_y = b.max_corner().template get<1>(); -// std::cout << "(" << min_x << ", " << min_y << ")"; -// std::cout << 'x'; -// std::cout << "(" << max_x << ", " << max_y << ")"; -// std::cout << '\n'; -// } -// std::cout << std::endl; -//} - -BOOST_AUTO_TEST_CASE(tests_rtree_query_filter) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_filters.hpp\n"; -#endif - - typedef boost::geometry::model::point P; - typedef boost::geometry::model::box

                                                                                                                  B; - - { - namespace bgi = boost::geometry::index; - - bgi::rtree > t; - bgi::insert(t, B(P(0, 0), P(1, 1))); - bgi::insert(t, B(P(2, 2), P(3, 3))); - bgi::insert(t, B(P(4, 4), P(5, 5))); - bgi::insert(t, B(P(6, 6), P(7, 7))); - bgi::insert(t, B(P(8, 8), P(9, 9))); - - size_t n = 0; - BOOST_FOREACH(B const& b, t | bgi::query_filtered(B(P(1.5f, 1.5f), P(4.5f, 4.5f)))) - { - ++n; - } - - BOOST_CHECK(n == 2); - } -} - -#endif // TESTS_RTREE_FILTERS_HPP diff --git a/tests/rtree_function.hpp b/tests/rtree_function.hpp deleted file mode 100644 index bae08189b..000000000 --- a/tests/rtree_function.hpp +++ /dev/null @@ -1,550 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#ifndef TESTS_RTREE_FUNCTION_HPP -#define TESTS_RTREE_FUNCTION_HPP - -#include - -#include -#include -#include - -#include - -#include -#include - -#include - -namespace helpers -{ - -template -struct value_randomizer_impl_set {}; - -template -struct value_randomizer_impl_set -{ - inline static void apply( - Box & b, - typename boost::geometry::index::traits::coordinate_type::type m, - typename boost::geometry::index::traits::coordinate_type::type w) - { - namespace bg = boost::geometry; - typedef typename bg::index::traits::coordinate_type::type coord_t; - - coord_t c1 = ::rand() / coord_t(RAND_MAX / m); - coord_t c2 = ::rand() / coord_t(RAND_MAX / w); - - bg::set(b, c1 - c2); - bg::set(b, c1 + c2); - } -}; - -template -struct value_randomizer_impl_set -{ - inline static void apply( - Point & p, - typename boost::geometry::index::traits::coordinate_type::type m, - typename boost::geometry::index::traits::coordinate_type::type) - { - namespace bg = boost::geometry; - typedef typename bg::index::traits::coordinate_type::type coord_t; - - coord_t c = ::rand() / coord_t(RAND_MAX / m); - - bg::set(p, c); - } -}; - -template -struct value_randomizer_impl -{ - inline static void apply( - Indexable & i, - typename boost::geometry::index::traits::coordinate_type::type m, - typename boost::geometry::index::traits::coordinate_type::type w) - { - value_randomizer_impl::apply(i, m, w); - value_randomizer_impl_set< - Indexable, - D - 1, - typename boost::geometry::index::traits::tag::type - >::apply(i, m, w); - } -}; - -template -struct value_randomizer_impl -{ - inline static void apply( - Indexable & i, - typename boost::geometry::index::traits::coordinate_type::type m, - typename boost::geometry::index::traits::coordinate_type::type w) - { - value_randomizer_impl_set< - Indexable, - 0, - typename boost::geometry::index::traits::tag::type - >::apply(i, m, w); - } -}; - -template -struct value_randomizer -{ - typedef Indexable value_type; - - typedef typename boost::geometry::index::traits::coordinate_type::type coord_t; - - inline value_randomizer(coord_t mm, coord_t ww) - : m(mm), w(ww) - {} - - inline Indexable operator()() const - { - namespace bg = boost::geometry; - namespace bgi = bg::index; - - Indexable i; - value_randomizer_impl::value>::apply(i, m, w); - return i; - } - - coord_t m, w; -}; - -template -void random_insert(Rtree & t, Cont & c, size_t n, Randomizer r) -{ - namespace bg = boost::geometry; - namespace bgi = bg::index; - - bgi::insert_iterator ii = bgi::inserter(t); - - for ( size_t i = 0 ; i < n ; ++i ) - { - typename Randomizer::value_type v = r(); - //bgi::insert(t, v); - *ii++ = v; - c.push_back(v); - } -} - -template -bool results_compare(Cont const& c1, Cont const& c2, Translator const& tr) -{ - if ( c1.size() != c2.size() ) - return false; - - for ( typename Cont::const_iterator it = c1.begin() ; it != c1.end() ; ++it ) - { - bool found = false; - for ( typename Cont::const_iterator it2 = c2.begin() ; it2 != c2.end() ; ++it2 ) - if ( tr.equals(*it, *it2) ) - { - found = true; - break; - } - - if ( !found ) - return false; - } - - return true; -} - -template -bool nearest_results_compare(Point const& p, Cont const& c1, Cont const& c2, Translator const& tr) -{ - namespace bg = boost::geometry; - namespace bgi = boost::geometry::index; - - typedef typename bgi::translator::indexable_type::type indexable_type; - typedef bg::default_distance_result::type distance_type; - - if ( c1.size() != c2.size() ) - return false; - - if ( c1.size() == 0 && c2.size() == 0 ) - return true; - - distance_type biggest_distance1 = 0; - - for ( typename Cont::const_iterator it = c1.begin() ; it != c1.end() ; ++it ) - { - distance_type curr_distance = bgi::comparable_distance_near(p, tr(*it)); - - if ( biggest_distance1 < curr_distance ) - biggest_distance1 = curr_distance; - } - - distance_type biggest_distance2 = 0; - for ( typename Cont::const_iterator it = c2.begin() ; it != c2.end() ; ++it ) - { - distance_type curr_distance = bgi::comparable_distance_near(p, tr(*it)); - - if ( biggest_distance2 < curr_distance ) - biggest_distance2 = curr_distance; - } - - return biggest_distance1 == biggest_distance2; -} - -template -struct val_mindist_cmp -{ - val_mindist_cmp(Point const& p, Translator const& t) - : pt(p), tr(t) - {} - - template - bool operator()(Value const& v1, Value const& v2) - { - return boost::geometry::index::comparable_distance_near(pt, tr(v1)) - < boost::geometry::index::comparable_distance_near(pt, tr(v2)); - } - - Point const& pt; - Translator const& tr; -}; - -template -Box values_box(Iter first, Iter last, Translator const& tr) -{ - namespace bg = boost::geometry; - namespace bgi = bg::index; - - Box b; - bg::assign_inverse(b); - - for ( ; first != last ; ++first ) - { - bg::expand(b, tr(*first)); - } - - return b; -} - -} // namespace helpers - -template -void random_query_check(Rtree const& t, Cont const& c, size_t n, Randomizer r) -{ - namespace bg = boost::geometry; - namespace bgi = bg::index; - - for ( size_t i = 0 ; i < n ; ++i ) - { - Predicate pred = Predicate(r()); - - std::vector res1, res2; - - bgi::query(t, pred, std::back_inserter(res1)); - - for ( typename Cont::const_iterator it = c.begin() ; it != c.end() ; ++it ) - { - if ( bgi::predicates_check(pred, *it, t.translator()(*it)) ) - res2.push_back(*it); - } - - std::stringstream ss; - ss << "\nPredicate: " << typeid(Predicate).name() << "\n" - << "res1: " << res1.size() - << ", res2: " << res2.size()<< '\n'; - - BOOST_CHECK_MESSAGE( helpers::results_compare(res1, res2, t.translator()), ss.str()); - } -} - -template -void random_nearest_check( - Rtree const& t, - Cont const& c, - size_t n, - PointRandomizer const& pr, - size_t k, - PredicateRandomizer const& r) -{ - namespace bg = boost::geometry; - namespace bgi = bg::index; - - for ( size_t i = 0 ; i < n ; ++i ) - { - typename PointRandomizer::value_type pt = pr(); - Predicate pred = Predicate(r()); - - std::vector res1, res2; - - bgi::nearest(t, pt, k, pred, std::back_inserter(res1)); - - for ( typename Cont::const_iterator it = c.begin() ; it != c.end() ; ++it ) - { - if ( bgi::predicates_check(pred, *it, t.translator()(*it)) ) - res2.push_back(*it); - } - std::sort( - res2.begin(), - res2.end(), - helpers::val_mindist_cmp< - typename PointRandomizer::value_type, - typename Rtree::translator_type - >(pt, t.translator()) - ); - if ( k < res2.size() ) - res2.resize(k); - - std::stringstream ss; - ss << "\nPredicate: " << typeid(Predicate).name() << "\n" - << "res1: " << res1.size() - << ", res2: " << res2.size() << '\n'; - - BOOST_CHECK_MESSAGE(helpers::nearest_results_compare(pt, res1, res2, t.translator()), ss.str()); - } -} - -template -struct tests_rtree_function_queries {}; - -template -struct tests_rtree_function_queries -{ - template - inline static void apply(Rtree const& t, Cont const& v) - { - namespace bgi = boost::geometry::index; - - random_query_check(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - - random_nearest_check(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, bgi::empty); - random_nearest_check(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - } -}; - -template -struct tests_rtree_function_queries -{ - template - inline static void apply(Rtree const& t, Cont const& v) - { - namespace bgi = boost::geometry::index; - - random_query_check(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - random_query_check >(t, v, 5, helpers::value_randomizer(10, 5)); - - random_nearest_check(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, bgi::empty); - random_nearest_check(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - random_nearest_check >(t, v, 5, helpers::value_randomizer

                                                                                                                  (10, 0), 3, helpers::value_randomizer(10, 5)); - } -}; - -template -void tests_rtree_function(Translator const& tr = Translator()) -{ - namespace bg = boost::geometry; - namespace bgi = bg::index; - - bgi::rtree t(tr); - std::vector v; - - typedef typename bgi::rtree::indexable_type I; - typedef typename bgi::rtree::box_type B; - typedef typename bgi::traits::point_type::type P ; - - helpers::random_insert(t, v, 10, helpers::value_randomizer(10, 1)); - - bgi::rtree t_copy(t); - - BOOST_CHECK(bgi::size(t) == 10); - BOOST_CHECK(bgi::size(t) == bgi::size(t_copy)); - BOOST_CHECK(bg::equals(bgi::box(t), bgi::box(t_copy))); - - B bt = bgi::box(t); - B bv = helpers::values_box(v.begin(), v.end(), tr); - BOOST_CHECK(bg::equals(bt, bv)); - - tests_rtree_function_queries::type>::apply(t, v); - - bgi::clear(t); - BOOST_CHECK(bgi::empty(t)); - bt = bgi::box(t); - B be; - bg::assign_inverse(be); - BOOST_CHECK(bg::equals(be, bt)); - - for ( size_t i = 3 ; i < 10 ; ++i ) - bgi::remove(t_copy, v[i]); - v.erase(v.begin() + 3, v.end()); - - tests_rtree_function_queries::type>::apply(t_copy, v); -} - -BOOST_AUTO_TEST_CASE(tests_rtree_function_box3f) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_function_box3f\n"; -#endif - - namespace bg = boost::geometry; - namespace bgi = bg::index; - - typedef bg::model::point P; - typedef bg::model::box

                                                                                                                  B; - typedef B V; - - tests_rtree_function< V, bgi::linear<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::quadratic<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::rstar<4, 2>, bgi::translator::def >(); -} - -BOOST_AUTO_TEST_CASE(tests_rtree_function_box2f) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_function_box2f\n"; -#endif - - namespace bg = boost::geometry; - namespace bgi = bg::index; - - typedef bg::model::point P; - typedef bg::model::box

                                                                                                                  B; - typedef B V; - - tests_rtree_function< V, bgi::linear<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::quadratic<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::rstar<4, 2>, bgi::translator::def >(); -} - -BOOST_AUTO_TEST_CASE(tests_rtree_function_point2f) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_function_point2f\n"; -#endif - - namespace bg = boost::geometry; - namespace bgi = bg::index; - - typedef bg::model::point P; - typedef P V; - - tests_rtree_function< V, bgi::linear<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::quadratic<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::rstar<4, 2>, bgi::translator::def >(); -} - -namespace helpers { - -template -struct value_randomizer< std::pair > -{ - typedef std::pair value_type; - - typedef typename boost::geometry::index::traits::coordinate_type::type coord_t; - - inline value_randomizer(coord_t mm, coord_t ww) - : r(mm, ww) - {} - - inline value_type operator()() const - { - return std::make_pair(r(), ::rand()); - } - - value_randomizer r; -}; - -} // namespace helpers - -BOOST_AUTO_TEST_CASE(tests_rtree_function_pair_box2f_int) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_function_pair_box2f_int\n"; -#endif - - namespace bg = boost::geometry; - namespace bgi = bg::index; - - typedef bg::model::point P; - typedef bg::model::box

                                                                                                                  B; - typedef std::pair V; - - tests_rtree_function< V, bgi::linear<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::quadratic<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::rstar<4, 2>, bgi::translator::def >(); -} - -namespace helpers { - -template -struct value_randomizer< boost::shared_ptr< std::pair > > -{ - typedef boost::shared_ptr< std::pair > value_type; - - typedef typename boost::geometry::index::traits::coordinate_type::type coord_t; - - inline value_randomizer(coord_t mm, coord_t ww) - : r(mm, ww) - {} - - inline value_type operator()() const - { - return value_type(new std::pair(r(), ::rand())); - } - - value_randomizer r; -}; - -} // namespace helpers - -BOOST_AUTO_TEST_CASE(tests_rtree_function_shared_ptr_pair_box2f_int) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/rtree_function_shared_ptr_pair_box2f_int\n"; -#endif - - namespace bg = boost::geometry; - namespace bgi = bg::index; - - typedef bg::model::point P; - typedef bg::model::box

                                                                                                                  B; - typedef boost::shared_ptr< std::pair > V; - - tests_rtree_function< V, bgi::linear<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::quadratic<4, 2>, bgi::translator::def >(); - tests_rtree_function< V, bgi::rstar<4, 2>, bgi::translator::def >(); -} - -#endif // TESTS_RTREE_FUNCTION_HPP diff --git a/tests/rtree_test_generator.cpp b/tests/rtree_test_generator.cpp index 4c68a5816..f5e861277 100644 --- a/tests/rtree_test_generator.cpp +++ b/tests/rtree_test_generator.cpp @@ -1,7 +1,7 @@ // Boost.Geometry Index // Rtree tests generator -// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2013 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 @@ -61,7 +61,7 @@ int main() "// Boost.Geometry Index\n" << "// Unit Test\n" << "\n" << - "// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.\n" << + "// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.\n" << "\n" << "// Use, modification and distribution is subject to the Boost Software License,\n" << "// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at\n" << @@ -99,7 +99,7 @@ int main() f << "# Boost.Geometry Index\n" << "#\n" << - "# Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland.\n" << + "# Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.\n" << "#\n" << "# Use, modification and distribution is subject to the Boost Software License,\n" << "# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at\n" << diff --git a/tests/static_vector.cpp b/tests/static_vector.cpp deleted file mode 100644 index c3bce7ace..000000000 --- a/tests/static_vector.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#include - -#include - -struct A -{ - A() : v(0) { std::cout << "A()" << std::endl; } - A(int i) : v(i) { std::cout << "A(" << i << ")" << std::endl; } - ~A() { std::cout << "~A" << v << "()" << std::endl; } - A(A const& a) { std::cout << "A(A(" << a.v << "))" << std::endl; v = a.v; } - A & operator=(A const& a) { std::cout << "A" << v << " = A" << a.v << std::endl; v = a.v; return *this; } - int v; -}; - -int main() -{ - namespace bgi = boost::geometry::index; - - bgi::static_vector sv; - std::cout << "resize(2)" << std::endl; - sv.resize(2); // 0 0 - std::cout << "push_back(A(22))" << std::endl; - sv.push_back(A(22)); // 0 0 22 - std::cout << "push_back(A(23))" << std::endl; - sv.push_back(A(23)); // 0 0 22 23 - std::cout << "pop_back()" << std::endl; - sv.pop_back(); // 0 0 22 - sv.front().v = 10; // 10 0 22 - sv.back().v = 100; // 10 0 100 - sv[1].v = 50; // 10 50 100 - std::cout << "resize(1)" << std::endl; - sv.resize(1); // 10 - std::cout << "~static_vector()" << std::endl; - return 0; -} diff --git a/tests/t1.cpp b/tests/t1.cpp deleted file mode 100644 index 2bb455e62..000000000 --- a/tests/t1.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#include -#include - -#include - -namespace bg = boost::geometry; -namespace bgi = bg::index; - -typedef bg::model::point P; -typedef bg::model::box

                                                                                                                  B; -typedef bgi::rtree< - B, - bgi::linear<4, 2> -> RTB; -typedef bgi::rtree< - P, - bgi::linear<4, 2> -> RTP; - -int main() -{ - RTB rtb; - rtb.insert(B(P(0,0),P(1,1))); - rtb.insert(B(P(1,0),P(2,1))); - rtb.insert(B(P(2,0),P(3,1))); - rtb.insert(B(P(2,2),P(3,3))); - rtb.insert(B(P(4,4),P(5,5))); - - std::vector res; - B bb = rtb.box(); - rtb.query(bb, std::back_inserter(res)); - - RTP rtp; - rtp.insert(P(0,0)); - rtp.insert(P(1,0)); - rtp.insert(P(2,0)); - rtp.insert(P(2,2)); - rtp.insert(P(4,4)); - - std::vector

                                                                                                                  resp; - B bp = rtp.box(); - rtp.query(bp, std::back_inserter(resp)); - - int a = 10; -} diff --git a/tests/t2.cpp b/tests/t2.cpp deleted file mode 100644 index ab888fbca..000000000 --- a/tests/t2.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#include -#include - -#include -#include - -#include - - -typedef boost::geometry::model::point - BGCartesianPoint; -typedef boost::geometry::model::box - BGCartesianBox; -typedef boost::geometry::model::segment - BGCartesianSegment; -namespace bgi = boost::geometry::index; - - -struct myTranslator -{ - typedef BGCartesianBox result_type; - - result_type operator()(BGCartesianPoint const& seg) const - { - result_type envelope; - boost::geometry::envelope(seg, envelope); - return envelope; - } - - bool equals(BGCartesianPoint const& go1, BGCartesianPoint const& go2) const - { - return (go1.get<0>() == go2.get<0>()) && - (go1.get<1>() == go2.get<1>()); - } -}; - -typedef bgi::rtree - , - myTranslator> - BGRTree; - -int main() -{ - BGRTree rTree; - for (int i = 0; i < 50; ++i) - { - BGCartesianPoint p(i, i); - rTree.insert(p); - - BGCartesianBox envelope(BGCartesianPoint(i-0.5, i-0.5), - BGCartesianPoint(i+0.5, i+0.5)); - - std::deque dq; - - if (rTree.query(envelope, std::back_inserter(dq))) - std::cout << "Retrieved inserted object nr. " << i << "\n"; - else - std::cout << "Could not retrieve inserted object nr. " << i << "\n"; - } - - std::cout << "Total objects: " << rTree.size(); - std::cin.get(); - return 0; -} diff --git a/tests/translators.hpp b/tests/translators.hpp deleted file mode 100644 index dda074baf..000000000 --- a/tests/translators.hpp +++ /dev/null @@ -1,109 +0,0 @@ -// Boost.Geometry Index -// Additional tests - -// 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) - -#ifndef TESTS_TRANSLATORS_HPP -#define TESTS_TRANSLATORS_HPP - -#include -#include - -#include - -#include -#include - -#include -#include - -template -struct tests_translators_val -{ - tests_translators_val(Indexable const& ii) - : i(ii) - {} - - Indexable const& get_box() const - { - return i; - } - - bool operator==(tests_translators_val const& v2) - { - return boost::geometry::equals(i, v2.i); - } - - Indexable i; -}; - -BOOST_AUTO_TEST_CASE(tests_translators) -{ -#ifdef TEST_PRINT_INFO - std::cout << "tests/translators\n"; -#endif - - namespace bg = boost::geometry; - namespace bgm = bg::model; - namespace bgi = bg::index; - namespace bgit = bgi::translator; - - typedef bgm::point P; - typedef bgm::box

                                                                                                                  B; - - bgit::def< P > p; - bgit::def< P* > pp; - bgit::def< std::pair* > ppip; - bgit::def< boost::shared_ptr

                                                                                                                  > sp; - bgit::def< std::vector

                                                                                                                  ::iterator > ip; - bgit::def< std::map::iterator > mip; - bgit::def< std::pair > pip; - bgit::def< boost::shared_ptr< std::pair > > spip; - bgit::def< boost::shared_ptr< std::pair > > sppi; - bgit::def< boost::scoped_ptr< std::pair > > scppi; - bgit::def< boost::scoped_ptr< std::pair > > scpip; - - P tmp_p(2, 3); - boost::shared_ptr

                                                                                                                  tmp_sp(new P(2, 3)); - std::vector

                                                                                                                  tmp_v(1, P(2, 3)); - std::map tmp_m; - tmp_m.insert(std::pair(0, P(2, 3))); - std::pair tmp_pip(0, P(2, 3)); - boost::shared_ptr< std::pair > tmp_spip(new std::pair(0, P(2, 3))); - boost::shared_ptr< std::pair > tmp_sppi(new std::pair(P(2, 3), 0)); - boost::scoped_ptr< std::pair > tmp_scpip(new std::pair(0, P(2, 3))); - boost::scoped_ptr< std::pair > tmp_scppi(new std::pair(P(2, 3), 0)); - - BOOST_CHECK( bg::equals(tmp_p, p(tmp_p)) ); - BOOST_CHECK( bg::equals(tmp_p, pp(&tmp_p)) ); - BOOST_CHECK( bg::equals(tmp_p, ppip(&tmp_pip)) ); - BOOST_CHECK( bg::equals(tmp_p, sp(tmp_sp)) ); - BOOST_CHECK( bg::equals(tmp_p, ip(tmp_v.begin())) ); - BOOST_CHECK( bg::equals(tmp_p, mip(tmp_m.begin())) ); - BOOST_CHECK( bg::equals(tmp_p, pip(tmp_pip)) ); - BOOST_CHECK( bg::equals(tmp_p, spip(tmp_spip)) ); - BOOST_CHECK( bg::equals(tmp_p, sppi(tmp_sppi)) ); - BOOST_CHECK( bg::equals(tmp_p, scpip(tmp_scpip)) ); - BOOST_CHECK( bg::equals(tmp_p, scppi(tmp_scppi)) ); - - //bgit::def d; // error - //bgit::def< bgm::segment

                                                                                                                  > d; // error - - B tmp_b(P(2, 3), P(4, 5)); - std::pair, B> tmp_ppb = - std::make_pair(bgm::polygon

                                                                                                                  (), tmp_b); - std::pair > tmp_pbp = - std::make_pair(tmp_b, bgm::polygon

                                                                                                                  ()); - - bgit::def< std::pair, B> > ppb; - bgit::def< std::pair > > pbp; - - BOOST_CHECK( bg::equals(tmp_b, ppb(tmp_ppb)) ); - BOOST_CHECK( bg::equals(tmp_b, pbp(tmp_pbp)) ); -} - -#endif // TESTS_TRANSLATORS_HPP