value_set_abstract_object::compact combines overlapping intervals

Author: jezhiggins

src/analyses/variable-sensitivity/value_set_abstract_object.cpp

@@ -370,8 +370,13 @@ static abstract_object_sett compact_values(const abstract_object_sett &values)
   return compacted;
 }
 
-static abstract_object_sett
-non_destructive_compact(const abstract_object_sett &values)
+static exprt eval_expr(const exprt &e);
+static bool is_le(const exprt &lhs, const exprt &rhs);
+static void
+collapse_overlapping_intervals(std::vector<constant_interval_exprt> &intervals);
+
+static std::vector<constant_interval_exprt>
+collect_intervals(const abstract_object_sett &values)
 {
   auto intervals = std::vector<constant_interval_exprt>{};
   for(auto const &object : values)
@@ -383,6 +388,45 @@ non_destructive_compact(const abstract_object_sett &values)
       intervals.push_back(as_expr);
   }
 
+  collapse_overlapping_intervals(intervals);
+
+  return intervals;
+}
+
+void collapse_overlapping_intervals(
+  std::vector<constant_interval_exprt> &intervals)
+{
+  std::sort(
+    intervals.begin(),
+    intervals.end(),
+    [](constant_interval_exprt const &lhs, constant_interval_exprt const &rhs) {
+      return is_le(lhs.get_lower(), rhs.get_lower());
+    });
+
+  size_t index = 1;
+  while(index < intervals.size())
+  {
+    auto &lhs = intervals[index - 1];
+    auto &rhs = intervals[index];
+
+    bool overlap = is_le(rhs.get_lower(), lhs.get_upper());
+    if(overlap)
+    {
+      auto upper = is_le(lhs.get_upper(), rhs.get_upper()) ? rhs.get_upper()
+                                                           : lhs.get_upper();
+      auto expanded = constant_interval_exprt(lhs.get_lower(), upper);
+      lhs = expanded;
+      intervals.erase(intervals.begin() + index);
+    }
+    else
+      ++index;
+  }
+}
+
+static abstract_object_sett
+non_destructive_compact(const abstract_object_sett &values)
+{
+  auto intervals = collect_intervals(values);
   if(intervals.empty())
     return values;
 
@@ -396,18 +440,16 @@ non_destructive_compact(const abstract_object_sett &values)
     [&intervals](const abstract_object_pointert &object) {
       return value_is_not_contained_in(object, intervals);
     });
-
+  std::transform(
+    intervals.begin(),
+    intervals.end(),
+    std::back_inserter(compacted),
+    [](const constant_interval_exprt &interval) {
+      return interval_abstract_valuet::make_interval(interval);
+    });
   return compacted;
 }
 
-exprt eval_expr(exprt e)
-{
-  auto dummy_symbol_table = symbol_tablet{};
-  auto dummy_namespace = namespacet{dummy_symbol_table};
-
-  return simplify_expr(e, dummy_namespace);
-}
-
 static abstract_object_sett
 destructive_compact(abstract_object_sett values, int slice)
 {
@@ -417,10 +459,16 @@ destructive_compact(abstract_object_sett values, int slice)
     minus_exprt(width.get_upper(), width.get_lower()),
     from_integer(slice, width.type())));
 
-  auto lower_slice = constant_interval_exprt(
-    width.get_lower(), eval_expr(plus_exprt(width.get_lower(), slice_width)));
-  auto upper_slice = constant_interval_exprt(
-    eval_expr(minus_exprt(width.get_upper(), slice_width)), width.get_upper());
+  auto lower_boundary = eval_expr(plus_exprt(width.get_lower(), slice_width));
+  auto upper_start = eval_expr(minus_exprt(width.get_upper(), slice_width));
+  if(
+    lower_boundary ==
+    upper_start) // adjust so the intervals are not immediately combined
+    upper_start = eval_expr(
+      plus_exprt(upper_start, from_integer(1, lower_boundary.type())));
+
+  auto lower_slice = constant_interval_exprt(width.get_lower(), lower_boundary);
+  auto upper_slice = constant_interval_exprt(upper_start, width.get_upper());
 
   values.insert(interval_abstract_valuet::make_interval(lower_slice));
   values.insert(interval_abstract_valuet::make_interval(upper_slice));
@@ -443,8 +491,20 @@ static bool value_is_not_contained_in(
     intervals.begin(),
     intervals.end(),
     [&as_expr](const constant_interval_exprt &interval) {
-      if(interval == as_expr)
-        return false;
       return interval.contains(as_expr);
     });
 }
+
+static exprt eval_expr(const exprt &e)
+{
+  auto symbol_table = symbol_tablet{};
+  auto ns = namespacet{symbol_table};
+
+  return simplify_expr(e, ns);
+}
+
+static bool is_le(const exprt &lhs, const exprt &rhs)
+{
+  auto is_le_expr = binary_relation_exprt(lhs, ID_le, rhs);
+  return eval_expr(is_le_expr).is_true();
+}

unit/analyses/variable-sensitivity/value_set_abstract_object/compacting.cpp

@@ -167,7 +167,70 @@ SCENARIO(
     }
   }
 
-  GIVEN("compact values to create new intervals")
+  GIVEN("compact overlapping interval together")
+  {
+    auto interval_1_2 = constant_interval_exprt(val1, val2);
+    auto interval_2_3 = constant_interval_exprt(val2, val3);
+    auto interval_3_4 = constant_interval_exprt(val3, val4);
+    auto interval_4_5 = constant_interval_exprt(val4, val5);
+    auto interval_8_10 = constant_interval_exprt(val8, val10);
+    auto interval_9_12 = constant_interval_exprt(val9, val12);
+    auto val13 = from_integer(13, type);
+    auto val14 = from_integer(14, type);
+    auto val15 = from_integer(15, type);
+
+    WHEN(
+      "compacting { 0, [1, 2], [2, 3], [3, 4], [4, 5], 6, 7, [8, 10], [9, 12], "
+      "13, 14, 15 }")
+    {
+      auto value_set = make_value_set(
+        {val0,
+         interval_1_2,
+         interval_2_3,
+         interval_3_4,
+         interval_4_5,
+         val6,
+         val7,
+         interval_8_10,
+         interval_9_12,
+         val13,
+         val14,
+         val15},
+        environment,
+        ns);
+      THEN("{ 0, [1, 5], 6, 7, [9, 12], 13, 14, 15 }")
+      {
+        auto interval_1_5 = constant_interval_exprt(val1, val5);
+        auto interval_8_12 = constant_interval_exprt(val8, val12);
+        EXPECT(
+          value_set,
+          {val0, interval_1_5, val6, val7, interval_8_12, val13, val14, val15});
+      }
+    }
+    WHEN(
+      "compacting { [1, 2], [2, 3], [3, 4], [4, 5], [8, 10], [9, 12], 0, 1, 2, "
+      "3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }")
+    {
+      auto value_set = make_value_set(
+        {val0,          val1,         val2,         val3,         val4,
+         val5,          val6,         val7,         val8,         val9,
+         val10,         val11,        val12,        val13,        val14,
+         val15,         interval_1_2, interval_2_3, interval_3_4, interval_4_5,
+         interval_8_10, interval_9_12},
+        environment,
+        ns);
+      THEN("{ 0, [1, 5], 6, 7, [9, 12], 13, 14, 15 }")
+      {
+        auto interval_1_5 = constant_interval_exprt(val1, val5);
+        auto interval_8_12 = constant_interval_exprt(val8, val12);
+        EXPECT(
+          value_set,
+          {val0, interval_1_5, val6, val7, interval_8_12, val13, val14, val15});
+      }
+    }
+  }
+
+  GIVEN("compact values into new intervals")
   {
     WHEN("compacting { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }")
     {
@@ -217,11 +280,11 @@ SCENARIO(
          val100},
         environment,
         ns);
-      THEN("{ [-100, 0], [0, 100] }")
+      THEN("{ [-100, 0], [1, 100] }")
       {
         auto interval_100minus_0 = constant_interval_exprt(val100minus, val0);
-        auto interval_0_100 = constant_interval_exprt(val0, val100);
-        EXPECT(value_set, {interval_100minus_0, interval_0_100});
+        auto interval_1_100 = constant_interval_exprt(val1, val100);
+        EXPECT(value_set, {interval_100minus_0, interval_1_100});
       }
     }
   }