boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-12 14:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

boost/geometry/extensions/index/* moved to boost/geometry/index/*

Browse Source 
rtree::box() renamed to rtree::envelope()
index::box() renamed to index::envelope()
some unneeded tests removed
docs updated

[SVN r82546]
This commit is contained in:
Adam Wulkiewicz 2013-01-19 02:26:34 +00:00
parent 4233d851c4
commit 26e9526564
120 changed files with 1286 additions and 1980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/Doxyfile
View File

@ -666,10 +666,9 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = ../boost/geometry/extensions/index/ \ INPUT = ../boost/geometry/index/ \
../boost/geometry/extensions/index/rtree \ ../boost/geometry/index/adaptors \
../boost/geometry/extensions/index/adaptors \ ../boost/geometry/index/translator
../boost/geometry/extensions/index/translator
# This tag can be used to specify the character encoding of the source files # 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 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

104
doc/generated/rtree.qbk
View File

@ -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<Indexable, T>`] and [^`boost::tuple<Indexable, ...>`]. For example, if [^`std::pair<Box, int>`] is stored in the container, the default translator translates from [^`std::pair<Box, int> const&`] to [^`Box const&`]. 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<Indexable, T>`] and [^`boost::tuple<Indexable, ...>`]. For example, if [^`std::pair<Box, int>`] is stored in the container, the default translator translates from [^`std::pair<Box, int> const&`] to [^`Box const&`].
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/rtree.hpp>` `#include <boost/geometry/index/rtree.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [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_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_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_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] [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)] [heading Member(s)]
[table [table
[[Function][Description]] [[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_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_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_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_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_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_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_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_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_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. ]] [[ `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. ]]
[[[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_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. ]] [[ `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. ]]
[[[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_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. ]] [[ `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. ]]
[[[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_1a89561a834563f2ed6fc782bad16143fd `size()`]][Returns the number of stored values. ]]
[[[link classboost_1_1geometry_1_1index_1_1rtree_1ae889567443b0ba0dbdb975564c55804c `empty()`]][Query if the container is empty. ]] [[ `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. ]] [[][[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. ]] [[ `const`][[link classboost_1_1geometry_1_1index_1_1rtree_1a131c273b6fc7e1c6d62cc5ebd015e77e `envelope()`]][Returns the box able to contain 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. ]] [[ `const`][[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. ]] [[ `const`][[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. ]] [[ `const`][[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. ]] [[ `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] [#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]]`()``)` `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 [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[[^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]]][ `parameters` ][The parameters object. ]] [[[^[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]]`()``)` [^[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 [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`Range const &`][ `rng` ][The range of Values. ]] [[`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``)` [^[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 [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`Predicates const &`][ `pred` ][The spatial predicates or a Geometry. ]] [[`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``)` [^[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 [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point.]] [[`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``)` [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9979db9ef37591985256cb8ad31862bb value_type]]` &` `v``)`
] ]
[heading Parameter(s)] [heading Modifier(s)]
``const ``[heading Parameter(s)]
[table [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point. ]] [[`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``)` `OutIter` `out_it``)`
] ]
[heading Parameter(s)] [heading Modifier(s)]
``const ``[heading Parameter(s)]
[table [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point. ]] [[`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``)` `OutIter` `out_it``)`
] ]
[heading Parameter(s)] [heading Modifier(s)]
``const ``[heading Parameter(s)]
[table [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`DistancesPredicates const &`][ `dpred` ][The distances predicates or a Point ]] [[`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``()` [^[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. The number of stored values.
[heading Throws] [heading Throws]
Nothing. Nothing.
@ -911,7 +919,8 @@ Query if the container is empty.
`bool` `empty``()` `bool` `empty``()`
] ]
[heading Returns] [heading Modifier(s)]
``const ``[heading Returns]
true if the container is empty. true if the container is empty.
[heading Throws] [heading Throws]
Nothing. Nothing.
@ -933,19 +942,20 @@ Nothing.
[endsect] [endsect]
[#classboost_1_1geometry_1_1index_1_1rtree_1ad534a6ed759677548f50b86dfeba07c6] [#classboost_1_1geometry_1_1index_1_1rtree_1a131c273b6fc7e1c6d62cc5ebd015e77e]
[section box()] [section envelope()]
Returns the box containing all values stored in the container. Returns the box able to contain all values stored in the container.
[heading Description] [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 [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] [heading Modifier(s)]
The box containing all values stored in the container or an invalid box if there are no values in the container. ``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] [heading Throws]
Nothing. 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``)` [^[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 [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`ValueOrIndexable const &`][ `vori` ][The value or indexable which will be counted.]] [[`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``()` [^[link classboost_1_1geometry_1_1index_1_1rtree_1af85d4e399a807b3e4e46d38a0b4ffc5a parameters_type]]` const &` `parameters``()`
] ]
[heading Returns] [heading Modifier(s)]
``const ``[heading Returns]
The parameters object. The parameters object.
[heading Throws] [heading Throws]
Nothing. Nothing.
@ -1001,7 +1013,8 @@ Returns the translator object.
[^[link classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91 translator_type]]` const &` `translator``()` [^[link classboost_1_1geometry_1_1index_1_1rtree_1adbc30a1fa986e2e856e0662111ac2d91 translator_type]]` const &` `translator``()`
] ]
[heading Returns] [heading Modifier(s)]
``const ``[heading Returns]
The translator object. The translator object.
[heading Throws] [heading Throws]
Nothing. Nothing.
@ -1018,7 +1031,8 @@ Returns allocator used by the rtree.
[^[link classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d allocator_type]] `get_allocator``()` [^[link classboost_1_1geometry_1_1index_1_1rtree_1a9d35bc38fa697c6f600548fb5b38807d allocator_type]] `get_allocator``()`
] ]
[heading Returns] [heading Modifier(s)]
``const ``[heading Returns]
The allocator. The allocator.
[heading Throws] [heading Throws]
If allocator copy constructor throws. If allocator copy constructor throws.

10
doc/generated/rtree_functions.qbk
View File

@ -18,7 +18,7 @@
[[[link group__rtree__functions_1ga0c65d7b29b1edf72f1d236ccf211f63c `clear(rtree<...> &)`]][Remove all values from the index. ]] [[[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_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_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] [#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. true if there are no values in the index.
[endsect] [endsect]
[#group__rtree__functions_1gad039bb35d79bded11a1454601f6eed3a] [#group__rtree__functions_1ga73a9002187db81c57c71f9ec204d57e4]
[section box(rtree<...> const &)] [section envelope(rtree<...> const &)]
Get the box containing all stored values or an invalid box if the index has no values. Get the box containing all stored values or an invalid box if the index has no values.
[heading Description] [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 [pre
`template<``typename Value``,` `template<``typename Value``,`
`typename Options``,` `typename Options``,`
`typename Translator``,` `typename Translator``,`
`typename Allocator``>` `typename Allocator``>`
`rtree<Value, Options, Translator, Allocator>::box_type const& boost::geometry::index::box``(``rtree< Value, Options, Translator, Allocator > const &` `tree``)` `rtree<Value, Options, Translator, Allocator>::box_type const& boost::geometry::index::envelope``(``rtree< Value, Options, Translator, Allocator > const &` `tree``)`
] ]
[heading Parameter(s)] [heading Parameter(s)]

2
doc/generated/rtree_linear.qbk
View File

@ -7,7 +7,7 @@
Linear r-tree creation algorithm parameters. Linear r-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/rtree_quadratic.qbk
View File

@ -7,7 +7,7 @@
Quadratic r-tree creation algorithm parameters. Quadratic r-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/rtree_rstar.qbk
View File

@ -7,7 +7,7 @@
R*-tree creation algorithm parameters. R*-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/rtree_runtime_linear.qbk
View File

@ -7,7 +7,7 @@
Linear r-tree creation algorithm parameters. Linear r-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/rtree_runtime_quadratic.qbk
View File

@ -7,7 +7,7 @@
Quadratic r-tree creation algorithm parameters. Quadratic r-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/rtree_runtime_rstar.qbk
View File

@ -7,7 +7,7 @@
R*-tree creation algorithm parameters. R*-tree creation algorithm parameters.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/parameters.hpp>` `#include <boost/geometry/index/parameters.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

2
doc/generated/translator_def.qbk
View File

@ -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<Indexable, Second> and boost::tuple<Indexable, ...>. It translates Value object to Indexable object. The default version handles Values which are Indexables. This translator is also specialized for std::pair<Indexable, Second> and boost::tuple<Indexable, ...>.
[heading Header] [heading Header]
`#include <boost/geometry/extensions/index/translator/def.hpp>` `#include <boost/geometry/index/translator/def.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre

5
doc/generated/translator_index.qbk
View File

@ -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. 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] [heading Header]
`#include <boost/geometry/extensions/index/translator/index.hpp>` `#include <boost/geometry/index/translator/index.hpp>`
[heading Synopsis] [heading Synopsis]
[pre [pre
@ -43,7 +43,8 @@ The constructor.
`index``(``Container const &` `c``)` `index``(``Container const &` `c``)`
] ]
[heading Parameter(s)] [heading Modifier(s)]
``explicit ``[heading Parameter(s)]
[table [table
[[Type][Name][Description]] [[Type][Name][Description]]
[[`Container const &`][ `c` ][The container which stores indexed values. ]] [[`Container const &`][ `c` ][The container which stores indexed values. ]]

2
doc/html/geometry_index/introduction.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Introduction</title> <title>Introduction</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index">

2
doc/html/geometry_index/r_tree.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>R-tree</title> <title>R-tree</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="prev" href="introduction.html" title="Introduction"> <link rel="prev" href="introduction.html" title="Introduction">

10
doc/html/geometry_index/r_tree/creation_and_modification.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Creation and modification</title> <title>Creation and modification</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree"> <link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="rtree_quickstart.html" title="Quick Start"> <link rel="prev" href="rtree_quickstart.html" title="Quick Start">
@ -55,7 +55,7 @@
</p> </p>
<pre class="programlisting"><span class="identifier">rtree</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">,</span> <span class="identifier">Parameters</span><span class="special">,</span> <span class="identifier">Translator</span> <span class="special">=</span> <span class="identifier">translator</span><span class="special">::</span><span class="identifier">def</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">&gt;,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">allocator</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">&gt;</span> <span class="special">&gt;</span> <pre class="programlisting"><span class="identifier">rtree</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">,</span> <span class="identifier">Parameters</span><span class="special">,</span> <span class="identifier">Translator</span> <span class="special">=</span> <span class="identifier">translator</span><span class="special">::</span><span class="identifier">def</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">&gt;,</span> <span class="identifier">Allocator</span><span class="special">&gt;</span> <span class="special">=</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">allocator</span><span class="special">&lt;</span><span class="identifier">Value</span><span class="special">&gt;</span> <span class="special">&gt;</span>
</pre> </pre>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"> <li class="listitem">
<code class="computeroutput">Value</code> - type of object which will be stored in the container, <code class="computeroutput">Value</code> - type of object which will be stored in the container,
</li> </li>
@ -90,7 +90,7 @@
be handled by the default <code class="computeroutput">Translator</code> - <code class="computeroutput"><span class="identifier">index</span><span class="special">::</span><span class="identifier">translator</span><span class="special">::</span><span class="identifier">def</span><span class="special">&lt;</span>Value<span class="special">&gt;</span></code> be handled by the default <code class="computeroutput">Translator</code> - <code class="computeroutput"><span class="identifier">index</span><span class="special">::</span><span class="identifier">translator</span><span class="special">::</span><span class="identifier">def</span><span class="special">&lt;</span>Value<span class="special">&gt;</span></code>
are defined as follows: are defined as follows:
</p> </p>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"> <li class="listitem">
<code class="computeroutput">Indexable <span class="special">=</span> <a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a> <code class="computeroutput">Indexable <span class="special">=</span> <a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a>
<span class="special">|</span> <a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a></code> <span class="special">|</span> <a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a></code>
@ -116,7 +116,7 @@
A <code class="computeroutput">Translator</code> is a type which knows how to handle <code class="computeroutput">Value</code>s. A <code class="computeroutput">Translator</code> is a type which knows how to handle <code class="computeroutput">Value</code>s.
It has two purposes: It has two purposes:
</p> </p>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"> <li class="listitem">
it translates <code class="computeroutput">Value</code> to a more suitable <code class="computeroutput">Indexable</code> it translates <code class="computeroutput">Value</code> to a more suitable <code class="computeroutput">Indexable</code>
type which is needed by most of operations, type which is needed by most of operations,
@ -134,7 +134,7 @@
<p> <p>
If comparison of two <code class="computeroutput">Value</code>s is required, the default translator: If comparison of two <code class="computeroutput">Value</code>s is required, the default translator:
</p> </p>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"> <li class="listitem">
for <code class="computeroutput"><a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a></code> for <code class="computeroutput"><a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_point.html" target="_top">Point</a></code>
and <code class="computeroutput"><a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a></code> and <code class="computeroutput"><a href="http://www.boost.org/libs/geometry/doc/html/geometry/reference/concepts/concept_box.html" target="_top">Box</a></code>

26
doc/html/geometry_index/r_tree/introduction.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Introduction</title> <title>Introduction</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree"> <link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="../r_tree.html" title="R-tree"> <link rel="prev" href="../r_tree.html" title="R-tree">
@ -28,10 +28,10 @@
</h3></div></div></div> </h3></div></div></div>
<p> <p>
R-tree is a tree data structure used for spatial searching. It was proposed R-tree is a tree data structure used for spatial searching. It was proposed
by Antonin Guttman in 1984 <sup>[<a name="geometry_index.r_tree.introduction.f0" href="#ftn.geometry_index.r_tree.introduction.f0" class="footnote">1</a>]</sup> as an expansion of B-tree for multi-dimensional data. It may by Antonin Guttman in 1984 <a href="#ftn.geometry_index.r_tree.introduction.f0" class="footnote"><sup class="footnote"><a name="geometry_index.r_tree.introduction.f0"></a>[1]</sup></a> 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 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 query later. This query may return objects that are inside some area or are
close to some point in space <sup>[<a name="geometry_index.r_tree.introduction.f1" href="#ftn.geometry_index.r_tree.introduction.f1" class="footnote">2</a>]</sup>. close to some point in space <a href="#ftn.geometry_index.r_tree.introduction.f1" class="footnote"><sup class="footnote"><a name="geometry_index.r_tree.introduction.f1"></a>[2]</sup></a>.
</p> </p>
<p> <p>
The R-tree structure is presented on the image below. Each R-tree's node The R-tree structure is presented on the image below. Each R-tree's node
@ -51,7 +51,7 @@
</p> </p>
<p> <p>
The R-tree is a self-balanced data structure. The key part of balancing algorithm The R-tree is a self-balanced data structure. The key part of balancing algorithm
is node splitting algorithm <sup>[<a name="geometry_index.r_tree.introduction.f2" href="#ftn.geometry_index.r_tree.introduction.f2" class="footnote">3</a>]</sup> <sup>[<a name="geometry_index.r_tree.introduction.f3" href="#ftn.geometry_index.r_tree.introduction.f3" class="footnote">4</a>]</sup>. Each algorithm produces different splits so the internal structure is node splitting algorithm <a href="#ftn.geometry_index.r_tree.introduction.f2" class="footnote"><sup class="footnote"><a name="geometry_index.r_tree.introduction.f2"></a>[3]</sup></a> <a href="#ftn.geometry_index.r_tree.introduction.f3" class="footnote"><sup class="footnote"><a name="geometry_index.r_tree.introduction.f3"></a>[4]</sup></a>. Each algorithm produces different splits so the internal structure
of a tree may be different for each one of them. In general more complex of a tree may be different for each one of them. In general more complex
algorithms analyses elements better and produces less overlapping nodes. algorithms analyses elements better and produces less overlapping nodes.
In the searching process less nodes must be traversed in order to find desired In the searching process less nodes must be traversed in order to find desired
@ -179,13 +179,13 @@
</table></div> </table></div>
<h5> <h5>
<a name="geometry_index.r_tree.introduction.h0"></a> <a name="geometry_index.r_tree.introduction.h0"></a>
<span><a name="geometry_index.r_tree.introduction.implementation_details"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.implementation_details">Implementation <span class="phrase"><a name="geometry_index.r_tree.introduction.implementation_details"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.implementation_details">Implementation
details</a> details</a>
</h5> </h5>
<p> <p>
Key features of this implementation of the R-tree are: Key features of this implementation of the R-tree are:
</p> </p>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem"> <li class="listitem">
capable to store arbitrary Value type, capable to store arbitrary Value type,
</li> </li>
@ -207,7 +207,7 @@
</ul></div> </ul></div>
<h5> <h5>
<a name="geometry_index.r_tree.introduction.h1"></a> <a name="geometry_index.r_tree.introduction.h1"></a>
<span><a name="geometry_index.r_tree.introduction.contributors"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.contributors">Contributors</a> <span class="phrase"><a name="geometry_index.r_tree.introduction.contributors"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.contributors">Contributors</a>
</h5> </h5>
<p> <p>
The spatial index was originally started by Federico J. Fernandez during The spatial index was originally started by Federico J. Fernandez during
@ -215,7 +215,7 @@
</p> </p>
<h5> <h5>
<a name="geometry_index.r_tree.introduction.h2"></a> <a name="geometry_index.r_tree.introduction.h2"></a>
<span><a name="geometry_index.r_tree.introduction.spatial_thanks"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.spatial_thanks">Spatial <span class="phrase"><a name="geometry_index.r_tree.introduction.spatial_thanks"></a></span><a class="link" href="introduction.html#geometry_index.r_tree.introduction.spatial_thanks">Spatial
thanks</a> thanks</a>
</h5> </h5>
<p> <p>
@ -224,20 +224,20 @@
list for their help. list for their help.
</p> </p>
<div class="footnotes"> <div class="footnotes">
<br><hr width="100" align="left"> <br><hr style="width:100; align:left;">
<div class="footnote"><p><sup>[<a id="ftn.geometry_index.r_tree.introduction.f0" href="#geometry_index.r_tree.introduction.f0" class="para">1</a>] </sup> <div id="ftn.geometry_index.r_tree.introduction.f0" class="footnote"><p><a href="#geometry_index.r_tree.introduction.f0" class="para"><sup class="para">[1] </sup></a>
Guttman, A. (1984). <span class="emphasis"><em>R-Trees: A Dynamic Index Structure for Spatial Guttman, A. (1984). <span class="emphasis"><em>R-Trees: A Dynamic Index Structure for Spatial
Searching</em></span> Searching</em></span>
</p></div> </p></div>
<div class="footnote"><p><sup>[<a id="ftn.geometry_index.r_tree.introduction.f1" href="#geometry_index.r_tree.introduction.f1" class="para">2</a>] </sup> <div id="ftn.geometry_index.r_tree.introduction.f1" class="footnote"><p><a href="#geometry_index.r_tree.introduction.f1" class="para"><sup class="para">[2] </sup></a>
Cheung, K.; Fu, A. (1998). <span class="emphasis"><em>Enhanced Nearest Neighbour Search Cheung, K.; Fu, A. (1998). <span class="emphasis"><em>Enhanced Nearest Neighbour Search
on the R-tree</em></span> on the R-tree</em></span>
</p></div> </p></div>
<div class="footnote"><p><sup>[<a id="ftn.geometry_index.r_tree.introduction.f2" href="#geometry_index.r_tree.introduction.f2" class="para">3</a>] </sup> <div id="ftn.geometry_index.r_tree.introduction.f2" class="footnote"><p><a href="#geometry_index.r_tree.introduction.f2" class="para"><sup class="para">[3] </sup></a>
Greene, D. (1989). <span class="emphasis"><em>An implementation and performance analysis Greene, D. (1989). <span class="emphasis"><em>An implementation and performance analysis
of spatial data access methods</em></span> of spatial data access methods</em></span>
</p></div> </p></div>
<div class="footnote"><p><sup>[<a id="ftn.geometry_index.r_tree.introduction.f3" href="#geometry_index.r_tree.introduction.f3" class="para">4</a>] </sup> <div id="ftn.geometry_index.r_tree.introduction.f3" class="footnote"><p><a href="#geometry_index.r_tree.introduction.f3" class="para"><sup class="para">[4] </sup></a>
Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990). <span class="emphasis"><em>The Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990). <span class="emphasis"><em>The
R*-tree: an efficient and robust access method for points and rectangles</em></span> R*-tree: an efficient and robust access method for points and rectangles</em></span>
</p></div> </p></div>

2
doc/html/geometry_index/r_tree/nearest_neighbours_queries.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Nearest neighbours queries</title> <title>Nearest neighbours queries</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree"> <link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="spatial_queries.html" title="Spatial queries"> <link rel="prev" href="spatial_queries.html" title="Spatial queries">

971
doc/html/geometry_index/r_tree/reference.html
View File

File diff suppressed because it is too large Load Diff

4
doc/html/geometry_index/r_tree/rtree_quickstart.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Quick Start</title> <title>Quick Start</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree"> <link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="introduction.html" title="Introduction"> <link rel="prev" href="introduction.html" title="Introduction">
@ -150,7 +150,7 @@
</p> </p>
<h4> <h4>
<a name="geometry_index.r_tree.rtree_quickstart.h0"></a> <a name="geometry_index.r_tree.rtree_quickstart.h0"></a>
<span><a name="geometry_index.r_tree.rtree_quickstart.more"></a></span><a class="link" href="rtree_quickstart.html#geometry_index.r_tree.rtree_quickstart.more">More</a> <span class="phrase"><a name="geometry_index.r_tree.rtree_quickstart.more"></a></span><a class="link" href="rtree_quickstart.html#geometry_index.r_tree.rtree_quickstart.more">More</a>
</h4> </h4>
<p> <p>
More information about the R-tree implementation, other algorithms and queries More information about the R-tree implementation, other algorithms and queries

2
doc/html/geometry_index/r_tree/spatial_queries.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Spatial queries</title> <title>Spatial queries</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="up" href="../r_tree.html" title="R-tree"> <link rel="up" href="../r_tree.html" title="R-tree">
<link rel="prev" href="creation_and_modification.html" title="Creation and modification"> <link rel="prev" href="creation_and_modification.html" title="Creation and modification">

4
doc/html/index.html
View File

@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Chapter&#160;1.&#160;Geometry Index</title> <title>Chapter&#160;1.&#160;Geometry Index</title>
<link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css"> <link rel="stylesheet" href="http://www.boost.org/doc/libs/release/doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="index.html" title="Chapter&#160;1.&#160;Geometry Index"> <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Geometry Index">
<link rel="next" href="geometry_index/introduction.html" title="Introduction"> <link rel="next" href="geometry_index/introduction.html" title="Introduction">
</head> </head>
@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr> <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: January 18, 2013 at 20:09:35 GMT</small></p></td> <td align="left"><p><small>Last revised: January 19, 2013 at 02:20:46 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td> <td align="right"><div class="copyright-footer"></div></td>
</tr></table> </tr></table>
<hr> <hr>

16
include/boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp
View File

@ -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 <boost/geometry/extensions/index/rtree/kmeans/split.hpp>
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_KMEANS_HPP

16
include/boost/geometry/extensions/index/detail/rtree/linear/linear.hpp
View File

@ -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 <boost/geometry/extensions/index/detail/rtree/linear/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_LINEAR_HPP

16
include/boost/geometry/extensions/index/detail/rtree/quadratic/quadratic.hpp
View File

@ -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 <boost/geometry/extensions/index/detail/rtree/quadratic/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_QUADRATIC_HPP

18
include/boost/geometry/extensions/index/detail/rtree/rstar/rstar.hpp
View File

@ -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 <boost/geometry/extensions/index/detail/rtree/rstar/insert.hpp>
#include <boost/geometry/extensions/index/detail/rtree/rstar/choose_next_node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/rstar/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP

8
include/boost/geometry/extensions/index/adaptors/nearest_query.hpp → include/boost/geometry/index/adaptors/nearest_query.hpp
View File

@ -2,14 +2,14 @@
// //
// Nearest neighbour query range adaptor // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP #ifndef BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP #define BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP
/*! /*!
\defgroup adaptors Adaptors (boost::geometry::index::adaptors::) \defgroup adaptors Adaptors (boost::geometry::index::adaptors::)
@ -119,4 +119,4 @@ operator|(
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_NEAREST_QUERY_HPP #endif // BOOST_GEOMETRY_INDEX_ADAPTORS_NEAREST_QUERY_HPP

8
include/boost/geometry/extensions/index/adaptors/spatial_query.hpp → include/boost/geometry/index/adaptors/spatial_query.hpp
View File

@ -2,14 +2,14 @@
// //
// Spatial query range adaptor // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP #ifndef BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP #define BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP
/*! /*!
\defgroup adaptors Adaptors (boost::geometry::index::adaptors::) \defgroup adaptors Adaptors (boost::geometry::index::adaptors::)
@ -85,4 +85,4 @@ operator|(
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ADAPTORS_SPATIAL_QUERY_HPP #endif // BOOST_GEOMETRY_INDEX_ADAPTORS_SPATIAL_QUERY_HPP

12
include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_centroid.hpp → include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
View File

@ -2,17 +2,17 @@
// //
// squared distance between point and centroid of the box or point // squared distance between point and centroid of the box or point
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_CENTROID_HPP
#include <boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp> #include <boost/geometry/index/detail/algorithms/sum_for_indexable.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp> #include <boost/geometry/index/detail/algorithms/diff_abs.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { 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 }}}} // 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

12
include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_far.hpp → include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
View File

@ -2,17 +2,17 @@
// //
// squared distance between point and furthest point of the box or point // squared distance between point and furthest point of the box or point
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_FAR_HPP
#include <boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp> #include <boost/geometry/index/detail/algorithms/diff_abs.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp> #include <boost/geometry/index/detail/algorithms/sum_for_indexable.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { 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 }}}} // 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

10
include/boost/geometry/extensions/index/detail/algorithms/comparable_distance_near.hpp → include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
View File

@ -2,16 +2,16 @@
// //
// squared distance between point and nearest point of the box or point // squared distance between point and nearest point of the box or point
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_COMPARABLE_DISTANCE_NEAR_HPP
#include <boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp> #include <boost/geometry/index/detail/algorithms/sum_for_indexable.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { 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 }}}} // 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

8
include/boost/geometry/extensions/index/detail/algorithms/content.hpp → include/boost/geometry/index/detail/algorithms/content.hpp
View File

@ -2,14 +2,14 @@
// //
// n-dimensional box's content (hypervolume) - 2d area, 3d volume, ... // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -82,4 +82,4 @@ typename default_content_result<Indexable>::type content(Indexable const& b)
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_CONTENT_HPP

8
include/boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp → include/boost/geometry/index/detail/algorithms/diff_abs.hpp
View File

@ -2,14 +2,14 @@
// //
// Abs of difference // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP
namespace boost { namespace geometry { namespace index { namespace detail { 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 }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_DIFF_ABS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_DIFF_ABS_HPP

10
include/boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp → include/boost/geometry/index/detail/algorithms/intersection_content.hpp
View File

@ -2,17 +2,17 @@
// //
// boxes union/intersection area/volume // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP
#include <boost/geometry/algorithms/intersection.hpp> #include <boost/geometry/algorithms/intersection.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -33,4 +33,4 @@ inline typename default_content_result<Box>::type intersection_content(Box const
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP

8
include/boost/geometry/extensions/index/detail/algorithms/is_valid.hpp → include/boost/geometry/index/detail/algorithms/is_valid.hpp
View File

@ -2,14 +2,14 @@
// //
// n-dimensional box's / point validity check // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_IS_VALID_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_IS_VALID_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -76,4 +76,4 @@ inline bool is_valid(Indexable const& b)
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_IS_VALID_HPP #endif // BOOST_GEOMETRY_DETAIL_INDEX_ALGORITHMS_IS_VALID_HPP

8
include/boost/geometry/extensions/index/detail/algorithms/margin.hpp → include/boost/geometry/index/detail/algorithms/margin.hpp
View File

@ -2,14 +2,14 @@
// //
// n-dimensional box's margin value (hypersurface), 2d perimeter, 3d surface, etc... // n-dimensional box's margin value (hypersurface), 2d perimeter, 3d surface, etc...
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -96,4 +96,4 @@ typename default_margin_result<Box>::type margin(Box const& b)
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP

14
include/boost/geometry/extensions/index/detail/algorithms/minmaxdist.hpp → include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
View File

@ -2,21 +2,21 @@
// //
// minmaxdist used in R-tree k nearest neighbors query // minmaxdist used in R-tree k nearest neighbors query
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP
#include <boost/geometry/algorithms/distance.hpp> #include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/algorithms/comparable_distance.hpp> #include <boost/geometry/algorithms/comparable_distance.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/diff_abs.hpp> #include <boost/geometry/index/detail/algorithms/diff_abs.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp> #include <boost/geometry/index/detail/algorithms/sum_for_indexable.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/smallest_for_indexable.hpp> #include <boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -116,4 +116,4 @@ minmaxdist(Point const& pt, Indexable const& i)
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MINMAXDIST_HPP

8
include/boost/geometry/extensions/index/detail/algorithms/smallest_for_indexable.hpp → include/boost/geometry/index/detail/algorithms/smallest_for_indexable.hpp
View File

@ -2,14 +2,14 @@
// //
// Get smallest value calculated for indexable's dimensions, used in R-tree k nearest neighbors query // Get smallest value calculated for indexable's dimensions, used in R-tree k nearest neighbors query
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SMALLEST_FOR_INDEXABLE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SMALLEST_FOR_INDEXABLE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SMALLEST_FOR_INDEXABLE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SMALLEST_FOR_INDEXABLE_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -77,4 +77,4 @@ struct smallest_for_indexable<Geometry, Indexable, IndexableTag, AlgoTag, 1>
}}}} // namespace boost::geometry::index::detail }}}} // 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

8
include/boost/geometry/extensions/index/detail/algorithms/sum_for_indexable.hpp → include/boost/geometry/index/detail/algorithms/sum_for_indexable.hpp
View File

@ -2,14 +2,14 @@
// //
// Sum values calculated for indexable's dimensions, used e.g. in R-tree k nearest neighbors query // Sum values calculated for indexable's dimensions, used e.g. in R-tree k nearest neighbors query
// //
// Copyright (c) 2011-2012 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
// //
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SUM_FOR_INDEXABLE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SUM_FOR_INDEXABLE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ALGORITHMS_DETAIL_SUM_FOR_INDEXABLE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_SUM_FOR_INDEXABLE_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -73,4 +73,4 @@ struct sum_for_indexable<Geometry, Indexable, IndexableTag, AlgoTag, 1>
}}}} // namespace boost::geometry::index::detail }}}} // 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

10
include/boost/geometry/extensions/index/detail/algorithms/union_content.hpp → include/boost/geometry/index/detail/algorithms/union_content.hpp
View File

@ -3,17 +3,17 @@
// boxes union/sum area/volume // boxes union/sum area/volume
// //
// Copyright (c) 2008 Federico J. Fernandez. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP
#include <boost/geometry/algorithms/expand.hpp> #include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -30,4 +30,4 @@ inline typename default_content_result<Box>::type union_content(Box const& b, Ge
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_UNION_CONTENT_HPP

8
include/boost/geometry/extensions/index/detail/assert.hpp → include/boost/geometry/index/detail/assert.hpp
View File

@ -1,6 +1,6 @@
// Boost.Geometry Index // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@ -8,8 +8,8 @@
#include <boost/assert.hpp> #include <boost/assert.hpp>
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP
#define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG) \ #define BOOST_GEOMETRY_INDEX_ASSERT(CONDITION, TEXT_MSG) \
BOOST_ASSERT_MSG(CONDITION, TEXT_MSG) BOOST_ASSERT_MSG(CONDITION, TEXT_MSG)
@ -24,4 +24,4 @@
#endif #endif
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_ASSERT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_ASSERT_HPP

18
include/boost/geometry/extensions/index/detail/distance_predicates.hpp → include/boost/geometry/index/detail/distance_predicates.hpp
View File

@ -3,22 +3,22 @@
// Spatial index distance predicates, calculators and checkers // Spatial index distance predicates, calculators and checkers
// used in nearest query - specialized for envelopes // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_DISTANCE_PREDICATES_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_DISTANCE_PREDICATES_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_DISTANCE_PREDICATES_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_DISTANCE_PREDICATES_HPP
#include <boost/geometry/extensions/index/detail/algorithms/comparable_distance_near.hpp> #include <boost/geometry/index/detail/algorithms/comparable_distance_near.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/comparable_distance_far.hpp> #include <boost/geometry/index/detail/algorithms/comparable_distance_far.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/comparable_distance_centroid.hpp> #include <boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp>
#include <boost/geometry/extensions/index/detail/tuples.hpp> #include <boost/geometry/index/detail/tuples.hpp>
#include <boost/geometry/extensions/index/detail/tags.hpp> #include <boost/geometry/index/detail/tags.hpp>
// TODO - optimization // TODO - optimization
// For Boxes and Points all types of distances may be calculated // For Boxes and Points all types of distances may be calculated
@ -863,4 +863,4 @@ struct distances_predicates_check<
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_DISTANCE_PREDICATES_HPP #endif // BOOST_GEOMETRY_INDEX_RTREE_DISTANCE_PREDICATES_HPP

8
include/boost/geometry/extensions/index/detail/indexable.hpp → include/boost/geometry/index/detail/indexable.hpp
View File

@ -2,14 +2,14 @@
// //
// Indexable's traits and related functions // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -174,4 +174,4 @@ struct default_box_type
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_INDEXABLE_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_INDEXABLE_HPP

8
include/boost/geometry/extensions/index/detail/nonassignable.hpp → include/boost/geometry/index/detail/nonassignable.hpp
View File

@ -2,14 +2,14 @@
// //
// Nonassignable base class. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -20,4 +20,4 @@ class nonassignable
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_NONASSIGNABLE_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_NONASSIGNABLE_HPP

12
include/boost/geometry/extensions/index/detail/predicates.hpp → include/boost/geometry/index/detail/predicates.hpp
View File

@ -2,17 +2,17 @@
// //
// Spatial query predicates definition and checks. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP
#include <boost/geometry/extensions/index/predicates.hpp> #include <boost/geometry/index/predicates.hpp>
#include <boost/geometry/extensions/index/detail/tags.hpp> #include <boost/geometry/index/detail/tags.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { 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 }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_PREDICATES_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_PREDICATES_HPP

10
include/boost/geometry/extensions/index/detail/pushable_array.hpp → include/boost/geometry/index/detail/pushable_array.hpp
View File

@ -1,17 +1,17 @@
// Boost.Geometry Index // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP
#include <boost/array.hpp> #include <boost/array.hpp>
#include <boost/geometry/extensions/index/detail/assert.hpp> #include <boost/geometry/index/detail/assert.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -168,4 +168,4 @@ private:
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PUSHABLE_ARRAY_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_PUSHABLE_ARRAY_HPP

12
include/boost/geometry/extensions/index/detail/rtree/adaptors.hpp → include/boost/geometry/index/detail/rtree/adaptors.hpp
View File

@ -2,20 +2,20 @@
// //
// R-tree queries range adaptors // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP
#include <deque> #include <deque>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/geometry/extensions/index/adaptors/spatial_query.hpp> #include <boost/geometry/index/adaptors/spatial_query.hpp>
#include <boost/geometry/extensions/index/adaptors/nearest_query.hpp> #include <boost/geometry/index/adaptors/nearest_query.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -82,4 +82,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_ADAPTORS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_ADAPTORS_HPP

16
include/boost/geometry/index/detail/rtree/kmeans/kmeans.hpp Normal file
View File

@ -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 <boost/geometry/index/rtree/kmeans/split.hpp>
#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_KMEANS_HPP

20
include/boost/geometry/extensions/index/detail/rtree/kmeans/split.hpp → include/boost/geometry/index/detail/rtree/kmeans/split.hpp
View File

@ -2,23 +2,21 @@
// //
// R-tree kmeans split algorithm implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP
#include <boost/geometry/extensions/index/rtree/node/node.hpp> #include <boost/geometry/index/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/rtree/visitors/insert.hpp> #include <boost/geometry/index/rtree/visitors/insert.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
namespace detail { namespace rtree { namespace visitors { namespace detail { namespace rtree {
namespace detail {
namespace kmeans { namespace kmeans {
@ -82,10 +80,8 @@ public:
} }
}; };
} // namespace detail }} // namespace detail::rtree
}}} // namespace detail::rtree::visitors
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_KMEANS_SPLIT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_KMEANS_SPLIT_HPP

16
include/boost/geometry/index/detail/rtree/linear/linear.hpp Normal file
View File

@ -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 <boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_LINEAR_HPP

16
include/boost/geometry/extensions/index/detail/rtree/linear/redistribute_elements.hpp → include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
View File

@ -3,22 +3,22 @@
// R-tree linear split algorithm implementation // R-tree linear split algorithm implementation
// //
// Copyright (c) 2008 Federico J. Fernandez. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP
#include <boost/type_traits/is_unsigned.hpp> #include <boost/type_traits/is_unsigned.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp> #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -328,4 +328,4 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, linear
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_LINEAR_REDISTRIBUTE_ELEMENTS_HPP

8
include/boost/geometry/extensions/index/detail/rtree/node/concept.hpp → include/boost/geometry/index/detail/rtree/node/concept.hpp
View File

@ -2,14 +2,14 @@
// //
// R-tree node concept // R-tree node concept
// //
// 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_CONCEPT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_CONCEPT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_CONCEPT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_CONCEPT_HPP
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -82,4 +82,4 @@ struct destroy_node
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_CONCEPT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_CONCEPT_HPP

8
include/boost/geometry/extensions/index/detail/rtree/node/dynamic_visitor.hpp → include/boost/geometry/index/detail/rtree/node/dynamic_visitor.hpp
View File

@ -2,14 +2,14 @@
// //
// R-tree nodes dynamic visitor and nodes base type // R-tree nodes dynamic visitor and nodes base type
// //
// 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_DYNAMIC_VISITOR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_DYNAMIC_VISITOR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_DYNAMIC_VISITOR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_DYNAMIC_VISITOR_HPP
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -92,4 +92,4 @@ inline void apply_visitor(Visitor & v, Visitable & n)
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_DYNAMIC_VISITOR_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_DYNAMIC_VISITOR_HPP

22
include/boost/geometry/extensions/index/detail/rtree/node/node.hpp → include/boost/geometry/index/detail/rtree/node/node.hpp
View File

@ -2,28 +2,28 @@
// //
// R-tree nodes // R-tree nodes
// //
// 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/concept.hpp> #include <boost/geometry/index/detail/rtree/node/concept.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node_d_mem_dynamic.hpp> #include <boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node_d_mem_static.hpp> #include <boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node_s_mem_dynamic.hpp> #include <boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node_s_mem_static.hpp> #include <boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node_auto_ptr.hpp> #include <boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp>
#include <boost/geometry/algorithms/expand.hpp> #include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -159,4 +159,4 @@ void copy_from_back(Container & container, Iterator it)
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_HPP

10
include/boost/geometry/extensions/index/detail/rtree/node/node_auto_ptr.hpp → include/boost/geometry/index/detail/rtree/node/node_auto_ptr.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree node auto ptr // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_AUTO_PTR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_AUTO_PTR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_AUTO_PTR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_AUTO_PTR_HPP
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp> #include <boost/geometry/index/detail/rtree/visitors/destroy.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -75,4 +75,4 @@ private:
}}} // namespace boost::geometry::index }}} // 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

10
include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_dynamic.hpp → include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree nodes based on run-time polymorphism, storing std::vectors // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP
#include <vector> #include <vector>
#include <boost/geometry/extensions/index/detail/rtree/node/dynamic_visitor.hpp> #include <boost/geometry/index/detail/rtree/node/dynamic_visitor.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -336,4 +336,4 @@ struct destroy_node<
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_HPP

12
include/boost/geometry/extensions/index/detail/rtree/node/node_d_mem_static.hpp → include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp
View File

@ -2,17 +2,17 @@
// //
// R-tree nodes based on runtime-polymorphism, storing static-size containers // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/dynamic_visitor.hpp> #include <boost/geometry/index/detail/rtree/node/dynamic_visitor.hpp>
#include <boost/geometry/extensions/index/detail/static_vector.hpp> #include <boost/geometry/index/detail/static_vector.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -181,4 +181,4 @@ struct create_node<
}}} // namespace boost::geometry::index }}} // 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

10
include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_dynamic.hpp → include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree nodes based on Boost.Variant, storing std::vectors // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_VARIANT_HPP
#include <vector> #include <vector>
#include <boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp> #include <boost/geometry/index/detail/rtree/node/static_visitor.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -294,4 +294,4 @@ struct destroy_node<
}}} // namespace boost::geometry::index }}} // 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

12
include/boost/geometry/extensions/index/detail/rtree/node/node_s_mem_static.hpp → include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree nodes based on Boost.Variant, storing static-size containers // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef 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_EXTENSIONS_INDEX_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_NODE_DEFAULT_STATIC_VARIANT_HPP
#include <boost/geometry/extensions/index/detail/static_vector.hpp> #include <boost/geometry/index/detail/static_vector.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp> #include <boost/geometry/index/detail/rtree/node/static_visitor.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -172,4 +172,4 @@ struct create_node<
}}} // namespace boost::geometry::index }}} // 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

8
include/boost/geometry/extensions/index/detail/rtree/node/static_visitor.hpp → include/boost/geometry/index/detail/rtree/node/static_visitor.hpp
View File

@ -2,14 +2,14 @@
// //
// R-tree nodes static visitor related code // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP
#include <boost/variant.hpp> #include <boost/variant.hpp>
@ -73,4 +73,4 @@ inline void apply_visitor(Visitor & v,
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_NODE_STATIC_VISITOR_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_STATIC_VISITOR_HPP

10
include/boost/geometry/extensions/index/detail/rtree/options.hpp → include/boost/geometry/index/detail/rtree/options.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree options, algorithms, parameters // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP
#include <boost/geometry/extensions/index/parameters.hpp> #include <boost/geometry/index/parameters.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -152,4 +152,4 @@ struct options_type< index::runtime::rstar >
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_OPTIONS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_OPTIONS_HPP

16
include/boost/geometry/index/detail/rtree/quadratic/quadratic.hpp Normal file
View File

@ -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 <boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_QUADRATIC_HPP

18
include/boost/geometry/extensions/index/detail/rtree/quadratic/redistribute_elements.hpp → include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
View File

@ -2,23 +2,23 @@
// //
// R-tree quadratic split algorithm implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP
#include <algorithm> #include <algorithm>
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/union_content.hpp> #include <boost/geometry/index/detail/algorithms/union_content.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp> #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -289,4 +289,4 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, quadra
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUADRATIC_REDISTRIBUTE_ELEMENTS_HPP

18
include/boost/geometry/extensions/index/detail/rtree/rstar/choose_next_node.hpp → include/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp
View File

@ -2,25 +2,25 @@
// //
// R-tree R*-tree next node choosing algorithm implementation // R-tree R*-tree next node choosing 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_CHOOSE_NEXT_NODE_HPP
#include <algorithm> #include <algorithm>
#include <boost/geometry/algorithms/expand.hpp> #include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp> #include <boost/geometry/index/detail/algorithms/intersection_content.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/union_content.hpp> #include <boost/geometry/index/detail/algorithms/union_content.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -241,4 +241,4 @@ private:
}}} // namespace boost::geometry::index }}} // 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

10
include/boost/geometry/extensions/index/detail/rtree/rstar/insert.hpp → include/boost/geometry/index/detail/rtree/rstar/insert.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree R*-tree insert algorithm implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -522,4 +522,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_INSERT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_INSERT_HPP

22
include/boost/geometry/extensions/index/detail/rtree/rstar/redistribute_elements.hpp → include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
View File

@ -2,24 +2,24 @@
// //
// R-tree R*-tree split algorithm implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP
#include <boost/geometry/extensions/index/detail/nonassignable.hpp> #include <boost/geometry/index/detail/nonassignable.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/intersection_content.hpp> #include <boost/geometry/index/detail/algorithms/intersection_content.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/union_content.hpp> #include <boost/geometry/index/detail/algorithms/union_content.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/margin.hpp> #include <boost/geometry/index/detail/algorithms/margin.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp> #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -405,4 +405,4 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, rstar_
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_REDISTRIBUTE_ELEMENTS_HPP

18
include/boost/geometry/index/detail/rtree/rstar/rstar.hpp Normal file
View File

@ -0,0 +1,18 @@
// Boost.Geometry Index
//
// R-tree R*-tree 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_RSTAR_RSTAR_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_RSTAR_HPP
#include <boost/geometry/index/detail/rtree/rstar/insert.hpp>
#include <boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp>
#include <boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp>
#endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_RSTAR_RSTAR_HPP

14
include/boost/geometry/extensions/index/detail/rtree/visitors/are_boxes_ok.hpp → include/boost/geometry/index/detail/rtree/visitors/are_boxes_ok.hpp
View File

@ -2,17 +2,17 @@
// //
// R-tree boxes validating visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_BOXES_OK_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_BOXES_OK_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_BOXES_OK_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_BOXES_OK_HPP
#include <boost/geometry/algorithms/equals.hpp> #include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree {
@ -117,6 +117,10 @@ private:
} // namespace visitors } // 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 <typename Value, typename Parameters, typename Translator, typename Allocator> template <typename Value, typename Parameters, typename Translator, typename Allocator>
bool are_boxes_ok(index::rtree<Value, Parameters, Translator, Allocator> const& tree, bool are_boxes_ok(index::rtree<Value, Parameters, Translator, Allocator> const& tree,
bool exact_match = true) bool exact_match = true)
@ -138,4 +142,4 @@ bool are_boxes_ok(index::rtree<Value, Parameters, Translator, Allocator> const&
}}}}} // namespace boost::geometry::index::detail::rtree }}}}} // 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

14
include/boost/geometry/extensions/index/detail/rtree/visitors/are_levels_ok.hpp → include/boost/geometry/index/detail/rtree/visitors/are_levels_ok.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree levels validating visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_LEVELS_OK_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_LEVELS_OK_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_ARE_LEVELS_OK_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_ARE_LEVELS_OK_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree {
@ -88,6 +88,10 @@ private:
} // namespace visitors } // 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 <typename Value, typename Parameters, typename Translator, typename Allocator> template <typename Value, typename Parameters, typename Translator, typename Allocator>
bool are_levels_ok(index::rtree<Value, Parameters, Translator, Allocator> const& tree) bool are_levels_ok(index::rtree<Value, Parameters, Translator, Allocator> const& tree)
{ {
@ -108,4 +112,4 @@ bool are_levels_ok(index::rtree<Value, Parameters, Translator, Allocator> const&
}}}}} // namespace boost::geometry::index::detail::rtree }}}}} // 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

10
include/boost/geometry/extensions/index/detail/rtree/visitors/children_box.hpp → include/boost/geometry/index/detail/rtree/visitors/children_box.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree node children box calculating visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP
#include <boost/geometry/extensions/index/rtree/node/node.hpp> #include <boost/geometry/index/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -55,4 +55,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_CHILDREN_BOX_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_CHILDREN_BOX_HPP

10
include/boost/geometry/extensions/index/detail/rtree/visitors/copy.hpp → include/boost/geometry/index/detail/rtree/visitors/copy.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree deep copying visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -91,4 +91,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COPY_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COPY_HPP

10
include/boost/geometry/extensions/index/detail/rtree/visitors/count.hpp → include/boost/geometry/index/detail/rtree/visitors/count.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree count visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -119,4 +119,4 @@ struct count<Value, Value, Options, Translator, Box, Allocators>
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_COUNT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_COUNT_HPP

10
include/boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp → include/boost/geometry/index/detail/rtree/visitors/destroy.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree destroying visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -68,4 +68,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_DELETE_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_DELETE_HPP

32
include/boost/geometry/extensions/index/detail/rtree/visitors/gl_draw.hpp → include/boost/geometry/index/detail/rtree/visitors/gl_draw.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree OpenGL drawing visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP
#include <boost/geometry/extensions/index/indexable.hpp> #include <boost/geometry/index/detail/indexable.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -26,7 +26,7 @@ struct gl_draw_point
template <typename Point> template <typename Point>
struct gl_draw_point<Point, 2> struct gl_draw_point<Point, 2>
{ {
static inline void apply(Point const& p, typename index::traits::coordinate_type<Point>::type z) static inline void apply(Point const& p, typename index::detail::traits::coordinate_type<Point>::type z)
{ {
glBegin(GL_POINT); glBegin(GL_POINT);
glVertex3f(geometry::get<0>(p), geometry::get<1>(p), z); glVertex3f(geometry::get<0>(p), geometry::get<1>(p), z);
@ -41,7 +41,7 @@ struct gl_draw_box
template <typename Box> template <typename Box>
struct gl_draw_box<Box, 2> struct gl_draw_box<Box, 2>
{ {
static inline void apply(Box const& b, typename index::traits::coordinate_type<Box>::type z) static inline void apply(Box const& b, typename index::detail::traits::coordinate_type<Box>::type z)
{ {
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex3f(geometry::get<min_corner, 0>(b), geometry::get<min_corner, 1>(b), z); glVertex3f(geometry::get<min_corner, 0>(b), geometry::get<min_corner, 1>(b), z);
@ -60,9 +60,9 @@ struct gl_draw_indexable
template <typename Indexable> template <typename Indexable>
struct gl_draw_indexable<Indexable, box_tag> struct gl_draw_indexable<Indexable, box_tag>
{ {
static const size_t dimension = index::traits::dimension<Indexable>::value; static const size_t dimension = index::detail::traits::dimension<Indexable>::value;
static inline void apply(Indexable const& i, typename index::traits::coordinate_type<Indexable>::type z) static inline void apply(Indexable const& i, typename index::detail::traits::coordinate_type<Indexable>::type z)
{ {
gl_draw_box<Indexable, dimension>::apply(i, z); gl_draw_box<Indexable, dimension>::apply(i, z);
} }
@ -71,9 +71,9 @@ struct gl_draw_indexable<Indexable, box_tag>
template <typename Indexable> template <typename Indexable>
struct gl_draw_indexable<Indexable, point_tag> struct gl_draw_indexable<Indexable, point_tag>
{ {
static const size_t dimension = index::traits::dimension<Indexable>::value; static const size_t dimension = index::detail::traits::dimension<Indexable>::value;
static inline void apply(Indexable const& i, typename index::traits::coordinate_type<Indexable>::type z) static inline void apply(Indexable const& i, typename index::detail::traits::coordinate_type<Indexable>::type z)
{ {
gl_draw_point<Indexable, dimension>::apply(i, z); gl_draw_point<Indexable, dimension>::apply(i, z);
} }
@ -84,11 +84,11 @@ struct gl_draw_indexable<Indexable, point_tag>
namespace detail { namespace detail {
template <typename Indexable> template <typename Indexable>
inline void gl_draw_indexable(Indexable const& i, typename index::traits::coordinate_type<Indexable>::type z) inline void gl_draw_indexable(Indexable const& i, typename index::detail::traits::coordinate_type<Indexable>::type z)
{ {
dispatch::gl_draw_indexable< dispatch::gl_draw_indexable<
Indexable, Indexable,
typename index::traits::tag<Indexable>::type typename index::detail::traits::tag<Indexable>::type
>::apply(i, z); >::apply(i, z);
} }
@ -103,7 +103,7 @@ struct gl_draw : public rtree::visitor<Value, typename Options::parameters_type,
inline gl_draw(Translator const& t, inline gl_draw(Translator const& t,
size_t level_first = 0, size_t level_first = 0,
size_t level_last = (std::numeric_limits<size_t>::max)(), size_t level_last = (std::numeric_limits<size_t>::max)(),
typename index::traits::coordinate_type<Box>::type z_coord_level_multiplier = 1 typename index::detail::traits::coordinate_type<Box>::type z_coord_level_multiplier = 1
) )
: tr(t) : tr(t)
, level_f(level_first) , level_f(level_first)
@ -180,7 +180,7 @@ struct gl_draw : public rtree::visitor<Value, typename Options::parameters_type,
Translator const& tr; Translator const& tr;
size_t level_f; size_t level_f;
size_t level_l; size_t level_l;
typename index::traits::coordinate_type<Box>::type z_mul; typename index::detail::traits::coordinate_type<Box>::type z_mul;
size_t level; size_t level;
}; };
@ -191,7 +191,7 @@ template <typename Value, typename Options, typename Translator, typename Alloca
void gl_draw(rtree<Value, Options, Translator, Allocator> const& tree, void gl_draw(rtree<Value, Options, Translator, Allocator> const& tree,
size_t level_first = 0, size_t level_first = 0,
size_t level_last = (std::numeric_limits<size_t>::max)(), size_t level_last = (std::numeric_limits<size_t>::max)(),
typename index::traits::coordinate_type< typename index::detail::traits::coordinate_type<
typename rtree<Value, Options, Translator, Allocator>::box_type typename rtree<Value, Options, Translator, Allocator>::box_type
>::type z_coord_level_multiplier = 1 >::type z_coord_level_multiplier = 1
) )
@ -218,4 +218,4 @@ void gl_draw(rtree<Value, Options, Translator, Allocator> const& tree,
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_GL_DRAW_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_GL_DRAW_HPP

12
include/boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp → include/boost/geometry/index/detail/rtree/visitors/insert.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree inserting visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP
#include <boost/geometry/extensions/index/detail/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -504,4 +504,4 @@ public:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_INSERT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_INSERT_HPP

10
include/boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp → include/boost/geometry/index/detail/rtree/visitors/is_leaf.hpp
View File

@ -2,16 +2,16 @@
// //
// R-tree leaf node checking visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_IS_LEAF_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_IS_LEAF_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -40,4 +40,4 @@ struct is_leaf : public rtree::visitor<Value, typename Options::parameters_type,
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_IS_LEAF_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_IS_LEAF_HPP

14
include/boost/geometry/extensions/index/detail/rtree/visitors/nearest_query.hpp → include/boost/geometry/index/detail/rtree/visitors/nearest_query.hpp
View File

@ -2,19 +2,19 @@
// //
// R-tree k nearest neighbour query visitor implementation // R-tree k nearest neighbour 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_NEAREST_QUERY_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_NEAREST_QUERY_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP
#include <boost/geometry/extensions/index/detail/distance_predicates.hpp> #include <boost/geometry/index/detail/distance_predicates.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/translator/translator.hpp> #include <boost/geometry/index/translator/translator.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -338,4 +338,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_NEAREST_QUERY_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_NEAREST_QUERY_HPP

12
include/boost/geometry/extensions/index/detail/rtree/visitors/print.hpp → include/boost/geometry/index/detail/rtree/visitors/print.hpp
View File

@ -2,14 +2,14 @@
// //
// R-tree ostreaming visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_PRINT_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_PRINT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_PRINT_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_PRINT_HPP
#include <iostream> #include <iostream>
@ -71,7 +71,7 @@ struct print_indexable
template <typename Indexable> template <typename Indexable>
struct print_indexable<Indexable, box_tag> struct print_indexable<Indexable, box_tag>
{ {
static const size_t dimension = index::traits::dimension<Indexable>::value; static const size_t dimension = index::detail::traits::dimension<Indexable>::value;
static inline void apply(std::ostream &os, Indexable const& i) static inline void apply(std::ostream &os, Indexable const& i)
{ {
@ -86,7 +86,7 @@ struct print_indexable<Indexable, box_tag>
template <typename Indexable> template <typename Indexable>
struct print_indexable<Indexable, point_tag> struct print_indexable<Indexable, point_tag>
{ {
static const size_t dimension = index::traits::dimension<Indexable>::value; static const size_t dimension = index::detail::traits::dimension<Indexable>::value;
static inline void apply(std::ostream &os, Indexable const& i) static inline void apply(std::ostream &os, Indexable const& i)
{ {
@ -194,4 +194,4 @@ std::ostream & operator<<(std::ostream & os, rtree<Value, Options, Translator, A
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_PRINT_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_PRINT_HPP

12
include/boost/geometry/extensions/index/detail/rtree/visitors/remove.hpp → include/boost/geometry/index/detail/rtree/visitors/remove.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree removing visitor implementation // R-tree removing 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_REMOVE_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_REMOVE_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/is_leaf.hpp> #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
#include <boost/geometry/algorithms/covered_by.hpp> #include <boost/geometry/algorithms/covered_by.hpp>
@ -328,4 +328,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_REMOVE_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_REMOVE_HPP

12
include/boost/geometry/extensions/index/detail/rtree/visitors/spatial_query.hpp → include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
View File

@ -2,18 +2,18 @@
// //
// R-tree spatial query visitor implementation // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP
#include <boost/geometry/extensions/index/detail/predicates.hpp> #include <boost/geometry/index/detail/predicates.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -78,4 +78,4 @@ struct spatial_query
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_VISITORS_SPATIAL_QUERY_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_VISITORS_SPATIAL_QUERY_HPP

10
include/boost/geometry/extensions/index/detail/static_vector.hpp → include/boost/geometry/index/detail/static_vector.hpp
View File

@ -1,13 +1,13 @@
// Boost.Geometry Index // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP
#include <cstddef> #include <cstddef>
#include <stdexcept> #include <stdexcept>
@ -28,7 +28,7 @@
#include <boost/type_traits/has_trivial_constructor.hpp> #include <boost/type_traits/has_trivial_constructor.hpp>
#include <boost/type_traits/has_trivial_destructor.hpp> #include <boost/type_traits/has_trivial_destructor.hpp>
#include <boost/geometry/extensions/index/detail/assert.hpp> #include <boost/geometry/index/detail/assert.hpp>
namespace boost { namespace geometry { namespace index { namespace detail { namespace boost { namespace geometry { namespace index { namespace detail {
@ -803,4 +803,4 @@ private:
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_STATIC_VECTOR_HPP

8
include/boost/geometry/extensions/index/detail/tags.hpp → include/boost/geometry/index/detail/tags.hpp
View File

@ -2,14 +2,14 @@
// //
// Tags used by the predicates checks implementation. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_TAGS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_TAGS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DETAIL_TAGS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_TAGS_HPP
namespace boost { namespace geometry { namespace index { namespace boost { namespace geometry { namespace index {
@ -22,4 +22,4 @@ struct envelope_tag {};
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_TAGS_HPP #endif // BOOST_GEOMETRY_INDEX_RTREE_TAGS_HPP

8
include/boost/geometry/extensions/index/detail/tuples.hpp → include/boost/geometry/index/detail/tuples.hpp
View File

@ -1,13 +1,13 @@
// Boost.Geometry Index // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TUPLES_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_TUPLES_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TUPLES_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_TUPLES_HPP
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
@ -168,4 +168,4 @@ struct add_unique
}}}} // namespace boost::geometry::index::detail }}}} // namespace boost::geometry::index::detail
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_TAGS_HPP #endif // BOOST_GEOMETRY_INDEX_DETAIL_RTREE_TAGS_HPP

10
include/boost/geometry/extensions/index/distance_predicates.hpp → include/boost/geometry/index/distance_predicates.hpp
View File

@ -2,16 +2,16 @@
// //
// Spatial index distance predicates, calculators and checkers used in nearest neighbor query // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP #ifndef BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP #define BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP
#include <boost/geometry/extensions/index/detail/distance_predicates.hpp> #include <boost/geometry/index/detail/distance_predicates.hpp>
/*! /*!
\defgroup distance_predicates Distance predicates (boost::geometry::index::) \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 }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_DISTANCE_PREDICATES_HPP #endif // BOOST_GEOMETRY_INDEX_DISTANCE_PREDICATES_HPP

8
include/boost/geometry/extensions/index/inserter.hpp → include/boost/geometry/index/inserter.hpp
View File

@ -2,14 +2,14 @@
// //
// Insert iterator // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP #ifndef BOOST_GEOMETRY_INDEX_INSERTER_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP #define BOOST_GEOMETRY_INDEX_INSERTER_HPP
#include <iterator> #include <iterator>
@ -75,4 +75,4 @@ insert_iterator<Container> inserter(Container & c)
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_INSERTER_HPP #endif // BOOST_GEOMETRY_INDEX_INSERTER_HPP

8
include/boost/geometry/extensions/index/parameters.hpp → include/boost/geometry/index/parameters.hpp
View File

@ -2,14 +2,14 @@
// //
// R-tree algorithms parameters // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP #ifndef BOOST_GEOMETRY_INDEX_PARAMETERS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP #define BOOST_GEOMETRY_INDEX_PARAMETERS_HPP
#include <limits> #include <limits>
@ -205,4 +205,4 @@ private:
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PARAMETERS_HPP #endif // BOOST_GEOMETRY_INDEX_PARAMETERS_HPP

10
include/boost/geometry/extensions/index/predicates.hpp → include/boost/geometry/index/predicates.hpp
View File

@ -2,14 +2,14 @@
// //
// Spatial query predicates // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP #ifndef BOOST_GEOMETRY_INDEX_PREDICATES_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP #define BOOST_GEOMETRY_INDEX_PREDICATES_HPP
#include <utility> #include <utility>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
@ -18,7 +18,7 @@
// TODO: awulkiew - temporary // TODO: awulkiew - temporary
#include <boost/geometry/algorithms/covered_by.hpp> #include <boost/geometry/algorithms/covered_by.hpp>
#include <boost/geometry/extensions/index/detail/predicates.hpp> #include <boost/geometry/index/detail/predicates.hpp>
/*! /*!
\defgroup predicates Spatial predicates (boost::geometry::index::) \defgroup predicates Spatial predicates (boost::geometry::index::)
@ -256,4 +256,4 @@ operator!(boost::geometry::index::detail::not_within<Geometry> const& p)
return boost::geometry::index::detail::within<Geometry>(p.geometry); return boost::geometry::index::detail::within<Geometry>(p.geometry);
} }
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_PREDICATES_HPP #endif // BOOST_GEOMETRY_INDEX_PREDICATES_HPP

73
include/boost/geometry/extensions/index/rtree.hpp → include/boost/geometry/index/rtree.hpp
View File

@ -3,14 +3,14 @@
// R-tree implementation // R-tree implementation
// //
// Copyright (c) 2008 Federico J. Fernandez. // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP #ifndef BOOST_GEOMETRY_INDEX_RTREE_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP #define BOOST_GEOMETRY_INDEX_RTREE_HPP
#include <algorithm> #include <algorithm>
@ -19,34 +19,34 @@
#include <boost/geometry/geometry.hpp> #include <boost/geometry/geometry.hpp>
#include <boost/geometry/extensions/index/detail/assert.hpp> #include <boost/geometry/index/detail/assert.hpp>
#include <boost/geometry/extensions/index/detail/nonassignable.hpp> #include <boost/geometry/index/detail/nonassignable.hpp>
#include <boost/geometry/extensions/index/translator/translator.hpp> #include <boost/geometry/index/translator/translator.hpp>
#include <boost/geometry/extensions/index/detail/rtree/options.hpp> #include <boost/geometry/index/detail/rtree/options.hpp>
#include <boost/geometry/extensions/index/predicates.hpp> #include <boost/geometry/index/predicates.hpp>
#include <boost/geometry/extensions/index/distance_predicates.hpp> #include <boost/geometry/index/distance_predicates.hpp>
#include <boost/geometry/extensions/index/detail/rtree/adaptors.hpp> #include <boost/geometry/index/detail/rtree/adaptors.hpp>
#include <boost/geometry/extensions/index/detail/rtree/node/node.hpp> #include <boost/geometry/index/detail/rtree/node/node.hpp>
#include <boost/geometry/extensions/index/detail/algorithms/is_valid.hpp> #include <boost/geometry/index/detail/algorithms/is_valid.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/insert.hpp> #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/remove.hpp> #include <boost/geometry/index/detail/rtree/visitors/remove.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/copy.hpp> #include <boost/geometry/index/detail/rtree/visitors/copy.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/destroy.hpp> #include <boost/geometry/index/detail/rtree/visitors/destroy.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/spatial_query.hpp> #include <boost/geometry/index/detail/rtree/visitors/spatial_query.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/nearest_query.hpp> #include <boost/geometry/index/detail/rtree/visitors/nearest_query.hpp>
#include <boost/geometry/extensions/index/detail/rtree/visitors/count.hpp> #include <boost/geometry/index/detail/rtree/visitors/count.hpp>
#include <boost/geometry/extensions/index/detail/rtree/linear/linear.hpp> #include <boost/geometry/index/detail/rtree/linear/linear.hpp>
#include <boost/geometry/extensions/index/detail/rtree/quadratic/quadratic.hpp> #include <boost/geometry/index/detail/rtree/quadratic/quadratic.hpp>
#include <boost/geometry/extensions/index/detail/rtree/rstar/rstar.hpp> #include <boost/geometry/index/detail/rtree/rstar/rstar.hpp>
//#include <boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp> //#include <boost/geometry/extensions/index/detail/rtree/kmeans/kmeans.hpp>
#include <boost/geometry/extensions/index/inserter.hpp> #include <boost/geometry/index/inserter.hpp>
// TODO change the name to bounding_tree // TODO change the name to bounding_tree
@ -116,11 +116,12 @@ public:
/*! \brief The Indexable type to which Value is translated. */ /*! \brief The Indexable type to which Value is translated. */
typedef typename translator::indexable_type<Translator>::type indexable_type; typedef typename translator::indexable_type<Translator>::type indexable_type;
/*! \brief The Box type used by the R-tree. */ /*! \brief The Box type used by the R-tree. */
typedef typename index::detail::default_box_type<indexable_type>::type box_type; typedef typename index::detail::default_box_type<indexable_type>::type envelope_type;
#if !defined(BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE) #if !defined(BOOST_GEOMETRY_INDEX_ENABLE_DEBUG_INTERFACE)
private: private:
#endif #endif
typedef envelope_type box_type;
typedef typename detail::rtree::options_type<Parameters>::type options_type; typedef typename detail::rtree::options_type<Parameters>::type options_type;
typedef typename options_type::node_tag node_tag; typedef typename options_type::node_tag node_tag;
typedef detail::rtree::allocators<allocator_type, value_type, typename options_type::parameters_type, box_type, node_tag> allocators_type; typedef detail::rtree::allocators<allocator_type, value_type, typename options_type::parameters_type, box_type, node_tag> 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. 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. there are no values in the container.
\par Throws \par Throws
Nothing. Nothing.
*/ */
inline box_type const& box() const inline envelope_type const& envelope() const
{ {
return m_box; return m_box;
} }
@ -1542,7 +1543,7 @@ inline bool empty(rtree<Value, Options, Translator, Allocator> const& tree)
/*! /*!
\brief Get the box containing all stored values or an invalid box if the index has no values. \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 \ingroup rtree_functions
@ -1552,9 +1553,9 @@ It calls \c rtree::box().
*/ */
template <typename Value, typename Options, typename Translator, typename Allocator> template <typename Value, typename Options, typename Translator, typename Allocator>
inline typename rtree<Value, Options, Translator, Allocator>::box_type const& inline typename rtree<Value, Options, Translator, Allocator>::box_type const&
box(rtree<Value, Options, Translator, Allocator> const& tree) envelope(rtree<Value, Options, Translator, Allocator> const& tree)
{ {
return tree.box(); return tree.envelope();
} }
}}} // namespace boost::geometry::index }}} // namespace boost::geometry::index
@ -1593,13 +1594,13 @@ struct indexed_access<index::rtree<Value, Parameters, Translator, Allocator>, mi
static inline coordinate_type get(index::rtree<Value, Parameters, Translator, Allocator> const& tree) static inline coordinate_type get(index::rtree<Value, Parameters, Translator, Allocator> const& tree)
{ {
return geometry::get<min_corner, Dimension>(tree.box()); return geometry::get<min_corner, Dimension>(tree.envelope());
} }
static inline void set(index::rtree<Value, Parameters, Translator, Allocator> & tree, static inline void set(index::rtree<Value, Parameters, Translator, Allocator> & tree,
coordinate_type const& value) coordinate_type const& value)
{ {
return geometry::set<min_corner, Dimension>(tree.box(), value); return geometry::set<min_corner, Dimension>(tree.envelope(), value);
} }
}; };
@ -1614,13 +1615,13 @@ struct indexed_access<index::rtree<Value, Parameters, Translator, Allocator>, ma
static inline coordinate_type get(index::rtree<Value, Parameters, Translator, Allocator> const& tree) static inline coordinate_type get(index::rtree<Value, Parameters, Translator, Allocator> const& tree)
{ {
return geometry::get<max_corner, Dimension>(tree.box()); return geometry::get<max_corner, Dimension>(tree.envelope());
} }
static inline void set(index::rtree<Value, Parameters, Translator, Allocator> & tree, static inline void set(index::rtree<Value, Parameters, Translator, Allocator> & tree,
coordinate_type const& value) coordinate_type const& value)
{ {
return geometry::set<max_corner, Dimension>(tree.box(), value); return geometry::set<max_corner, Dimension>(tree.envelope(), value);
} }
}; };
@ -1629,4 +1630,4 @@ struct indexed_access<index::rtree<Value, Parameters, Translator, Allocator>, ma
}} //namespace boost::geometry }} //namespace boost::geometry
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RTREE_HPP #endif // BOOST_GEOMETRY_INDEX_RTREE_HPP

10
include/boost/geometry/extensions/index/translator/def.hpp → include/boost/geometry/index/translator/def.hpp
View File

@ -2,16 +2,16 @@
// //
// Default translator // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP #ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP #define BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP
#include <boost/geometry/extensions/index/translator/helpers.hpp> #include <boost/geometry/index/translator/helpers.hpp>
namespace boost { namespace geometry { namespace index { namespace translator { namespace boost { namespace geometry { namespace index { namespace translator {
@ -150,4 +150,4 @@ struct def< boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
}}}} // namespace boost::geometry::index::translator }}}} // namespace boost::geometry::index::translator
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_DEF_HPP #endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_DEF_HPP

10
include/boost/geometry/extensions/index/translator/helpers.hpp → include/boost/geometry/index/translator/helpers.hpp
View File

@ -2,14 +2,14 @@
// //
// Translators helper functions // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP #ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP #define BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP
#include <utility> #include <utility>
@ -21,7 +21,7 @@
#include <boost/geometry/algorithms/equals.hpp> #include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/extensions/index/detail/indexable.hpp> #include <boost/geometry/index/detail/indexable.hpp>
namespace boost { namespace geometry { namespace index { namespace translator { namespace boost { namespace geometry { namespace index { namespace translator {
@ -191,4 +191,4 @@ struct equals< std::pair<First, Second> >
}}}} // namespace boost::geometry::index::translator }}}} // namespace boost::geometry::index::translator
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_HELPERS_HPP #endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_HELPERS_HPP

10
include/boost/geometry/extensions/index/translator/index.hpp → include/boost/geometry/index/translator/index.hpp
View File

@ -2,16 +2,16 @@
// //
// Translator translating random-access container index value to Indexable object // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP #ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP #define BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP
#include <boost/geometry/extensions/index/translator/def.hpp> #include <boost/geometry/index/translator/def.hpp>
namespace boost { namespace geometry { namespace index { namespace translator { namespace boost { namespace geometry { namespace index { namespace translator {
@ -60,4 +60,4 @@ private:
}}}} // namespace boost::geometry::index::translator }}}} // namespace boost::geometry::index::translator
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_INDEX_HPP #endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_INDEX_HPP

12
include/boost/geometry/extensions/index/translator/translator.hpp → include/boost/geometry/index/translator/translator.hpp
View File

@ -1,16 +1,16 @@
// Boost.Geometry Index // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP #ifndef BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP #define BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP
#include <boost/geometry/extensions/index/translator/def.hpp> #include <boost/geometry/index/translator/def.hpp>
#include <boost/geometry/extensions/index/translator/index.hpp> #include <boost/geometry/index/translator/index.hpp>
namespace boost { namespace geometry { namespace index { namespace translator { namespace boost { namespace geometry { namespace index { namespace translator {
@ -26,4 +26,4 @@ struct indexable_type
}}}} // namespace boost::geometry::index::translator }}}} // namespace boost::geometry::index::translator
#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TRANSLATOR_TRANSLATOR_HPP #endif // BOOST_GEOMETRY_INDEX_TRANSLATOR_TRANSLATOR_HPP

2
test/Jamfile.v2
View File

@ -1,6 +1,6 @@
# Boost.Geometry Index # 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, # Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at

2
test/algorithms/Jamfile.v2
View File

@ -1,6 +1,6 @@
# Boost.Geometry Index # 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, # Use, modification and distribution is subject to the Boost Software License,
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at

6
test/algorithms/content.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 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, int_box);
bg::read_wkt(box_li, double_box); bg::read_wkt(box_li, double_box);
double int_value = bgi::content(int_box); double int_value = bgi::detail::content(int_box);
double double_value = bgi::content(double_box); double double_value = bgi::detail::content(double_box);
BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001);
} }

6
test/algorithms/intersection_content.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 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, int_box2);
bg::read_wkt(box_li2, double_box2); bg::read_wkt(box_li2, double_box2);
double int_value = bgi::intersection_content(int_box1, int_box2); double int_value = bgi::detail::intersection_content(int_box1, int_box2);
double double_value = bgi::intersection_content(double_box1, double_box2); double double_value = bgi::detail::intersection_content(double_box1, double_box2);
BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001);
} }

10
test/algorithms/is_valid.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@ -11,7 +11,7 @@
#include <geometry_index_test_common.hpp> #include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/is_valid.hpp> #include <boost/geometry/index/detail/algorithms/is_valid.hpp>
#include <boost/geometry/geometries/point_xy.hpp> #include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/point.hpp>
@ -22,7 +22,7 @@
template <typename Geometry> template <typename Geometry>
void test(Geometry const& geometry, bool expected_value) 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 #ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out; std::ostringstream out;
@ -63,13 +63,13 @@ void test_large_integers()
bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, int_box);
bg::read_wkt(box_li, double_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))"; std::string const box_li2 = "POLYGON((1872000 528000, 1536119 192000))";
bg::read_wkt(box_li2, int_box); bg::read_wkt(box_li2, int_box);
bg::read_wkt(box_li2, double_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* []) int test_main(int, char* [])

6
test/algorithms/margin.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 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, int_box);
bg::read_wkt(box_li, double_box); bg::read_wkt(box_li, double_box);
double int_value = bgi::margin(int_box); double int_value = bgi::detail::margin(int_box);
double double_value = bgi::margin(double_box); double double_value = bgi::detail::margin(double_box);
BOOST_CHECK_CLOSE(int_value, double_value, 0.0001); BOOST_CHECK_CLOSE(int_value, double_value, 0.0001);
} }

8
test/algorithms/minmaxdist.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@ -11,7 +11,7 @@
#include <geometry_index_test_common.hpp> #include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/minmaxdist.hpp> #include <boost/geometry/index/detail/algorithms/minmaxdist.hpp>
#include <boost/geometry/geometries/point_xy.hpp> #include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/point.hpp> #include <boost/geometry/geometries/point.hpp>
@ -23,7 +23,7 @@ template <typename Point, typename Indexable>
void test(Point const& pt, Indexable const& indexable, void test(Point const& pt, Indexable const& indexable,
typename bg::default_distance_result<Point, Indexable>::type expected_value) typename bg::default_distance_result<Point, Indexable>::type expected_value)
{ {
typename bg::default_distance_result<Point, Indexable>::type value = bgi::minmaxdist(pt, indexable); typename bg::default_distance_result<Point, Indexable>::type value = bgi::detail::minmaxdist(pt, indexable);
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out; std::ostringstream out;
@ -65,7 +65,7 @@ void test_large_integers()
bg::read_wkt(box_li, int_box); bg::read_wkt(box_li, int_box);
bg::read_wkt(box_li, double_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* []) int test_main(int, char* [])

16
test/algorithms/test_content.hpp
View File

@ -1,33 +1,33 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_CONTENT_HPP #ifndef BOOST_GEOMETRY_INDEX_TEST_CONTENT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_TEST_CONTENT_HPP
#include <geometry_index_test_common.hpp> #include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/content.hpp> #include <boost/geometry/index/detail/algorithms/content.hpp>
//#include <boost/geometry/io/wkt/read.hpp> //#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry> template <typename Geometry>
void test_content(Geometry const& geometry, void test_content(Geometry const& geometry,
typename bgi::default_content_result<Geometry>::type expected_value) typename bgi::detail::default_content_result<Geometry>::type expected_value)
{ {
typename bgi::default_content_result<Geometry>::type value = bgi::content(geometry); typename bgi::detail::default_content_result<Geometry>::type value = bgi::detail::content(geometry);
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out; std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name() out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< " " << " "
<< typeid(typename bgi::default_content_result<Geometry>::type).name() << typeid(typename bgi::detail::default_content_result<Geometry>::type).name()
<< " " << " "
<< "content : " << value << "content : " << value
<< std::endl; << std::endl;
@ -39,7 +39,7 @@ void test_content(Geometry const& geometry,
template <typename Geometry> template <typename Geometry>
void test_geometry(std::string const& wkt, void test_geometry(std::string const& wkt,
typename bgi::default_content_result<Geometry>::type expected_value) typename bgi::detail::default_content_result<Geometry>::type expected_value)
{ {
Geometry geometry; Geometry geometry;
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);

16
test/algorithms/test_intersection_content.hpp
View File

@ -1,30 +1,30 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_INTERSECTION_CONTENT_HPP #ifndef BOOST_GEOMETRY_INDEX_TEST_INTERSECTION_CONTENT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_INTERSECTION_CONTENT_HPP #define BOOST_GEOMETRY_INDEX_TEST_INTERSECTION_CONTENT_HPP
#include <geometry_index_test_common.hpp> #include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/intersection_content.hpp> #include <boost/geometry/index/detail/algorithms/intersection_content.hpp>
template <typename Geometry> template <typename Geometry>
void test_intersection_content(Geometry const& geometry1, Geometry const& geometry2, void test_intersection_content(Geometry const& geometry1, Geometry const& geometry2,
typename bgi::default_content_result<Geometry>::type expected_value) typename bgi::detail::default_content_result<Geometry>::type expected_value)
{ {
typename bgi::default_content_result<Geometry>::type value = bgi::intersection_content(geometry1, geometry2); typename bgi::detail::default_content_result<Geometry>::type value = bgi::detail::intersection_content(geometry1, geometry2);
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out; std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name() out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< " " << " "
<< typeid(typename bgi::default_content_result<Geometry>::type).name() << typeid(typename bgi::detail::default_content_result<Geometry>::type).name()
<< " " << " "
<< "intersection_content : " << value << "intersection_content : " << value
<< std::endl; << std::endl;
@ -36,7 +36,7 @@ void test_intersection_content(Geometry const& geometry1, Geometry const& geomet
template <typename Geometry> template <typename Geometry>
void test_geometry(std::string const& wkt1, std::string const& wkt2, void test_geometry(std::string const& wkt1, std::string const& wkt2,
typename bgi::default_content_result<Geometry>::type expected_value) typename bgi::detail::default_content_result<Geometry>::type expected_value)
{ {
Geometry geometry1, geometry2; Geometry geometry1, geometry2;
bg::read_wkt(wkt1, geometry1); bg::read_wkt(wkt1, geometry1);

16
test/algorithms/test_margin.hpp
View File

@ -1,32 +1,32 @@
// Boost.Geometry Index // Boost.Geometry Index
// Unit Test // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_MARGIN_HPP #ifndef BOOST_GEOMETRY_INDEX_TEST_MARGIN_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TEST_MARGIN_HPP #define BOOST_GEOMETRY_INDEX_TEST_MARGIN_HPP
#include <geometry_index_test_common.hpp> #include <geometry_index_test_common.hpp>
#include <boost/geometry/extensions/index/algorithms/margin.hpp> #include <boost/geometry/index/detail/algorithms/margin.hpp>
//#include <boost/geometry/io/wkt/read.hpp> //#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry> template <typename Geometry>
void test_margin(Geometry const& geometry, void test_margin(Geometry const& geometry,
typename bgi::default_margin_result<Geometry>::type expected_value) typename bgi::detail::default_margin_result<Geometry>::type expected_value)
{ {
typename bgi::default_margin_result<Geometry>::type value = bgi::margin(geometry); typename bgi::detail::default_margin_result<Geometry>::type value = bgi::detail::margin(geometry);
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::ostringstream out; std::ostringstream out;
out << typeid(typename bg::coordinate_type<Geometry>::type).name() out << typeid(typename bg::coordinate_type<Geometry>::type).name()
<< " " << " "
<< typeid(typename bgi::default_margin_result<Geometry>::type).name() << typeid(typename bgi::detail::default_margin_result<Geometry>::type).name()
<< " " << " "
<< "content : " << value << "content : " << value
<< std::endl; << std::endl;
@ -38,7 +38,7 @@ void test_margin(Geometry const& geometry,
template <typename Geometry> template <typename Geometry>
void test_geometry(std::string const& wkt, void test_geometry(std::string const& wkt,
typename bgi::default_margin_result<Geometry>::type expected_value) typename bgi::detail::default_margin_result<Geometry>::type expected_value)
{ {
Geometry geometry; Geometry geometry;
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);

Some files were not shown because too many files have changed in this diff Show More