Changeset 2362

Timestamp:

Dec 5, 2010, 3:23:53 AM (12 years ago)

Author:

Peter

Message:

more tests for SegmentMap?. closes #640

Location:

trunk

Files:

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

trunk/test/segment_test.cc

@@ -219 +219 @@
   suite.add(map.find(1.5) != map.end());
   suite.add(map.find(1.5)->second == "foofana");
+
+  Map::iterator i = map.begin();
+  i = map.end();
+  const Map const_map(map);
+  Map::const_iterator ci = const_map.begin();
+  ci = const_map.end();
+
+  suite.add(map.size()==1);
+  map.clear();
+  suite.add(map.empty()==true);
+  suite.add(map.size()==0);
+  map = const_map;
+  suite.add(map.size()==1);
+  suite.add(const_map.count(1.0)==1);
+  suite.add(const_map.count(0.0)==0);
+  suite.add(const_map.empty()==false);
+  suite.add(const_map.find(1.0)==const_map.begin());
+  suite.add(const_map.find(30.0)==const_map.end());
+  ci = const_map.lower_bound(0.0);
+  ci = const_map.upper_bound(0.0);
+  i = map.lower_bound(0.0);
+  i = map.upper_bound(0.0);
+  
 }
 

trunk/yat/utility/SegmentMap.h

@@ -51 +51 @@
     typedef Tp mapped_type;
     
-
     /**
        \brief creates a set with no segments

trunk/yat/utility/SegmentTree.h

@@ -127 +127 @@
 
     /**
-       \brief insert set 
+       \brief insert value 
 
        if \a segment does not overlap with any segment in set, insert
@@ -138 +138 @@
      */
     std::pair<iterator, bool> insert(const value_type& segment);
-
-    /**
-       insert \a segment into set. If there is no gap between \a
-       segment and neighboring segments the segments are merged.
-     */
-    const_iterator insert_merge(const value_type& segment);
 
     /**