Optimizing imports.

cheshire · cheshire · commit 24f074d1cb26 · 2016-08-19T18:07:15.000+02:00
diff --git a/src/org/sosy_lab/java_smt/api/BooleanFormulaManager.java b/src/org/sosy_lab/java_smt/api/BooleanFormulaManager.java
@@ -21,9 +21,9 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
-import org.sosy_lab.java_smt.visitors.BooleanFormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/src/org/sosy_lab/java_smt/api/FormulaManager.java b/src/org/sosy_lab/java_smt/api/FormulaManager.java
@@ -22,9 +22,9 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
 import org.sosy_lab.common.Appender;
-import org.sosy_lab.java_smt.visitors.FormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.FormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/BooleanFormulaTransformationVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/BooleanFormulaTransformationVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import com.google.common.collect.Collections2;
 
diff --git a/src/org/sosy_lab/java_smt/api/visitors/BooleanFormulaVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/BooleanFormulaVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.BooleanFormulaManager;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/DefaultBooleanFormulaVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/DefaultBooleanFormulaVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/DefaultFormulaVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/DefaultFormulaVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/ExpectedFormulaVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/ExpectedFormulaVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.java_smt.api.Formula;
 
diff --git a/src/org/sosy_lab/java_smt/api/visitors/FormulaTransformationVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/FormulaTransformationVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/FormulaVisitor.java b/src/org/sosy_lab/java_smt/api/visitors/FormulaVisitor.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import org.sosy_lab.common.rationals.Rational;
 import org.sosy_lab.java_smt.api.BooleanFormula;
diff --git a/src/org/sosy_lab/java_smt/api/visitors/TraversalProcess.java b/src/org/sosy_lab/java_smt/api/visitors/TraversalProcess.java
@@ -17,7 +17,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
 
 import com.google.common.collect.ImmutableSet;
 
diff --git a/src/org/sosy_lab/java_smt/api/visitors/package-info.java b/src/org/sosy_lab/java_smt/api/visitors/package-info.java
@@ -22,4 +22,4 @@
  * The visitors of this package allow for efficient traversal, manipulation
  * and transformation of formulas.
  */
-package org.sosy_lab.java_smt.visitors;
+package org.sosy_lab.java_smt.api.visitors;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/AbstractBooleanFormulaManager.java b/src/org/sosy_lab/java_smt/basicimpl/AbstractBooleanFormulaManager.java
@@ -35,11 +35,11 @@
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.util.ArrayDeque;
 import java.util.Arrays;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/AbstractFormulaManager.java b/src/org/sosy_lab/java_smt/basicimpl/AbstractFormulaManager.java
@@ -35,11 +35,11 @@
 import org.sosy_lab.java_smt.api.IntegerFormulaManager;
 import org.sosy_lab.java_smt.api.RationalFormulaManager;
 import org.sosy_lab.java_smt.api.Tactic;
+import org.sosy_lab.java_smt.api.visitors.FormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 import org.sosy_lab.java_smt.basicimpl.tactics.NNFVisitor;
 import org.sosy_lab.java_smt.basicimpl.tactics.UfElimination;
-import org.sosy_lab.java_smt.visitors.FormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/FormulaCreator.java b/src/org/sosy_lab/java_smt/basicimpl/FormulaCreator.java
@@ -37,16 +37,16 @@
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
 import org.sosy_lab.java_smt.api.NumeralFormula.IntegerFormula;
 import org.sosy_lab.java_smt.api.NumeralFormula.RationalFormula;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.ArrayFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.BitvectorFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.BooleanFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.FloatingPointFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.FloatingPointRoundingModeFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.IntegerFormulaImpl;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormula.RationalFormulaImpl;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/FormulaTransformationVisitorImpl.java b/src/org/sosy_lab/java_smt/basicimpl/FormulaTransformationVisitorImpl.java
@@ -25,7 +25,7 @@
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 
 import java.util.ArrayList;
 import java.util.Deque;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/RecursiveFormulaVisitorImpl.java b/src/org/sosy_lab/java_smt/basicimpl/RecursiveFormulaVisitorImpl.java
@@ -27,9 +27,9 @@
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
-import org.sosy_lab.java_smt.visitors.TraversalProcess.TraversalType;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess.TraversalType;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/tactics/NNFVisitor.java b/src/org/sosy_lab/java_smt/basicimpl/tactics/NNFVisitor.java
@@ -24,7 +24,7 @@
 import org.sosy_lab.java_smt.api.BooleanFormulaManager;
 import org.sosy_lab.java_smt.api.FormulaManager;
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/tactics/UfElimination.java b/src/org/sosy_lab/java_smt/basicimpl/tactics/UfElimination.java
@@ -47,8 +47,8 @@
 import org.sosy_lab.java_smt.api.NumeralFormula.IntegerFormula;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/org/sosy_lab/java_smt/basicimpl/withAssumptionsWrapper/InterpolatingProverWithAssumptionsWrapper.java b/src/org/sosy_lab/java_smt/basicimpl/withAssumptionsWrapper/InterpolatingProverWithAssumptionsWrapper.java
@@ -30,7 +30,7 @@
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
 import org.sosy_lab.java_smt.api.InterpolatingProverEnvironment;
 import org.sosy_lab.java_smt.api.SolverException;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/org/sosy_lab/java_smt/example/HoudiniApp.java b/src/org/sosy_lab/java_smt/example/HoudiniApp.java
@@ -19,7 +19,7 @@
 import org.sosy_lab.java_smt.api.ProverEnvironment;
 import org.sosy_lab.java_smt.api.SolverContext;
 import org.sosy_lab.java_smt.api.SolverContext.ProverOptions;
-import org.sosy_lab.java_smt.visitors.FormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaTransformationVisitor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/org/sosy_lab/java_smt/solvers/mathsat5/Mathsat5FormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/mathsat5/Mathsat5FormulaCreator.java
@@ -80,6 +80,7 @@
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.FloatingPointType;
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
 import org.sosy_lab.java_smt.basicimpl.FunctionDeclarationImpl;
 import org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5Formula.Mathsat5ArrayFormula;
@@ -89,7 +90,6 @@
 import org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5Formula.Mathsat5FloatingPointRoundingModeFormula;
 import org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5Formula.Mathsat5IntegerFormula;
 import org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5Formula.Mathsat5RationalFormula;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
 
 import java.math.BigInteger;
 import java.util.List;
diff --git a/src/org/sosy_lab/java_smt/solvers/princess/PrincessFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/princess/PrincessFormulaCreator.java
@@ -53,11 +53,11 @@
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
 import org.sosy_lab.java_smt.basicimpl.FunctionDeclarationImpl;
 import org.sosy_lab.java_smt.solvers.princess.PrincessFunctionDeclaration.PrincessByExampleDeclaration;
 import org.sosy_lab.java_smt.solvers.princess.PrincessFunctionDeclaration.PrincessIFunctionDeclaration;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
 
 import scala.Enumeration;
 
diff --git a/src/org/sosy_lab/java_smt/solvers/smtinterpol/SmtInterpolFormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/smtinterpol/SmtInterpolFormulaCreator.java
@@ -36,10 +36,10 @@
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
 import org.sosy_lab.java_smt.basicimpl.FunctionDeclarationImpl;
 import org.sosy_lab.java_smt.basicimpl.ObjectArrayBackedList;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
 
 import java.util.List;
 
diff --git a/src/org/sosy_lab/java_smt/solvers/smtinterpol/SmtInterpolFormulaManager.java b/src/org/sosy_lab/java_smt/solvers/smtinterpol/SmtInterpolFormulaManager.java
@@ -35,8 +35,8 @@
 import org.sosy_lab.java_smt.api.BooleanFormula;
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.basicimpl.AbstractFormulaManager;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
 
 import java.io.IOException;
 import java.util.ArrayDeque;
diff --git a/src/org/sosy_lab/java_smt/solvers/z3/Z3FormulaCreator.java b/src/org/sosy_lab/java_smt/solvers/z3/Z3FormulaCreator.java
@@ -53,6 +53,7 @@
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
 import org.sosy_lab.java_smt.api.SolverException;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
 import org.sosy_lab.java_smt.basicimpl.FormulaCreator;
 import org.sosy_lab.java_smt.basicimpl.FunctionDeclarationImpl;
 import org.sosy_lab.java_smt.solvers.z3.Z3Formula.Z3ArrayFormula;
@@ -62,7 +63,6 @@
 import org.sosy_lab.java_smt.solvers.z3.Z3Formula.Z3FloatingPointRoundingModeFormula;
 import org.sosy_lab.java_smt.solvers.z3.Z3Formula.Z3IntegerFormula;
 import org.sosy_lab.java_smt.solvers.z3.Z3Formula.Z3RationalFormula;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
diff --git a/src/org/sosy_lab/java_smt/solvers/z3/Z3InterpolatingProver.java b/src/org/sosy_lab/java_smt/solvers/z3/Z3InterpolatingProver.java
@@ -35,8 +35,8 @@
 import org.sosy_lab.java_smt.api.InterpolatingProverEnvironment;
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
 import org.sosy_lab.java_smt.api.SolverException;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java b/src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
@@ -42,7 +42,7 @@
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
 import org.sosy_lab.java_smt.api.SolverException;
 import org.sosy_lab.java_smt.api.Tactic;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/sosy_lab/java_smt/test/SolverTacticsTest.java b/src/org/sosy_lab/java_smt/test/SolverTacticsTest.java
@@ -43,7 +43,7 @@
 import org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier;
 import org.sosy_lab.java_smt.api.SolverException;
 import org.sosy_lab.java_smt.api.Tactic;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaVisitor;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java b/src/org/sosy_lab/java_smt/test/SolverVisitorTest.java
@@ -36,13 +36,13 @@
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
 import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
 import org.sosy_lab.java_smt.api.NumeralFormula.IntegerFormula;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.BooleanFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.DefaultBooleanFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.DefaultFormulaVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaTransformationVisitor;
-import org.sosy_lab.java_smt.visitors.FormulaVisitor;
-import org.sosy_lab.java_smt.visitors.TraversalProcess;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.BooleanFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.DefaultBooleanFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.DefaultFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaTransformationVisitor;
+import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.TraversalProcess;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/org/sosy_lab/java_smt/test/UFManagerTest.java b/src/org/sosy_lab/java_smt/test/UFManagerTest.java
@@ -32,7 +32,7 @@
 import org.sosy_lab.java_smt.api.Formula;
 import org.sosy_lab.java_smt.api.FormulaType;
 import org.sosy_lab.java_smt.api.FunctionDeclaration;
-import org.sosy_lab.java_smt.visitors.ExpectedFormulaVisitor;
+import org.sosy_lab.java_smt.api.visitors.ExpectedFormulaVisitor;
 
 import java.util.List;
 
