Changeset 2296

Timestamp:

Jul 8, 2010, 9:39:42 PM (13 years ago)

Author:

Peter

Message:

class SegmentSet?: added function clear and fixed bug in insert. Divided test into subtests. refs #635

Location:

trunk

Files:

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

trunk/test/segment_test.cc

@@ -25 +25 @@
 #include "yat/utility/SegmentSet.h"
 
+using namespace theplu::yat;
+using namespace utility;
+void test_count(test::Suite&);
+void test_insert(test::Suite&);
+void test_insert_merge(test::Suite&);
+void test_segment(test::Suite& suite);
+void test_set_bound(test::Suite&);
+
 int main(int argc, char* argv[])
 {  
-  using namespace theplu::yat::utility;
-  theplu::yat::test::Suite suite(argc, argv);
+  test::Suite suite(argc, argv);
 
+  test_count(suite);
+  test_insert(suite);
+  test_insert_merge(suite);
+  test_segment(suite);
+  test_set_bound(suite);
+
+  return suite.return_value();
+}
+
+void test_insert(test::Suite& suite)
+{
   Segment<double> segment;
   Segment<double> segment2(0,2);
@@ -48 +66 @@
     suite.err() << "expected size 1\n";
   }
+  set.insert(Segment<double>(1,3));
+  if (set.size()!=1) {
+    suite.add(false);
+    suite.err() << "expected size 1\n";
+  }
   if (!suite.add(set.find(0)!=set.end()))
     suite.err() << "error: set.find(0): expected not end()\n";
-  
+} 
+
+void test_count(test::Suite& suite)
+{
+  SegmentSet<double> set;
+  set.insert(Segment<double>(0,2));
   // test count
   if (!suite.add(set.count(0)==1))
@@ -58 +86 @@
   if (!suite.add(set.count(2)==0))
     suite.err() << "error: set.count(2): expected 0\n";
+}
 
+void test_insert_merge(test::Suite& suite)
+{
+  SegmentSet<double> set;
+  set.insert(Segment<double>(0,2));
   set.insert_merge(Segment<double>(3,5));
   if (!suite.add(set.size()==2))
@@ -74 +107 @@
   if (!suite.add(set.size()==1))
     suite.err() << "error: set.size(): " << set.size() << " expected 1\n";
+}
 
+void test_set_bound(test::Suite& suite)
+{
+  SegmentSet<double> set;
+  set.insert(Segment<double>(0,2));
   set.begin();
   set.end();
@@ -81 +119 @@
   if (!suite.add(set.upper_bound(Segment<double>(-1,2))==set.end()))
     suite.err() << "error: expected set.upper_bound to return end()\n";
+  set.clear();
+}
 
+void test_segment(test::Suite& suite)
+{
   Segment<double> segment12(0,2);
   Segment<double> segment13(1,3);
@@ -103 +145 @@
     suite.err() << "error: compare_3way: expected 1\n";
 
-  return suite.return_value();
 }

trunk/yat/utility/SegmentSet.h

@@ -78 +78 @@
      */
     iterator begin(void) { return set_.begin(); }
+
+    /**
+       \brief erases all the segments
+     */
+    void clear(void) { set_.clear(); }
 
     /**
@@ -216 +221 @@
   SegmentSet<T, Compare>::insert(const value_type& segment)
   {
-    iterator iter = set_.lower_bound(segment);
-    return set_.insert(segment);
+    std::pair<iterator, iterator> p = overlap_range(segment);
+    std::pair<typename SegmentSet<T, Compare>::iterator, bool> result;
+    if (p.first==p.second) {
+      result.first = set_.insert(p.first, segment);
+      result.second = true;
+      return result;
+    }
+    result.first = p.first;
+    result.second = false;
+    return result;
   }