[Boost-commit] svn:boost r73154 - in sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree: . rstar visitors

Subject: [Boost-commit] svn:boost r73154 - in sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree: . rstar visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2011-07-16 16:56:57

Author: awulkiew
Date: 2011-07-16 16:56:56 EDT (Sat, 16 Jul 2011)
New Revision: 73154
URL: http://svn.boost.org/trac/boost/changeset/73154

Log:
insert tags renamed
Text files modified: 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp         |    39 ++++++++++++++++++++------------------- 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/insert.hpp    |     2 +-                                      
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/insert.hpp |     6 ++++--                                  
   3 files changed, 25 insertions(+), 22 deletions(-)

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp	2011-07-16 16:56:56 EDT (Sat, 16 Jul 2011)
@@ -13,8 +13,8 @@
 namespace boost { namespace geometry { namespace index {
 
 // InsertTag
-struct insert_tag {};
-struct reinsert_tag {};
+struct insert_default_tag {};
+struct insert_reinsert_tag {};
 
 // ChooseNextNodeTag
 struct choose_by_content_diff_tag {};
@@ -95,27 +95,28 @@
         // TODO: awulkiew - use static assert
 };
 
-template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
-struct options_type< options::rtree<Parameters, InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> >
-{
-	typedef options::rtree<
-		Parameters,
-		InsertTag,
-		ChooseNextNodeTag,
-		RedistributeTag,
-		NodeTag
-	> type;
-};
+// default options
+//template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
+//struct options_type< options::rtree<Parameters, InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> >
+//{
+//	typedef options::rtree<
+//		Parameters,
+//		InsertTag,
+//		ChooseNextNodeTag,
+//		RedistributeTag,
+//		NodeTag
+//	> type;
+//};
 
 template <size_t MaxElements, size_t MinElements>
 struct options_type< linear<MaxElements, MinElements> >
 {
         typedef options::rtree<
                 linear<MaxElements, MinElements>,
-		insert_tag,
+		insert_default_tag,
                 choose_by_content_diff_tag,
                 linear_tag,
-		node_default_tag
+		node_default_static_tag
 	> type;
 };
 
@@ -124,10 +125,10 @@
 {
         typedef options::rtree<
                 quadratic<MaxElements, MinElements>,
-		insert_tag,
+		insert_default_tag,
                 choose_by_content_diff_tag,
                 quadratic_tag,
-		node_default_tag
+		node_default_static_tag
 	> type;
 };
 
@@ -136,10 +137,10 @@
 {
         typedef options::rtree<
                 rstar<MaxElements, MinElements, OverlapCostThreshold, ReinsertedElements>,
-		reinsert_tag,
+		insert_reinsert_tag,
                 choose_by_overlap_diff_tag,
                 rstar_tag,
-		node_default_tag
+		node_default_static_tag
 	> type;
 };
 

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/insert.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/insert.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/insert.hpp	2011-07-16 16:56:56 EDT (Sat, 16 Jul 2011)
@@ -350,7 +350,7 @@
 
 // R*-tree insert visitor
 template <typename Element, typename Value, typename Options, typename Translator, typename Box>
-class insert<Element, Value, Options, Translator, Box, reinsert_tag>
+class insert<Element, Value, Options, Translator, Box, insert_reinsert_tag>
         : public rtree::visitor<Value, typename Options::parameters_type, Box, typename Options::node_tag, false>::type
         , index::nonassignable
 {

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/insert.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/insert.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/visitors/insert.hpp	2011-07-16 16:56:56 EDT (Sat, 16 Jul 2011)
@@ -169,6 +169,8 @@
         m_current_level = current_level_bckup;
     }
 
+    // TODO: awulkiew - implement dispatchable split::apply to enable additional nodes creation
+
         template <typename Node>
         inline void split(Node &n) const
         {
@@ -235,7 +237,7 @@
 
 // Default insert visitor used for nodes elements
 template <typename Element, typename Value, typename Options, typename Translator, typename Box>
-struct insert<Element, Value, Options, Translator, Box, insert_tag>
+struct insert<Element, Value, Options, Translator, Box, insert_default_tag>
         : public detail::insert<Element, Value, Options, Translator, Box>
 {
     typedef detail::insert<Element, Value, Options, Translator, Box> base;
@@ -280,7 +282,7 @@
 
 // Default insert visitor specialized for Values elements
 template <typename Value, typename Options, typename Translator, typename Box>
-struct insert<Value, Value, Options, Translator, Box, insert_tag>
+struct insert<Value, Value, Options, Translator, Box, insert_default_tag>
         : public detail::insert<Value, Value, Options, Translator, Box>
 {
     typedef detail::insert<Value, Value, Options, Translator, Box> base;