Adds the (rather costly) predicate to handle Until

2 files changed, 15 insertions, 0 deletions

diff --git a/cfg-to-paths/src/Main.java b/cfg-to-paths/src/Main.java
index f49a357..481d53f 100644
--- a/cfg-to-paths/src/Main.java
+++ b/cfg-to-paths/src/Main.java
@@ -100,6 +100,20 @@ public class Main
       for (int i = 1; i < tuple_size; ++i)
       {
          out.write("(contains_node " + id + " " + tuple.get(i) + ")\n");
+
+         for (int j = (i + 1); j < tuple_size; ++j)
+         {
+            out.write
+            (
+               "(is_before "
+               + id
+               + " "
+               + tuple.get(i)
+               + " "
+               + tuple.get(j)
+               + ")\n"
+            );
+         }
       }
    }
 }
diff --git a/data/level/control_flow_level_kodkod.data b/data/level/control_flow_level_kodkod.data
index 987b63e..ed11735 100644
--- a/data/level/control_flow_level_kodkod.data
+++ b/data/level/control_flow_level_kodkod.data
@@ -11,3 +11,4 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (add_predicate is_path_of path node)
 (add_predicate contains_node path node)
+(add_predicate is_before path node node)