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?

src/logics/ArithLogic.h

src/symbols/SymStore.h

src/tsolvers/lasolver/LASolver.h

src/rewriters/DivModRewriter.h

src/logics/Logic.h

src/logics/ArithLogic.h

src/symbols/SymStore.h

src/logics/ArithLogic.cc

BritikovKI · 2024-11-28T10:59:16Z

isNonlin is temporarily needed, we don't do RealDiv refinement in the DivModRefinement because we expect originally that by the time of refinement RealDiv no longer exist in the instance(removed during parsing). So we need to check if there is nonlin RealDiv in the formula as well as multiplication...

src/api/MainSolver.cc

src/common/CMakeLists.txt

src/logics/ArithLogic.h

src/simplifiers/LA.cc

src/tsolvers/lasolver/LASolver.cc

src/tsolvers/lasolver/LASolver.h

test/regression/base/arithmetic/miniexample3.smt2

src/common/CMakeLists.txt

src/common/NonLinException.h

src/logics/ArithLogic.h

src/logics/ArithLogic.cc

src/logics/ArithLogic.h

src/logics/ArithLogic.cc

src/logics/ArithLogic.h

src/logics/ArithLogic.cc

blishko · 2024-11-29T12:28:58Z

src/logics/ArithLogic.cc

+    simp.simplify(getTimesLinForSort(returnSort), flatten_args, s_new, args);
+    if (!isTimes(s_new)) return mkFun(s_new, std::move(args));
+    PTRef coef = PTRef_Undef;
+    std::vector<PTRef> vars;
+    //    return mkFun(s_new, std::move(args));
+    // Splitting Multiplication into constant and variable subterms
+    for (int i = 0; i < args.size(); i++) {
+        if (isConstant(args[i])) {
+            assert(coef == PTRef_Undef);
+            coef = args[i];
+            continue;
+        }
+        vars.push_back(args[i]);
    }
+    assert(!vars.empty());
+    PTRef tr;
+    if (vars.size() > 1) {
+        if (coef == PTRef_Undef) {
+            tr = mkFun(getTimesNonlinForSort(returnSort), vars);
+        } else {
+            tr = mkFun(s_new, {coef, mkFun(getTimesNonlinForSort(returnSort), vars)});
+        }
+    } else {
+        tr = mkFun(s_new, {coef, vars[0]});
+    }
+    return tr;


Note to myself. It would be good if we can avoid this complicated piece of code. It feels like the code in simplify should take care of most of this.

Ideally simplify would order args in some way
(For example, if there is a constant, it would be always in new_args[0])

Then, indeed, pretty much everything can be handled with simplify...

src/tsolvers/lasolver/LASolver.cc

blishko

Some more comments.

blishko · 2024-12-13T13:14:38Z

src/api/MainSolver.cc


    if (config.dump_query()) printCurrentAssertionsAsQuery();

    if (rval == s_Undef) {
        try {
            rval = solve();
-        } catch (std::overflow_error const & error) { rval = s_Error; }
+        } catch (std::overflow_error const & error) { rval = s_Error; } catch (NonLinException const & error) {


Suggested change

} catch (std::overflow_error const & error) { rval = s_Error; } catch (NonLinException const & error) {

} catch (std::overflow_error const & error) {

rval = s_Error;

} catch (NonLinException const & error) {

Is this some formatter thing? The two catch clauses should not be on the same line.

blishko · 2024-12-13T13:17:17Z

src/logics/ArithLogic.h

@@ -380,6 +388,9 @@ class ArithLogic : public Logic {
    PTRef mkBinaryGeq(PTRef lhs, PTRef rhs) { return mkBinaryLeq(rhs, lhs); }
    PTRef mkBinaryLt(PTRef lhs, PTRef rhs) { return mkNot(mkBinaryGeq(lhs, rhs)); }
    PTRef mkBinaryGt(PTRef lhs, PTRef rhs) { return mkNot(mkBinaryLeq(lhs, rhs)); }
+    SymRef declareFun_Multiplication_LinNonlin(std::string const & s, SRef rsort, vec<SRef> const & args) {


There should be a better place for this method than between mkBinaryGt and mkBinaryEq.

blishko · 2024-12-13T13:22:25Z

src/logics/ArithLogic.cc

+            assert(logic.isPlus(polyTerm) || logic.isTimesNonlin(polyTerm));
            for (PTRef factor : logic.getPterm(polyTerm)) {
-                auto [var, c] = logic.splitTermToVarAndConst(factor);
+                auto [var, c] = logic.splitPolyTerm(factor);


Nonlinear multiplication should be handled as a factor, not as a sum, no? I think this is not correct.

blishko · 2024-12-13T13:31:37Z

src/tsolvers/lasolver/LASolver.cc

-    assert(logic.isNumVar(sum) || logic.isPlus(sum) || logic.isTimes(sum));
-    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.isNumVar(sum) || logic.isPlus(sum) || logic.isTimesLinOrNonlin(sum));


Would this express the cases better?

Suggested change

assert(logic.isNumVar(sum) || logic.isPlus(sum) || logic.isTimesLinOrNonlin(sum));

assert(logic.isPlus(sum) or logic.isTimesLin(sum) or logic.isMonomial(sum);

blishko · 2024-12-13T13:32:57Z

src/tsolvers/lasolver/LASolver.cc

        x = getLAVar_single(v);
+        assert(logic.isNumVar(v) || (laVarMapper.isNegated(v) && logic.isNumVar(logic.mkNeg(v))));


Why has the assert moved? Just keep it in the original place, no?

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

NonlinWork: added new functions, rework of the accessible parts

68ac42d

blishko reviewed Nov 27, 2024

View reviewed changes

Tomaqa reviewed Nov 27, 2024

View reviewed changes

src/logics/ArithLogic.h Outdated Show resolved Hide resolved

src/symbols/SymStore.h Outdated Show resolved Hide resolved

src/logics/ArithLogic.cc Outdated Show resolved Hide resolved

BritikovKI mentioned this pull request Nov 28, 2024

Update DivModRewriter.h so it could handle Nonlin multiplication #815

Open

BritikovKI force-pushed the nonlin-la-preds branch from dcfff4e to 68062a8 Compare November 28, 2024 11:02

BritikovKI requested review from blishko and Tomaqa November 28, 2024 11:03

blishko requested changes Nov 28, 2024

View reviewed changes

BritikovKI force-pushed the nonlin-la-preds branch 7 times, most recently from f5e5502 to 00adce9 Compare November 28, 2024 17:07

blishko requested changes Nov 28, 2024

View reviewed changes

BritikovKI force-pushed the nonlin-la-preds branch from 00adce9 to c34e1ba Compare November 29, 2024 09:08

blishko requested changes Nov 29, 2024

View reviewed changes

NonlinWork: Fixes according to comments

1668eff

BritikovKI force-pushed the nonlin-la-preds branch 4 times, most recently from eca54b4 to 7e441a2 Compare November 29, 2024 16:54

NonlinWork: Nonlin Real division is no longer supported

adaea42

BritikovKI force-pushed the nonlin-la-preds branch from 7e441a2 to adaea42 Compare November 29, 2024 16:59

BritikovKI mentioned this pull request Dec 2, 2024

Implement handling of nonlin Real division #816

Open

NonlinWork: small fixes and optimisations

cdb3164

BritikovKI requested a review from blishko December 2, 2024 14:44

blishko reviewed Dec 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nonlin LA preds #790

Nonlin LA preds #790

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

BritikovKI commented Nov 28, 2024

blishko Nov 29, 2024

BritikovKI Dec 2, 2024

blishko left a comment

blishko Dec 13, 2024

blishko Dec 13, 2024

blishko Dec 13, 2024

blishko Dec 13, 2024

blishko Dec 13, 2024

	assert(logic.isNumVar(sum) \|\| logic.isPlus(sum) \|\| logic.isTimesLinOrNonlin(sum));
	assert(logic.isPlus(sum) or logic.isTimesLin(sum) or logic.isMonomial(sum);

		x = getLAVar_single(v);
		assert(logic.isNumVar(v) \|\| (laVarMapper.isNegated(v) && logic.isNumVar(logic.mkNeg(v))));

Nonlin LA preds #790

Are you sure you want to change the base?

Nonlin LA preds #790

Conversation

BritikovKI commented Oct 29, 2024 • edited Loading

Allows to create nonlin functions

aehyvari commented Nov 4, 2024 • edited Loading

aehyvari commented Nov 4, 2024 • edited Loading

BritikovKI commented Nov 5, 2024 • edited Loading

BritikovKI commented Nov 28, 2024

blishko Nov 29, 2024

Choose a reason for hiding this comment

BritikovKI Dec 2, 2024

Choose a reason for hiding this comment

blishko left a comment

Choose a reason for hiding this comment

blishko Dec 13, 2024

Choose a reason for hiding this comment

blishko Dec 13, 2024

Choose a reason for hiding this comment

blishko Dec 13, 2024

Choose a reason for hiding this comment

blishko Dec 13, 2024

Choose a reason for hiding this comment

blishko Dec 13, 2024

Choose a reason for hiding this comment

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