Changeset 2360

Timestamp:

Dec 4, 2010, 2:04:45 AM (13 years ago)

Author:

Peter

Message:

refs #640. adding a functor in SegmentTree? to tranlate a value_type to key_type.

Location:

trunk

Files:

• test/segment_test.cc (modified) (1 diff)
• yat/utility/SegmentMap.h (modified) (2 diffs)
• yat/utility/SegmentSet.h (modified) (2 diffs)
• yat/utility/SegmentTree.h (modified) (6 diffs)

trunk/test/segment_test.cc

@@ -214 +214 @@
   avoid_pedantic_warning(x);
   Map::key_type key = Segment<double>(1.0,2.0);
-  avoid_pedantic_warning(key);
   Map::mapped_type  mapped = "foofana";
-  avoid_pedantic_warning(mapped);
+
+  map.insert(Map::value_type(key, mapped));
+  suite.add(map.find(1.5) != map.end());
+  suite.add(map.find(1.5)->second == "foofana");
 }
 

trunk/yat/utility/SegmentMap.h

@@ -25 +25 @@
 #include "Segment.h"
 #include "SegmentTree.h"
+#include "stl_utility.h"
 
 #include <map>
@@ -43 +44 @@
     : public SegmentTree<std::map<Segment<T, Compare>, Tp,  
                                   SegmentCompare<T, Compare> >,
-                         Compare>
+                   Compare,
+                   PairFirst<const std::pair<const Segment<T, Compare>, Tp> > >
   {
   public:

trunk/yat/utility/SegmentSet.h

@@ -25 +25 @@
 #include "Segment.h"
 #include "SegmentTree.h"
-
+#include "stl_utility.h"
 #include "yat_assert.h"
 
@@ -46 +46 @@
     : public SegmentTree<std::set<Segment<T, Compare>, 
                                   SegmentCompare<T, Compare> >,
-                         Compare>
+                         Compare,
+                         Identity<const Segment<T, Compare>&> >
   {
     typedef SegmentSet<T, Compare> me;

trunk/yat/utility/SegmentTree.h

@@ -36 +36 @@
   /**
      \brief Base Class for SegmentSet and SegmentMap
+
+     - Container: underlying container (set or map)
+     - Compare: functor comparing elements (same as in Segment)
+     - Value2Key: functor translating a \c const_reference to \c
+       key_type (or \c const&)
    */
-  template<class Container, class Compare>
+  template<class Container, class Compare, class Value2Key>
   class SegmentTree 
   {
@@ -206 +211 @@
   };
 
-  template<class Container, class Compare>
-  typename SegmentTree<Container, Compare>::size_type 
-  SegmentTree<Container, Compare>::count(const element_type& element) const
+  template<class Container, class Compare, class Value2Key>
+  typename SegmentTree<Container, Compare, Value2Key>::size_type 
+  SegmentTree<Container,Compare,Value2Key>::count(const element_type& element) const
   {
     if (find(element)==end())
@@ -216 +221 @@
 
 
-  template<class Container, class Compare>
-  typename SegmentTree<Container, Compare>::const_iterator 
-  SegmentTree<Container, Compare>::find(const element_type& vt) const
+  template<class Container, class Compare, class Value2Key>
+  typename SegmentTree<Container, Compare, Value2Key>::const_iterator 
+  SegmentTree<Container, Compare, Value2Key>::find(const element_type& vt) const
   {
     const_iterator iter = lower_bound(vt);
     element_compare comp;
-    if (iter==end() || comp(vt, iter->begin()))
+    //    if (iter==end() || comp(vt, iter->begin()))
+    if (iter==end() || comp(vt, Value2Key()(*iter).begin()))
       return end();
     return iter;
@@ -228 +234 @@
 
 
-  template<typename T, class Compare>
-  std::pair<typename SegmentTree<T, Compare>::iterator, bool> 
-  SegmentTree<T, Compare>::insert(const value_type& segment)
+  template<typename T, class Compare, class Value2Key>
+  std::pair<typename SegmentTree<T, Compare, Value2Key>::iterator, bool> 
+  SegmentTree<T, Compare,Value2Key>::insert(const value_type& segment)
   {
     return container_.insert(segment);
@@ -236 +242 @@
 
 
-  template<typename T, class Compare>
-  typename SegmentTree<T, Compare>::iterator
-  SegmentTree<T, Compare>::lower_bound(const element_type& element)
+  template<typename T, class Compare, class Value2Key>
+  typename SegmentTree<T, Compare, Value2Key>::iterator
+  SegmentTree<T, Compare,Value2Key>::lower_bound(const element_type& element)
   {
     key_type segment(element, element);
     iterator result = container_.lower_bound(segment);
     // result is larger or overlapping with segment (i.e.! result<segment)
-    YAT_ASSERT(result==end() || !compare(*result,segment));
+    YAT_ASSERT(result==end() 
+               || !compare(Value2Key()(*result),segment));
     return result;
   }
 
 
-  template<typename T, class Compare>
-  typename SegmentTree<T, Compare>::const_iterator
-  SegmentTree<T, Compare>::lower_bound(const element_type& element) const
+  template<typename T, class Compare, class Value2Key>
+  typename SegmentTree<T, Compare, Value2Key>::const_iterator
+  SegmentTree<T, Compare,Value2Key>::lower_bound(const element_type& element) const
   {
     key_type segment(element, element);
     const_iterator result = container_.lower_bound(segment);
     // result is larger or overlapping with segment (i.e.! result<segment)
-    YAT_ASSERT(result==end() || !compare(*result,segment));
+    YAT_ASSERT(result==end() 
+               || !compare(Value2Key()(*result),segment));
     return result;
   }
 
 
-  template<typename T, class Compare>
-  typename SegmentTree<T, Compare>::iterator
-  SegmentTree<T, Compare>::upper_bound(const element_type& element)
+  template<typename T, class Compare, class Value2Key>
+  typename SegmentTree<T, Compare, Value2Key>::iterator
+  SegmentTree<T, Compare,Value2Key>::upper_bound(const element_type& element)
   {
     key_type segment(element, element);
@@ -276 +284 @@
 
 
-  template<typename T, class Compare>
-  typename SegmentTree<T, Compare>::const_iterator
-  SegmentTree<T, Compare>::upper_bound(const element_type& element) const
+  template<typename T, class Compare, class Value2Key>
+  typename SegmentTree<T, Compare, Value2Key>::const_iterator
+  SegmentTree<T, Compare,Value2Key>::upper_bound(const element_type& element) const
   {
     Segment<T, Compare> segment(element, element);