Review fixes.

base/base.pro

@@ -42,7 +42,6 @@ HEADERS += \
     const_helper.hpp \
     exception.hpp \
     internal/message.hpp \
-    interval_set.hpp \
     limited_priority_queue.hpp \
     logging.hpp \
     macros.hpp \

base/base_tests/base_tests.pro

@@ -19,7 +19,6 @@ SOURCES += \
   condition_test.cpp \
   const_helper.cpp \
   containers_test.cpp \
-  interval_set_test.cpp \
   logging_test.cpp \
   math_test.cpp \
   matrix_test.cpp \

search/interval_set.hpp

@@ -7,14 +7,17 @@
 
 namespace my
 {
-// This class represents a set of disjoint half-opened intervals.
+// This class represents a set of disjoint intervals in the form
+// [begin, end).  Note that neighbour intervals are always coalesced,
+// so while [0, 1), [1, 2) and [2, 3) are disjoint, after addition to
+// the set they will be stored as a single [0, 3).
 template <typename TElem>
 class IntervalSet
 {
 public:
   using TInterval = pair<TElem, TElem>;
 
-  // Adds an |interval| to the set.
+  // Adds an |interval| to the set, coalescing adjacent intervals if needed.
   //
   // Complexity: O(num of intervals intersecting with |interval| +
   // log(total number of intervals)).
@@ -27,7 +30,7 @@ public:
   // log(total number of intervals)).
   void SubtractFrom(TInterval const & interval, vector<TInterval> & difference) const;
 
-  // Returns all elements of a set as a set of intervals.
+  // Returns all elements of the set as a set of intervals.
   //
   // Complexity: O(1).
   inline set<TInterval> const & Elems() const { return m_intervals; }
@@ -56,7 +59,7 @@ void IntervalSet<TElem>::Add(TInterval const & interval)
   TElem from = interval.first;
   TElem to = interval.second;
 
-  // Update |from| and |to| in accordance with corner intervals (if any).
+  // Updates |from| and |to| in accordance with corner intervals (if any).
   if (begin != end)
   {
     if (begin->first < from)
@@ -69,9 +72,9 @@ void IntervalSet<TElem>::Add(TInterval const & interval)
   }
 
   // Now all elements [from, to) can be added to the set as a single
-  // interval which replace all intervals in [begin, end). But note
-  // that it can be possible to merge new interval with its neighbors,
-  // so we need to check it.
+  // interval which will replace all intervals in [begin, end). But
+  // note that it can be possible to merge new interval with its
+  // neighbors, so following code checks it.
   if (begin != m_intervals.begin())
   {
     auto prevBegin = begin;
@@ -108,12 +111,12 @@ void IntervalSet<TElem>::SubtractFrom(TInterval const & interval,
   {
     if (it->first > from)
     {
-      difference.emplace_back(from, min(it->first, to));
+      difference.emplace_back(from, it->first);
       from = it->second;
     }
     else
     {
-      from = std::max(from, it->second);
+      from = max(from, it->second);
     }
   }
 

search/retrieval.cpp

@@ -1,6 +1,7 @@
 #include "search/retrieval.hpp"
 
 #include "search/feature_offset_match.hpp"
+#include "search/interval_set.hpp"
 
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
@@ -10,7 +11,6 @@
 #include "coding/reader_wrapper.hpp"
 
 #include "base/assert.hpp"
-#include "base/interval_set.hpp"
 
 #include "std/algorithm.hpp"
 #include "std/cmath.hpp"
@@ -222,7 +222,7 @@ public:
         coverage = covering::SortAndMergeIntervals(coverage);
         coverage.erase(
             remove_if(coverage.begin(), coverage.end(), [this](covering::IntervalT const & interval)
-                      {
+            {
               return m_visited.Elems().count(interval) != 0;
             }),
             coverage.end());

search/search.pro

@@ -16,6 +16,7 @@ HEADERS += \
     house_detector.hpp \
     indexed_value.hpp \
     intermediate_result.hpp \
+    interval_set.hpp \
     keyword_lang_matcher.hpp \
     keyword_matcher.hpp \
     latlon_match.hpp \

search/search_tests/interval_set_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "base/interval_set.hpp"
+#include "search/interval_set.hpp"
 
 #include "std/initializer_list.hpp"
 
@@ -49,6 +49,21 @@ UNIT_TEST(IntervalSet_Add)
   CheckSet(set, {TInterval<int>(-4, 10)});
 }
 
+UNIT_TEST(IntervalSet_AdjacentIntervalAdd)
+{
+  IntervalSet<int> set;
+  TEST(set.Elems().empty(), ());
+
+  set.Add(TInterval<int>(100, 106));
+  CheckSet(set, {TInterval<int>(100, 106)});
+
+  set.Add(TInterval<int>(106, 110));
+  CheckSet(set, {TInterval<int>(100, 110)});
+
+  set.Add(TInterval<int>(90, 100));
+  CheckSet(set, {TInterval<int>(90, 110)});
+}
+
 UNIT_TEST(IntervalSet_SubtractFrom)
 {
   IntervalSet<int> set;
@@ -89,13 +104,6 @@ UNIT_TEST(IntervalSet_SubtractFrom)
     TEST_EQUAL(difference, expected, ());
   }
 
-  {
-    vector<TInterval<int>> difference;
-    set.SubtractFrom(TInterval<int>(1, 5), difference);
-    vector<TInterval<int>> expected{TInterval<int>(2, 4)};
-    TEST_EQUAL(difference, expected, ());
-  }
-
   {
     vector<TInterval<int>> difference;
     set.SubtractFrom(TInterval<int>(5, 7), difference);

search/search_tests/search_tests.pro

@@ -18,6 +18,7 @@ SOURCES += \
     ../../testing/testingmain.cpp \
     algos_tests.cpp \
     house_detector_tests.cpp \
+    interval_set_test.cpp \
     keyword_lang_matcher_test.cpp \
     keyword_matcher_test.cpp \
     latlon_match_test.cpp \