fix merge

.gitignore

@@ -32,6 +32,7 @@ results/*.ltl
 results/*.ppltl
 results/*.foltl
 results/*.png
+results/*.metrics
 
 # aalta
 cnf.dimacs

src/main/java/Test.java

@@ -9,9 +9,9 @@ class Test {
     public static void main(String[] args) {
         System.out.println("Test");
 
-        var owlform = BooleanConstant.FALSE;
+        BooleanConstant owlform = BooleanConstant.FALSE;
 
-        var checksat = LanguageAnalysis.isSatisfiable(owlform);
+        boolean checksat = LanguageAnalysis.isSatisfiable(owlform);
         System.out.println(checksat);
 
     }

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

@@ -4,7 +4,7 @@ import foltl.FOLTL._
 import blocks.Workflow._
 import Implicits._
 import com.typesafe.scalalogging.LazyLogging
-import de.tum.workflows.ltl.FOTransformers
+import de.tum.workflows.foltl.FOTransformers
 import de.tum.workflows.Utils._
 import de.tum.workflows.foltl.Stubborn
 import de.tum.workflows.foltl.Properties
@@ -30,7 +30,7 @@ object InvariantInspector extends App with LazyLogging {
     logger.info(s"Encoding Spec:\n$spec")
 
     def invariant =
-      InvariantGenerator.invariantNoninterStubbornSingleBS _
+      InvariantGenerator.invariantNoninterSingleBS _
     // InvariantGenerator.invariantNoninterStubbornBS _
     // InvariantChecker.invariantNoninterStubborn _
     // InvariantChecker.invariantAllEqual _
@@ -51,7 +51,7 @@ object InvariantInspector extends App with LazyLogging {
     }
   }
   
-  inspect("omitting/conference")
-//      generateExample("tests/loopexampleNoOracle")
+//  inspect("omitting/conference")
+      inspect("tests/loopexampleNoOracle")
   //  generateAllExamples()
 }
\ No newline at end of file

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

@@ -7,10 +7,10 @@ import de.tum.workflows.Utils._
 import de.tum.workflows.foltl.Properties
 import de.tum.workflows.blocks.Spec
 import de.tum.workflows.foltl.FormulaFunctions
+import de.tum.workflows.foltl.FOTransformers
 import de.tum.workflows.owltransformer.OwlTransformer
 import owl.ltl.algorithms.LanguageAnalysis
 import owl.ltl.rewriter.SimplifierFactory
-import de.tum.workflows.ltl.FOTransformers
 
 
 object MainLTL extends App with LazyLogging {

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

@@ -10,7 +10,6 @@ import com.typesafe.scalalogging.LazyLogging
 import de.tum.workflows.Utils
 import de.tum.workflows.foltl.FOTransformers
 import de.tum.workflows.foltl.FormulaFunctions
-import it.unimi.dsi.fastutil.longs.Long2BooleanArrayMap
 
 object Z3QFree extends LazyLogging {