From 549d0eda656863c1f137ac72b23ac0d81219942d Mon Sep 17 00:00:00 2001 From: Levente Bajczi Date: Thu, 22 Jun 2023 19:24:15 +0200 Subject: [PATCH] optimized imports after rebase --- .../hu/bme/mit/theta/xsts/cli/XstsCli.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/subprojects/xsts/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java b/subprojects/xsts/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java index e00c91b548..9c2de244a6 100644 --- a/subprojects/xsts/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java +++ b/subprojects/xsts/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java @@ -7,21 +7,14 @@ import com.google.common.io.Files; import com.google.common.io.MoreFiles; import com.google.common.io.RecursiveDeleteOption; -import hu.bme.mit.theta.analysis.*; +import hu.bme.mit.theta.analysis.Action; +import hu.bme.mit.theta.analysis.Prec; +import hu.bme.mit.theta.analysis.State; +import hu.bme.mit.theta.analysis.Trace; import hu.bme.mit.theta.analysis.algorithm.SafetyResult; import hu.bme.mit.theta.analysis.algorithm.cegar.CegarStatistics; -<<<<<<< HEAD import hu.bme.mit.theta.analysis.algorithm.runtimecheck.ArgCexCheckHandler; -import hu.bme.mit.theta.analysis.algorithm.tracegen.TraceGenChecker; -import hu.bme.mit.theta.analysis.expl.ExplPrec; import hu.bme.mit.theta.analysis.expl.ExplState; -import hu.bme.mit.theta.analysis.expl.ExplStmtAnalysis; -import hu.bme.mit.theta.analysis.expl.ExplStmtOptimizer; -import hu.bme.mit.theta.analysis.expr.StmtAction; -======= ->>>>>>> a709678ee (Writing generated traces into files) -import hu.bme.mit.theta.analysis.expl.ExplState; -import hu.bme.mit.theta.analysis.expr.ExprState; import hu.bme.mit.theta.analysis.expr.refinement.PruneStrategy; import hu.bme.mit.theta.analysis.utils.ArgVisualizer; import hu.bme.mit.theta.analysis.utils.TraceVisualizer; @@ -34,18 +27,14 @@ >>>>>>> a709678ee (Writing generated traces into files) import hu.bme.mit.theta.common.table.TableWriter; import hu.bme.mit.theta.common.visualization.Graph; import hu.bme.mit.theta.common.visualization.writer.GraphvizWriter; -<<<<<<< HEAD import hu.bme.mit.theta.solver.SolverFactory; import hu.bme.mit.theta.solver.SolverManager; import hu.bme.mit.theta.solver.smtlib.SmtLibSolverManager; -import hu.bme.mit.theta.solver.Solver; -======= ->>>>>>> a709678ee (Writing generated traces into files) -import hu.bme.mit.theta.core.decl.VarDecl; import hu.bme.mit.theta.solver.z3.Z3SolverFactory; import hu.bme.mit.theta.solver.z3.Z3SolverManager; import hu.bme.mit.theta.xsts.XSTS; -import hu.bme.mit.theta.xsts.analysis.*; +import hu.bme.mit.theta.xsts.analysis.XstsAction; +import hu.bme.mit.theta.xsts.analysis.XstsState; import hu.bme.mit.theta.xsts.analysis.concretizer.TraceGenerationXstsTraceConcretizerUtil; import hu.bme.mit.theta.xsts.analysis.concretizer.XstsStateSequence; import hu.bme.mit.theta.xsts.analysis.concretizer.XstsTraceConcretizerUtil;