From 074c1ac8c2011b270eab4838a3462f4f0e85f57f Mon Sep 17 00:00:00 2001
From: Nicolas Voirol <voirol.nicolas@gmail.com>
Date: Tue, 11 Oct 2016 14:28:27 +0200
Subject: [PATCH] Small fixes for solver factories
---
src/main/scala/inox/solvers/SolverFactory.scala | 2 +-
.../scala/inox/solvers/combinators/PortfolioSolverFactory.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/scala/inox/solvers/SolverFactory.scala b/src/main/scala/inox/solvers/SolverFactory.scala
index 9ce18f966..d7b17734b 100644
--- a/src/main/scala/inox/solvers/SolverFactory.scala
+++ b/src/main/scala/inox/solvers/SolverFactory.scala
@@ -121,7 +121,7 @@ object SolverFactory {
}
def apply(p: InoxProgram, opts: Options): SolverFactory { val program: p.type; type S <: TimeoutSolver } =
- p.ctx.options.findOptionOrDefault(InoxOptions.optSelectedSolvers).toSeq match {
+ opts.findOptionOrDefault(InoxOptions.optSelectedSolvers).toSeq match {
case Seq() => throw FatalError("No selected solver")
case Seq(single) => apply(single, p, opts)
case multiple => PortfolioSolverFactory(p) {
diff --git a/src/main/scala/inox/solvers/combinators/PortfolioSolverFactory.scala b/src/main/scala/inox/solvers/combinators/PortfolioSolverFactory.scala
index dd62ddd6b..edc4ed5e2 100644
--- a/src/main/scala/inox/solvers/combinators/PortfolioSolverFactory.scala
+++ b/src/main/scala/inox/solvers/combinators/PortfolioSolverFactory.scala
@@ -26,7 +26,7 @@ trait PortfolioSolverFactory extends SolverFactory { self =>
}
object PortfolioSolverFactory {
- def apply(p: InoxProgram)
+ def apply(p: Program)
(factories: Seq[SolverFactory { val program: p.type; type S <: TimeoutSolver }]):
PortfolioSolverFactory { val program: p.type; type S <: TimeoutSolver } = new {
val program: p.type = p
--
GitLab