Skip to content

Commit 7422f4c

Browse files
author
BaierD
committed
Reduce complexity of prover based shutdown getter
1 parent b8ccbe0 commit 7422f4c

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

src/org/sosy_lab/java_smt/basicimpl/AbstractProver.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,11 @@ public void close() {
169169
}
170170

171171
@Override
172-
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
173-
return getShutdownManagerForProverImpl();
174-
}
175-
176-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
172+
public ShutdownManager getShutdownManagerForProver() {
177173
// Override this with the prover specific ShutdownManagers notifier for supporting solvers.
178174
// The solver should then use the prover specific ShutdownManagers notifier for stopping
179175
// instead of the contexts' notifier!
180176
throw new UnsupportedOperationException(
181-
"The chosen solver does not support isolated prover " + "shutdown");
177+
"The chosen solver does not support isolated prover shutdown");
182178
}
183179
}

src/org/sosy_lab/java_smt/solvers/bitwuzla/BitwuzlaTheoremProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ protected BitwuzlaModel getEvaluatorWithoutChecks() {
252252
}
253253

254254
@Override
255-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
255+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
256256
return proverShutdownManager;
257257
}
258258

src/org/sosy_lab/java_smt/solvers/cvc4/CVC4TheoremProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public void close() {
264264
}
265265

266266
@Override
267-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
267+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
268268
return proverShutdownManager;
269269
}
270270
}

src/org/sosy_lab/java_smt/solvers/mathsat5/Mathsat5AbstractProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public void callback(long[] model) throws InterruptedException {
291291
}
292292

293293
@Override
294-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
294+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
295295
return proverShutdownManager;
296296
}
297297
}

src/org/sosy_lab/java_smt/solvers/opensmt/OpenSmtAbstractProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public void close() {
293293
}
294294

295295
@Override
296-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
296+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
297297
return proverShutdownManager;
298298
}
299299
}

src/org/sosy_lab/java_smt/solvers/yices2/Yices2TheoremProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void close() {
220220
}
221221

222222
@Override
223-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
223+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
224224
return proverShutdownManager;
225225
}
226226
}

src/org/sosy_lab/java_smt/solvers/z3/Z3AbstractProver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public <R> R allSat(AllSatCallback<R> callback, List<BooleanFormula> important)
264264
}
265265

266266
@Override
267-
protected ShutdownManager getShutdownManagerForProverImpl() throws UnsupportedOperationException {
267+
public ShutdownManager getShutdownManagerForProver() throws UnsupportedOperationException {
268268
return proverShutdownManager;
269269
}
270270
}

0 commit comments

Comments
 (0)