Changeset 4027 for trunk

Timestamp:

Jan 17, 2021, 11:46:38 AM (2 years ago)

Author:

Peter

Message:

refs #968; fix implementation of SegmentSet::insert_merge and add some tests to avoid similar regressions.

Location:

trunk

Files:

• test/segment.cc (modified) (4 diffs)
• yat/utility/SegmentSet.h (modified) (1 diff)

trunk/test/segment.cc

@@ -41 +41 @@
 void test_operator(test::Suite& suite);
 void test_segment_map(test::Suite& suite);
+void test_segment_set(test::Suite& suite);
 void test_set_bound(test::Suite&);
 void test_union(test::Suite&);
@@ -64 +65 @@
 
   test_segment_map(suite);
+  test_segment_set(suite);
 
   return suite.return_value();
@@ -267 +269 @@
 }
 
+
 void test_segment_map(test::Suite& suite)
 {
@@ -303 +306 @@
 }
 
+
+void test_segment_set(test::Suite& suite)
+{
+  SegmentSet<double> set;
+  Segment<double> segment(0.12,23.2);
+  set.insert_merge(segment);
+  set.insert_merge(Segment<double>(0.12,23.2));
+  SegmentSet<double>::iterator hint = set.begin();
+  set.insert_merge(hint, segment);
+  set.insert_merge(hint, Segment<double>(0.12,23.2));
+  SegmentSet<double>::const_iterator chint = set.begin();
+  set.insert_merge(chint, segment);
+  set.insert_merge(chint, Segment<double>(0.12,23.2));
+  std::vector<Segment<double>> vec(set.begin(), set.end());
+  set.insert_merge(vec.begin(), vec.end());
+
+  // test functions inherited from SegmentTree
+  SegmentSet<double>::const_iterator citer = set.begin();
+  SegmentSet<double>::const_iterator iter = set.begin();
+
+  citer = set.end();
+  iter = set.end();
+
+  if (set.count(0.13)!=1) {
+    suite.add(false);
+    suite.err() << "error: expected count = 1\n";
+  }
+  if (set.count(0.02)!=0) {
+    suite.add(false);
+    suite.err() << "error: expected count = 0\n";
+  }
+  if (set.empty()) {
+    suite.add(false);
+    suite.err() << "error: expected empty() return false";
+  }
+  if (set.find(0.15) == set.end()) {
+    suite.add(false);
+    suite.err() << "error: find returned end()";
+  }
+  set.erase(set.begin());
+  set.clear();
+  set.erase(set.begin(), set.end());
+
+  set.insert(segment);
+  set.insert(Segment<double>(102, 200));
+
+  iter = set.lower_bound(1.0);
+  citer = set.lower_bound(1.0);
+  iter = set.upper_bound(1.0);
+  citer = set.upper_bound(1.0);
+  SegmentSet<double>::size_type s = set.size();
+  test::avoid_compiler_warning(s);
+}
+
+
 void test_segment(test::Suite& suite)
 {

trunk/yat/utility/SegmentSet.h

@@ -67 +67 @@
       std::pair<typename me::iterator, typename me::iterator> p =
         this->overlap_range(segment);
-      return insert_merge(p, segment);
+      Segment<T> tmp(segment);
+      return move_insert_merge(p, std::move(tmp));
     }