Add solver independent quantifier elimination with ultimate eliminator #462
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
format code add missing UltimateEliminator dependencies
…k most solvers (now 152 tests run over all solvers compared to 89 before)
…bles for quantifiers
…ion_with_ultimate_eliminator # Conflicts: # .idea/JavaSMT.iml # lib/ivy.xml # src/org/sosy_lab/java_smt/solvers/princess/PrincessSolverContext.java # src/org/sosy_lab/java_smt/test/RationalFormulaManagerTest.java
…er_elimination_with_ultimate_eliminator # Conflicts: # src/org/sosy_lab/java_smt/solvers/boolector/BoolectorQuantifiedFormulaManager.java # src/org/sosy_lab/java_smt/solvers/mathsat5/Mathsat5NativeApi.java # src/org/sosy_lab/java_smt/test/QuantifierManagerTest.java
…to EXTERNAL_QUANTIFIER_CREATION for more clarity
baierd
requested changes
Mar 21, 2025
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
| @@ -32,7 +54,78 @@ private BooleanFormula wrap(TFormulaInfo formulaInfo) { | |||
| @Override | |||
| public BooleanFormula eliminateQuantifiers(BooleanFormula pF) | |||
| throws InterruptedException, SolverException { | |||
| return wrap(eliminateQuantifiers(extractInfo(pF))); | |||
| if (options != null | |||
There was a problem hiding this comment.
This looks like a switch-case expression.
There was a problem hiding this comment.
How should I approach this? My options array is not compatible for switch-case.
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
| return fmgr.orElseThrow(); | ||
| } | ||
|
|
||
| public void setFmgr(AbstractFormulaManager<TFormulaInfo, TType, TEnv, TFuncDecl> pFmgr) { |
There was a problem hiding this comment.
This should not be public. You can simply add this method to the AbstractSolverContexts constructor, so that it is always used if there is a QuantifiedFormulaManager present. This makes it possible to handle it fully automatically and reduce the visibility to protected.
There was a problem hiding this comment.
To use it in the AbstractSolverContexts constructor, I would have to add it to the QuantifiedFormulaManager Interface, which would implicitly make it public again.
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Outdated
Show resolved
Hide resolved
src/org/sosy_lab/java_smt/basicimpl/AbstractQuantifiedFormulaManager.java
Show resolved
Hide resolved
This reverts commit 9d86ef4.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(To get the right formula information: with visitor get the name and type of bound variables)