Expressions with intervals and constants

Author: jezhiggins

unit/analyses/variable-sensitivity/value_expression_evaluation/expression_evaluation.cpp

@@ -117,6 +117,31 @@ SCENARIO(
       }
     }
   }
+  GIVEN("adding a constant and an interval")
+  {
+    WHEN("1 + [2,2]")
+    {
+      auto op1 = make_constant(val1, environment, ns);
+      auto op2 = make_interval(val2, val2, environment, ns);
+      auto result = add_as_interval(op1, op2, environment, ns);
+
+      THEN("= [3,3]")
+      {
+        EXPECT(result, val3, val3);
+      }
+    }
+    WHEN("1 + [2,4]")
+    {
+      auto op1 = make_constant(val1, environment, ns);
+      auto op2 = make_interval(val2, val4, environment, ns);
+      auto result = add_as_interval(op1, op2, environment, ns);
+
+      THEN("= [3,5]")
+      {
+        EXPECT(result, val3, val5);
+      }
+    }
+  }
   GIVEN("adding a constant and a value set")
   {
     WHEN("1 + { 2 }")
@@ -237,6 +262,31 @@ SCENARIO(
       }
     }
   }
+  GIVEN("adding an interval and a constant")
+  {
+    WHEN("[2,2] + 1")
+    {
+      auto op1 = make_interval(val2, val2, environment, ns);
+      auto op2 = make_constant(val1, environment, ns);
+      auto result = add_as_interval(op1, op2, environment, ns);
+
+      THEN("= [3,3]")
+      {
+        EXPECT(result, val3, val3);
+      }
+    }
+    WHEN("[2,4] + 1")
+    {
+      auto op1 = make_interval(val2, val4, environment, ns);
+      auto op2 = make_constant(val1, environment, ns);
+      auto result = add_as_interval(op1, op2, environment, ns);
+
+      THEN("= [3,5]")
+      {
+        EXPECT(result, val3, val5);
+      }
+    }
+  }
 
   GIVEN("adding two value_sets")
   {

unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp

@@ -9,8 +9,8 @@
 #include "variable_sensitivity_test_helpers.h"
 #include <analyses/variable-sensitivity/abstract_environment.h>
 #include <ansi-c/ansi_c_language.h>
-#include <util/mathematical_types.h>
 #include <testing-utils/use_catch.h>
+#include <util/mathematical_types.h>
 #include <util/string_utils.h>
 
 std::shared_ptr<value_set_abstract_objectt>
@@ -163,9 +163,6 @@ void EXPECT(
 
   auto expected_interval = constant_interval_exprt(lower_value, upper_value);
   auto result_expr = result->to_interval();
-  INFO(
-    "Expect " + expr_to_str(result_expr) + " to equal " +
-    expr_to_str(expected_interval));
   REQUIRE(result_expr == expected_interval);
 }