indentation, alleqal inv

src/main/scala/de/tum/workflows/Main.scala

@@ -117,11 +117,16 @@ object Main extends App with LazyLogging {
     if (checkinvariants) {
       
       def invariants = List(
-          timeNoninter _, 
-          timeAllEqual _
+          InvariantChecker.invariantNoninterStubborn _,
+          InvariantChecker.invariantAllEqual _
       )
 
-      def msgs = invariants.map(_(spec))
+      def msgs = for (inv <- invariants) yield {
+        val (t, (safe, msg)) = time {
+          InvariantChecker.checkInvariant(spec.w, inv(spec), true)
+        }
+        s"Proving Invariant (took $t ms):\n$msg\n"
+      }
 
       write(s"$FOLDER/${name}.inv", msgs.mkString("\n"))
     }

src/main/scala/de/tum/workflows/toz3/InvariantChecker.scala

@@ -74,7 +74,7 @@ object InvariantChecker extends LazyLogging {
         msg ++= s"Possibly unsafe: Block may not uphold invariant:\n\n${e.label}\n\n"
         if (res == Status.SATISFIABLE) {
           msg ++= "Satisfying model:\n"
-          msg ++= toZ3.printModel(solver.getModel())
+          msg ++= toZ3.printModel(solver.getModel()).lines.map("  " + _).mkString("\n")
         } else if (res == Status.UNKNOWN) {
           msg ++= s"Z3 result: $res (${solver.getReasonUnknown()})\n"
         }