Nonlin LA preds #790

BritikovKI · 2024-10-29T15:16:19Z

Allows to create nonlin functions

Removed all of the constraints for the creation of nonlin predicates inside of the functions.
Only the assertions are checked for nonlinearity

aehyvari · 2024-11-04T09:33:26Z

The code fails with this input

(set-logic QF_LIA)
(define-fun uninterp_mul ((a Int) (b Int)) Int (mod a b))
(assert (= (uninterp_mul 1 2) 0))
(check-sat)
(exit)

Here's the output:

(error "Divisor must be constant in linear logic")

(error "define-fun returns an unknown sort")

(error "Unknown symbol `uninterp_mul Int Int'")

(error "assertion returns an unknown sort")

sat

src/itehandler/IteToSwitch.cc

src/logics/ArithLogic.cc

src/logics/ArithLogic.h

src/logics/Logic.h

test/regression/base/arithmetic/miniexample2.smt2

test/unit/test_ArithLogicApi.cc

test/unit/test_Rewriting.cc

aehyvari · 2024-11-04T10:18:20Z

For our limited form of axioms this might actually be just enough. One thing is missing before I can put this to our production: To be sure that we're running the correct version, I'd need to have the version information from opensmt. See issue #800 .

BritikovKI · 2024-11-05T13:59:36Z

Ok, I think generally PR is over

Though, we definitely need some sort of error handling, LANonLinearException produces errors with different format under different complilers rn. Should it be a different issue though?

…ion upd

…olver, updated multiplication asserts

Tomaqa · 2025-03-17T10:02:03Z

src/tsolvers/lasolver/LASolver.cc

 {
    assert(logic.isAtom(tr));
    assert(logic.isLeq(tr));
    auto [cons, sum] = logic.leqToConstantAndTerm(tr);


Suggested change

auto [cons, sum] = logic.leqToConstantAndTerm(tr);

[[maybe_unused]] auto const [cons, sum] = logic.leqToConstantAndTerm(tr);

I would also change the name of the function to assertIsProperLeq with [[maybe_unused]] PTRef tr

Tomaqa · 2025-03-17T10:02:15Z

src/tsolvers/lasolver/LASolver.cc

-    assert(!logic.isTimes(sum) || ((logic.isNumVar(logic.getPterm(sum)[0]) && logic.isOne(logic.mkNeg(logic.getPterm(sum)[1]))) ||
-                                   (logic.isNumVar(logic.getPterm(sum)[1]) && logic.isOne(logic.mkNeg(logic.getPterm(sum)[0])))));
+    assert(logic.isPlus(sum) or logic.isTimesLin(sum) or logic.isMonomial(sum));
    (void) cons; (void)sum;


Suggested change

(void) cons; (void)sum;

Tomaqa · 2025-03-17T10:07:33Z

src/tsolvers/lasolver/LASolver.cc


 LVRef LASolver::getLAVar_single(PTRef expr_in) {
-
+    if (logic.isTimesNonlin(expr_in)) { throw NonLinException(logic.pp(expr_in)); }


Can we do a function for this? Like logic.checkIsNotNonlin. Then, for example, changing the error message would be necessary to update in just one place.

Tomaqa · 2025-10-24T15:27:33Z

src/symbols/SymStore.h

-        return newSymb(fname, rsort, args, SymConf::Default);
+        return newSymbImpl(fname, rsort, args, SymConf::Default, false);
+    }
+    SymRef newInternalSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig) {


Add also the variant with the default config, as done in the case of newSymb.

Tomaqa · 2025-10-24T15:37:02Z

src/symbols/SymStore.h

    // Constructs a new symbol.
-    SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig);
+
+    SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig) {


Suggested change

SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig) {

SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig = SymConf::Default) {

Tomaqa · 2025-10-24T15:37:30Z

src/symbols/SymStore.h

    SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args) {
-        return newSymb(fname, rsort, args, SymConf::Default);
+        return newSymbImpl(fname, rsort, args, SymConf::Default, false);
+    }


Tomaqa · 2025-10-24T16:03:27Z

src/symbols/SymStore.cc

+SymRef SymStore::newSymbImpl(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig,
+                             bool isInternal) {


After I studied a bit Symbol.h, I believe we should integrate an internal flag into SymbolConfig (e.g. similarly to isInterpreted) instead of this isInternal parameter. This would be compatible with the existing code, allowing to use it also with declareFun etc. Connected to this, I think we should remove SymConf and instead allow graceful construction of SymbolConfig, possibly also adding some getters. For example, I see that noScoping implies isInterpreted (I dunno why, though).

That part of the code is very much historical, to put it nicely. noScoping would probably mean that the symbol is a reserved word. that could well be the reason why it's isInterpreted. I'm not convinced that the choices I made when introducing those fields were very informed. I encourage you to look at them with a critical eye.

BritikovKI force-pushed the nonlin-la-preds branch 8 times, most recently from d89fbf6 to b1f40d9 Compare October 31, 2024 11:43

BritikovKI marked this pull request as ready for review October 31, 2024 15:09

BritikovKI force-pushed the nonlin-la-preds branch from b1f40d9 to b300ed9 Compare October 31, 2024 15:10

blishko reviewed Nov 4, 2024

View reviewed changes

BritikovKI force-pushed the nonlin-la-preds branch from c0605cd to 78b01bc Compare November 4, 2024 10:11

BritikovKI force-pushed the nonlin-la-preds branch 3 times, most recently from 46d12d9 to 8acd08a Compare November 4, 2024 10:25

BritikovKI linked an issue Nov 4, 2024 that may be closed by this pull request

Opensmt rejects non-linear integer arithmetic too eagerly #655

Open

BritikovKI force-pushed the nonlin-la-preds branch 11 times, most recently from 2810c10 to 32f3743 Compare November 5, 2024 13:51

BritikovKI force-pushed the nonlin-la-preds branch from f765dab to 8399ba1 Compare February 26, 2025 09:38

BritikovKI added 20 commits February 26, 2025 10:39

NonlinWork: initial commit

e6b6825

NonlinWork: additional fixes concerning division and nonlin

5d38ae6

NonlinWork: fix of tests and code rework

2708b6d

NonlinWork: PR cleanup

18c229c

NonlinWork: added PR-connected regression tests

77221ec

NonlinWork: added support for mod

840371b

NonlinWork: moved and updated the Nonlin checks, tests rework, except…

e56747b

…ion upd

NonlinWork: catching exceptions, few fixes

afdf97c

NonlinWork: update to atomic Nonlin checks, propper checks in the LAS…

57f0e28

…olver, updated multiplication asserts

NonlinWork: fix of the print in MainSolver

4fce17f

NonlinWork: changed splitTerm

c90b71d

NonlinWork: changes in multiplication handling

2ae9020

NonlinWork: single symbol for multiplication

c45998d

NonlinWork: duplicate symbol creation

e3379bc

NonlinWork: SubSymbol notion

7379dc5

NonlinWork: added sym_Int_TIMES_LIN

8a06e78

NonlinWork: added new functions, rework of the accessible parts

eafefbd

NonlinWork: Fixes according to comments

6a72bae

NonlinWork: Nonlin Real division is no longer supported

23651e9

NonlinWork: small fixes and optimisations

56eedb0

BritikovKI force-pushed the nonlin-la-preds branch from 8399ba1 to c974f2b Compare February 26, 2025 09:39

NonlinWork: review fixes

469252e

BritikovKI force-pushed the nonlin-la-preds branch from c974f2b to 469252e Compare February 27, 2025 13:25

BritikovKI force-pushed the nonlin-la-preds branch from 0a88022 to 469252e Compare March 11, 2025 09:12

Tomaqa self-requested a review March 17, 2025 10:01

Tomaqa reviewed Mar 17, 2025

View reviewed changes

Tomaqa self-requested a review October 24, 2025 15:24

Tomaqa reviewed Oct 24, 2025

View reviewed changes

	auto [cons, sum] = logic.leqToConstantAndTerm(tr);
	[[maybe_unused]] auto const [cons, sum] = logic.leqToConstantAndTerm(tr);


		LVRef LASolver::getLAVar_single(PTRef expr_in) {

		if (logic.isTimesNonlin(expr_in)) { throw NonLinException(logic.pp(expr_in)); }

	SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig) {
	SymRef newSymb(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig = SymConf::Default) {

		SymRef SymStore::newSymbImpl(char const * fname, SRef rsort, vec<SRef> const & args, SymbolConfig const & symConfig,
		bool isInternal) {

Nonlin LA preds #790

Are you sure you want to change the base?

Nonlin LA preds #790

Uh oh!

Conversation

BritikovKI commented Oct 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Allows to create nonlin functions

Uh oh!

aehyvari commented Nov 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

aehyvari commented Nov 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BritikovKI commented Nov 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

BritikovKI commented Oct 29, 2024 •

edited

Loading

aehyvari commented Nov 4, 2024 •

edited

Loading

aehyvari commented Nov 4, 2024 •

edited

Loading

BritikovKI commented Nov 5, 2024 •

edited

Loading