-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for Strings and Rationals to the Princess backend #391
base: master
Are you sure you want to change the base?
Commits on Dec 6, 2021
-
Configuration menu - View commit details
-
Copy full SHA for ccc281a - Browse repository at this point
Copy the full SHA ccc281aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f7be15 - Browse repository at this point
Copy the full SHA 1f7be15View commit details
Commits on Dec 15, 2021
-
Please apply 'ant format-diff' before commiting, or the extended version 'ant format-source'.
Configuration menu - View commit details
-
Copy full SHA for 99337b7 - Browse repository at this point
Copy the full SHA 99337b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 625a0b6 - Browse repository at this point
Copy the full SHA 625a0b6View commit details -
Princess: revert from Scala 2.13 to Scala 2.12.
Scala is not upwards and not downwards compatible. The upcoming Ostrich library is only available for Scala 2.12, so we downgrade Scala for Princess.
Configuration menu - View commit details
-
Copy full SHA for b7bbc3c - Browse repository at this point
Copy the full SHA b7bbc3cView commit details
Commits on Dec 16, 2021
-
adding dependency for Ostrich into JavaSMT.
This is an initial step and the usage is still unclear. This is not tested.
Configuration menu - View commit details
-
Copy full SHA for 53a1885 - Browse repository at this point
Copy the full SHA 53a1885View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6f62e05 - Browse repository at this point
Copy the full SHA 6f62e05View commit details -
Configuration menu - View commit details
-
Copy full SHA for d59e56c - Browse repository at this point
Copy the full SHA d59e56cView commit details
Commits on Jan 14, 2022
-
Configuration menu - View commit details
-
Copy full SHA for adaa89c - Browse repository at this point
Copy the full SHA adaa89cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 27faaa7 - Browse repository at this point
Copy the full SHA 27faaa7View commit details -
Configuration menu - View commit details
-
Copy full SHA for f8b0c3d - Browse repository at this point
Copy the full SHA f8b0c3dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5df33fe - Browse repository at this point
Copy the full SHA 5df33feView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9a7e920 - Browse repository at this point
Copy the full SHA 9a7e920View commit details -
Configuration menu - View commit details
-
Copy full SHA for 451b0f3 - Browse repository at this point
Copy the full SHA 451b0f3View commit details
Commits on Jan 16, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 3aaf54b - Browse repository at this point
Copy the full SHA 3aaf54bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 34b71ed - Browse repository at this point
Copy the full SHA 34b71edView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ad41d3 - Browse repository at this point
Copy the full SHA 0ad41d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for e9707d1 - Browse repository at this point
Copy the full SHA e9707d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for f7f9da5 - Browse repository at this point
Copy the full SHA f7f9da5View commit details
Commits on Nov 12, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 53c0b4b - Browse repository at this point
Copy the full SHA 53c0b4bView commit details
Commits on Nov 18, 2023
-
Configuration menu - View commit details
-
Copy full SHA for ebe926f - Browse repository at this point
Copy the full SHA ebe926fView commit details
Commits on Nov 19, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8b906ec - Browse repository at this point
Copy the full SHA 8b906ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1936c40 - Browse repository at this point
Copy the full SHA 1936c40View commit details -
Configuration menu - View commit details
-
Copy full SHA for dac5ac4 - Browse repository at this point
Copy the full SHA dac5ac4View commit details -
Princess: disable some tests for formula structure with rational/real…
… theory and arrays. Princess intenally converts all real-arrays to int-arrays and thus there is some casting and quantification in SMT.
Configuration menu - View commit details
-
Copy full SHA for 2df018b - Browse repository at this point
Copy the full SHA 2df018bView commit details -
Princess: fix UF application on non-rational arguments like integers.
Princess needs non-rational UF arguments to be explicitly casted to rational.
Configuration menu - View commit details
-
Copy full SHA for 449a87c - Browse repository at this point
Copy the full SHA 449a87cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2eb9dbf - Browse repository at this point
Copy the full SHA 2eb9dbfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4871bdc - Browse repository at this point
Copy the full SHA 4871bdcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4652de9 - Browse repository at this point
Copy the full SHA 4652de9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2dde64b - Browse repository at this point
Copy the full SHA 2dde64bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c9f2b8 - Browse repository at this point
Copy the full SHA 8c9f2b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for d680735 - Browse repository at this point
Copy the full SHA d680735View commit details -
Configuration menu - View commit details
-
Copy full SHA for a40f42a - Browse repository at this point
Copy the full SHA a40f42aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 13c01a6 - Browse repository at this point
Copy the full SHA 13c01a6View commit details
Commits on Sep 6, 2024
-
Merge branch 'master' into 257-more-theories-for-princess
# Conflicts: # .idea/JavaSMT.iml # .idea/copyright/JavaSMT.xml # lib/ivy.xml # src/org/sosy_lab/java_smt/solvers/princess/PrincessEnvironment.java
Configuration menu - View commit details
-
Copy full SHA for ec6ebaf - Browse repository at this point
Copy the full SHA ec6ebafView commit details -
Princess: Fetch Ostrich 1.3.5 from Maven. This is a temporary fix tha…
…t should be removed once Ostrich has been updated in our own repository. The new version is needed as it fixes a bug (uuverifiers/princess#9) that affected two of our tests in StringFormulaManagerTest
Configuration menu - View commit details
-
Copy full SHA for 262bb96 - Browse repository at this point
Copy the full SHA 262bb96View commit details -
Princess: Disable two tests in StringFormulaManagerTest that will tim…
…eout for Princess
Configuration menu - View commit details
-
Copy full SHA for b503024 - Browse repository at this point
Copy the full SHA b503024View commit details
Commits on Sep 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3175cf1 - Browse repository at this point
Copy the full SHA 3175cf1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0210289 - Browse repository at this point
Copy the full SHA 0210289View commit details -
Princess: Disable String test that use (escaped) Unicode literals. Pr…
…incess does seem to support unicode characters as part of its Strings and we may just want to remove the escape sequence
Configuration menu - View commit details
-
Copy full SHA for 29d25c3 - Browse repository at this point
Copy the full SHA 29d25c3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 85ebb3d - Browse repository at this point
Copy the full SHA 85ebb3dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f99740d - Browse repository at this point
Copy the full SHA f99740dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8eee565 - Browse repository at this point
Copy the full SHA 8eee565View commit details -
Princess: Replace "a str.<= b" with "a str.< b | a == b" to work arou…
…nd an issue in Princess/Ostrich
Configuration menu - View commit details
-
Copy full SHA for abc11e5 - Browse repository at this point
Copy the full SHA abc11e5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1610229 - Browse repository at this point
Copy the full SHA 1610229View commit details -
Configuration menu - View commit details
-
Copy full SHA for 076d626 - Browse repository at this point
Copy the full SHA 076d626View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5df2ce6 - Browse repository at this point
Copy the full SHA 5df2ce6View commit details
Commits on Sep 8, 2024
-
Princess: Avoid using Scala Seq in PrincessStringFormulaManager to av…
…oid CI complaints
Configuration menu - View commit details
-
Copy full SHA for 9c6ca0e - Browse repository at this point
Copy the full SHA 9c6ca0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for c546357 - Browse repository at this point
Copy the full SHA c546357View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7767d2a - Browse repository at this point
Copy the full SHA 7767d2aView commit details
Commits on Sep 10, 2024
-
Princess: Add test cases from the bug reports written by @kfriedberger.…
… See uuverifiers/princess#7 and uuverifiers/princess#8
Configuration menu - View commit details
-
Copy full SHA for 51bec64 - Browse repository at this point
Copy the full SHA 51bec64View commit details -
Configuration menu - View commit details
-
Copy full SHA for fd9ae85 - Browse repository at this point
Copy the full SHA fd9ae85View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ea532a - Browse repository at this point
Copy the full SHA 0ea532aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9f4d16c - Browse repository at this point
Copy the full SHA 9f4d16cView commit details -
Princess: Disable a test in ArrayFormulaManagerTest for Princess. The…
… test uses rational numbers as indices/elements for an array, which is not supported by Princess.
Configuration menu - View commit details
-
Copy full SHA for c89c6ac - Browse repository at this point
Copy the full SHA c89c6acView commit details -
Configuration menu - View commit details
-
Copy full SHA for a65769c - Browse repository at this point
Copy the full SHA a65769cView commit details -
Princess: Removed default arguments for OFlags in PrincessNativeAPITe…
…st. These were added by accident: Ostrich 1.3.5 only requires 13 arguments, while the new version 1.4-pre requires 15
Configuration menu - View commit details
-
Copy full SHA for 47def53 - Browse repository at this point
Copy the full SHA 47def53View commit details -
Princess: Disable a test in SolverTheoriesTest that uses rational num…
…bers as array elements. See c89c6ac
Configuration menu - View commit details
-
Copy full SHA for 96c4d61 - Browse repository at this point
Copy the full SHA 96c4d61View commit details -
Princess: Renamed list of (non-boolean) variables in PrincessAbstract…
…Prover from intSymbols` to `theorySymbols` as it may not only contain integer variables.
Configuration menu - View commit details
-
Copy full SHA for 296d8e4 - Browse repository at this point
Copy the full SHA 296d8e4View commit details -
Princess: Add a workaround to evaluate rational formulas with Princes…
…s. Extending the partial model does not seem to work in this case, so we need to (temporarily) add the formula to the assertion stack and then re-run the sat-check to get the value. This should work around the issues in uuverifiers/princess#7 and uuverifiers/princess#8
Configuration menu - View commit details
-
Copy full SHA for 5b77984 - Browse repository at this point
Copy the full SHA 5b77984View commit details
Commits on Sep 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for da11b8f - Browse repository at this point
Copy the full SHA da11b8fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ea2941 - Browse repository at this point
Copy the full SHA 0ea2941View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6eb0f67 - Browse repository at this point
Copy the full SHA 6eb0f67View commit details -
Configuration menu - View commit details
-
Copy full SHA for f5dffee - Browse repository at this point
Copy the full SHA f5dffeeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 30c1fe7 - Browse repository at this point
Copy the full SHA 30c1fe7View commit details -
Princess: Disable all tests that require use operations with only non…
…-singleton strings as their arguments. Ostrich does not support such operations yet, although the feature will likely be added later. See uuverifiers/ostrich#88 for some details.
Configuration menu - View commit details
-
Copy full SHA for 9569292 - Browse repository at this point
Copy the full SHA 9569292View commit details -
Princess: Re-enable testStringPrefixSuffix from StringFormulaManagerT…
…est. This one was disabled by accident in the last commit.
Configuration menu - View commit details
-
Copy full SHA for f843131 - Browse repository at this point
Copy the full SHA f843131View commit details -
Princess: Re-enable native prefixSuffixTest in PrincessNativeAPITest.…
… This bug has been fixed in uuverifiers/ostrich#87
Configuration menu - View commit details
-
Copy full SHA for 76efd95 - Browse repository at this point
Copy the full SHA 76efd95View commit details -
Configuration menu - View commit details
-
Copy full SHA for f661c10 - Browse repository at this point
Copy the full SHA f661c10View commit details -
Princess: Removed
Rational.int
andRational.frac
from the list of…… constant symbols. Princess will generate terms like (Rat_int(-1 * Rat_frac(0, 10)) that would have to be rewritten first before they can be evaluated to a rational number.
Configuration menu - View commit details
-
Copy full SHA for 2e570a2 - Browse repository at this point
Copy the full SHA 2e570a2View commit details -
Configuration menu - View commit details
-
Copy full SHA for d761b17 - Browse repository at this point
Copy the full SHA d761b17View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d7df5f - Browse repository at this point
Copy the full SHA 2d7df5fView commit details
Commits on Sep 12, 2024
-
Princess: Disable term abbreviations as they seem to cause Princess t…
…o crash when non-linear terms are used
Configuration menu - View commit details
-
Copy full SHA for 3bc04a8 - Browse repository at this point
Copy the full SHA 3bc04a8View commit details -
Princess: Remove parameters 14 and 15 for the OFlags constructor. Tho…
…se are only needed for Ostrich 1.4 and later.
Configuration menu - View commit details
-
Copy full SHA for 2c06c70 - Browse repository at this point
Copy the full SHA 2c06c70View commit details -
Princess: Remove workaround for a bug in Ostrich. The str.<= operatio…
…n was not reflexive and returned `false` if both arguments are the same. This has reported in uuverifiers/ostrich#89 and is now fixed
Configuration menu - View commit details
-
Copy full SHA for c83063e - Browse repository at this point
Copy the full SHA c83063eView commit details -
Configuration menu - View commit details
-
Copy full SHA for a1764de - Browse repository at this point
Copy the full SHA a1764deView commit details -
Princess: Fix evalImpl() for formulas that are equations over rationa…
…ls (f.ex "1/3 <= y"). This extends the workaround we already use for terms to equations as Princess seems to have a bug when it comes to evaluating rational terms
Configuration menu - View commit details
-
Copy full SHA for 3b7229a - Browse repository at this point
Copy the full SHA 3b7229aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4c78733 - Browse repository at this point
Copy the full SHA 4c78733View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2636f5e - Browse repository at this point
Copy the full SHA 2636f5eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1e8176f - Browse repository at this point
Copy the full SHA 1e8176fView commit details
Commits on Sep 13, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3e1dad8 - Browse repository at this point
Copy the full SHA 3e1dad8View commit details -
Configuration menu - View commit details
-
Copy full SHA for bbf9b9c - Browse repository at this point
Copy the full SHA bbf9b9cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e950269 - Browse repository at this point
Copy the full SHA e950269View commit details -
Configuration menu - View commit details
-
Copy full SHA for 872944f - Browse repository at this point
Copy the full SHA 872944fView commit details
Commits on Sep 15, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c161f00 - Browse repository at this point
Copy the full SHA c161f00View commit details -
Revert "Princess: Fix evalImpl() for formulas that are equations over…
… rationals (f.ex "1/3 <= y"). This extends the workaround we already use for terms to equations as Princess seems to have a bug when it comes to evaluating rational terms" This reverts commit 3b7229a
Configuration menu - View commit details
-
Copy full SHA for f3a277e - Browse repository at this point
Copy the full SHA f3a277eView commit details
Commits on Sep 16, 2024
-
Configuration menu - View commit details
-
Copy full SHA for c2b685b - Browse repository at this point
Copy the full SHA c2b685bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6beb6f5 - Browse repository at this point
Copy the full SHA 6beb6f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9e1d69d - Browse repository at this point
Copy the full SHA 9e1d69dView commit details -
Princess: Work around a bug in princess where multiplying a rational …
…variable by zero returns an integer term
Configuration menu - View commit details
-
Copy full SHA for ea21421 - Browse repository at this point
Copy the full SHA ea21421View commit details
Commits on Sep 18, 2024
-
Princess: Enabled tests for arrays with rational indices/elements. Th…
…ese were temporarily disabled due to a bug that has now been fixed. See uuverifiers/princess#11
Configuration menu - View commit details
-
Copy full SHA for 6351613 - Browse repository at this point
Copy the full SHA 6351613View commit details -
Princess: Add two comments about failed tests in FomulaClassifierTest…
…. The problem here is that Princess introduces quantifiers when rationals are used, not that arrays can't be combined with rational numbers.
Configuration menu - View commit details
-
Copy full SHA for 6fc4b9a - Browse repository at this point
Copy the full SHA 6fc4b9aView commit details -
Princess: Added a comment to testDivisionByZero test. Princess does s…
…upport division by zero, but it currently seems to be broken for rationals (at least with the way we're using them)
Configuration menu - View commit details
-
Copy full SHA for 43c2c83 - Browse repository at this point
Copy the full SHA 43c2c83View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b6102d - Browse repository at this point
Copy the full SHA 3b6102dView commit details
Commits on Sep 21, 2024
-
Revert "Princess: Disable term abbreviations as they seem to cause Pr…
…incess to crash when non-linear terms are used" This reverts commit 3bc04a8.
Configuration menu - View commit details
-
Copy full SHA for fa38940 - Browse repository at this point
Copy the full SHA fa38940View commit details
Commits on Oct 16, 2024
-
Princess: Clean up dependencies and prepare for upgrading Princess/Os…
…trich to the latest release
Configuration menu - View commit details
-
Copy full SHA for e075090 - Browse repository at this point
Copy the full SHA e075090View commit details -
Configuration menu - View commit details
-
Copy full SHA for ce2e7f9 - Browse repository at this point
Copy the full SHA ce2e7f9View commit details -
Princess: Throw and UnsupportedOperationExcpetion in PrincessRational…
…FormulaManager, rather than an AssertionError
Configuration menu - View commit details
-
Copy full SHA for 52fd628 - Browse repository at this point
Copy the full SHA 52fd628View commit details -
Configuration menu - View commit details
-
Copy full SHA for 98e49f7 - Browse repository at this point
Copy the full SHA 98e49f7View commit details
Commits on Oct 19, 2024
-
Configuration menu - View commit details
-
Copy full SHA for bcb696d - Browse repository at this point
Copy the full SHA bcb696dView commit details -
Princess: Fix handling of broken Unicode sequences "\\u{" with no clo…
…sing bracket in PrincessStringFormulaManager
Configuration menu - View commit details
-
Copy full SHA for 9320257 - Browse repository at this point
Copy the full SHA 9320257View commit details -
Princess: Throw an exception in PrincessStringFormulaManager.unescape…
…String when trying to parse a \u{...} character with 5 digits. Such escape sequences are valid in SMTLIB, but can't be supported by us for Princess as we are restricted to the BMP in UTF16. We also added a test for this special case.
Configuration menu - View commit details
-
Copy full SHA for 3648bf0 - Browse repository at this point
Copy the full SHA 3648bf0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 441e947 - Browse repository at this point
Copy the full SHA 441e947View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0e949d7 - Browse repository at this point
Copy the full SHA 0e949d7View commit details
Commits on Oct 20, 2024
-
Configuration menu - View commit details
-
Copy full SHA for ba486a5 - Browse repository at this point
Copy the full SHA ba486a5View commit details -
Princess: Stopped using the partial model for Model.evaluate()
We're now evaluating formulas directly on the stack as there are several issues in Princess that block us from using the partial model with rational numbers. Once those issues have been resolved we can revert this change and move back to using the partial model.
Configuration menu - View commit details
-
Copy full SHA for 21abead - Browse repository at this point
Copy the full SHA 21abeadView commit details -
Solved a concurrent modification issues in AbstractProver when models…
… would unregister themselves from the prover while being closed by it.
Configuration menu - View commit details
-
Copy full SHA for 5cfbef7 - Browse repository at this point
Copy the full SHA 5cfbef7View commit details
Commits on Nov 13, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 7ea3b68 - Browse repository at this point
Copy the full SHA 7ea3b68View commit details
Commits on Nov 16, 2024
-
remove transitive dependency from Ostrich to JavaCup.
This fixes a compilation error when ant tries to find JavaCup 11a. We already provide JavaCup 11b explicitly.
Configuration menu - View commit details
-
Copy full SHA for a2d2497 - Browse repository at this point
Copy the full SHA a2d2497View commit details -
Configuration menu - View commit details
-
Copy full SHA for 922dd53 - Browse repository at this point
Copy the full SHA 922dd53View commit details -
Configuration menu - View commit details
-
Copy full SHA for fd8e810 - Browse repository at this point
Copy the full SHA fd8e810View commit details -
Princess: Restore ivysettings.xml to its original version
This will revert the changes made in 262bb96 to simplify development.
Configuration menu - View commit details
-
Copy full SHA for ae05a8b - Browse repository at this point
Copy the full SHA ae05a8bView commit details
Commits on Nov 17, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 1b4ff68 - Browse repository at this point
Copy the full SHA 1b4ff68View commit details -
Configuration menu - View commit details
-
Copy full SHA for 669743f - Browse repository at this point
Copy the full SHA 669743fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 69517ec - Browse repository at this point
Copy the full SHA 69517ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for e6bc8f1 - Browse repository at this point
Copy the full SHA e6bc8f1View commit details -
improve counter by making it non-static.
and change import of Map-Entry for consistency.
Configuration menu - View commit details
-
Copy full SHA for 0c70424 - Browse repository at this point
Copy the full SHA 0c70424View commit details