Jakob Rath
f54f33551e
Merge branch 'master' into polysat
2023-05-26 15:58:09 +02:00
Nikolaj Bjorner
1319b64bb0
fix #6692
2023-04-17 09:11:16 -07:00
Nikolaj Bjorner
b75d81f3c2
fix #6690
2023-04-14 16:38:33 -07:00
Nikolaj Bjorner
eba0732629
fix #6675
...
disable remove_unused_defs from pb-solver until it is integrated with model reconstruction.
2023-04-12 19:50:13 -07:00
Nikolaj Bjorner
4a142b0f81
fix #6623
2023-04-09 21:10:24 -07:00
Clemens Eisenhofer
7b513b4a40
Some UP bugfixes in the new core ( #6673 )
2023-04-08 12:50:46 -07:00
Nikolaj Bjorner
ae57475483
fix bug in conflict::is_valid exposed by testing unit propagation
2023-04-02 14:54:20 -07:00
Nikolaj Bjorner
2a11be5c39
reorder
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-03-28 16:27:08 -07:00
Nikolaj Bjorner
2a8c7a7cd7
build issue for linux/clang
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-03-28 16:02:09 -07:00
Nikolaj Bjorner
8a3a3dc91b
fix #6648
2023-03-26 15:31:37 -07:00
Nikolaj Bjorner
2683a2d6ed
fix #6637
2023-03-22 08:49:33 +01:00
Nikolaj Bjorner
1ba86c8ce3
fixup assertion
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-03-16 08:38:10 +01:00
Nikolaj Bjorner
622b8431b3
use v1, v2 instead of r1, r2 (roots) to get narrower equality conflicts
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-03-16 08:26:42 +01:00
Nikolaj Bjorner
c8e3ab75dc
fix unsoundness bug related to tracking equality assumptions outside of polysat
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-03-16 06:23:17 +01:00
Lev Nachmanson
ea16f6608c
before rm lu
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-03-08 10:27:05 -08:00
Nikolaj Bjorner
6c00d40513
polysat fixes
...
1. ensure that force_push is invoked before polysat updates state.
2. extract conflicts based on dependencies of both new literal that was conflicting with existing literal that had its value assigned based on dependencies.
2023-03-06 17:35:39 -08:00
Nikolaj Bjorner
42076a3c13
bug fixes to new core, elim_predicates and elim_unconstrained
2023-03-05 22:26:37 -08:00
Lev Nachmanson
92fe8c5968
restore the previous state
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-03-03 18:30:17 -08:00
Lev Nachmanson
ff1dc0424c
rm lp_solver
2023-03-03 16:32:49 -08:00
Lev Nachmanson
5e4bca3d26
small removals
2023-03-03 15:58:25 -08:00
Lev Nachmanson
2dd30fa350
rm lp_primal_simplex
2023-03-03 15:44:50 -08:00
Lev Nachmanson
8989e10e71
rm lp_dual_simplex
2023-03-03 15:41:30 -08:00
Lev Nachmanson
d2e8297d41
remove includes of lp_dual_simplex
2023-03-03 15:38:47 -08:00
Nikolaj Bjorner
fd97be0e3e
move sat.smt.proof.check_rup into solver.proof.check_rup #6616
2023-03-01 21:03:27 -08:00
Nikolaj Bjorner
25d45a3500
fixes and tests for arith-sls
2023-02-28 17:40:09 -08:00
Nikolaj Bjorner
6450ad82f4
fixup proof logging
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-27 14:46:26 -08:00
Nikolaj Bjorner
8be6dcce31
finish adding eqs to bv_solver justifications
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-24 10:21:56 -08:00
Nikolaj Bjorner
706d542eeb
add propagation justification to bv antecedents
2023-02-23 17:52:34 -08:00
Jakob Rath
645f4620de
catch default case
2023-02-23 10:56:12 +01:00
Nikolaj Bjorner
146f0eae06
wip - arith local search
2023-02-20 12:17:14 -08:00
Jakob Rath
af683ea5f9
avoid fallback to circuit
2023-02-20 12:09:11 +01:00
Jakob Rath
7f41761616
xnor
2023-02-20 11:56:23 +01:00
Nikolaj Bjorner
bc6037464d
clean up build warnings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-19 10:08:31 -08:00
Nikolaj Bjorner
c0f80f92ba
deal with compiler warnings (unused variables etc)
2023-02-18 17:53:37 -08:00
Nikolaj Bjorner
c5e33b79b5
wip - arith sls
...
overhaul to tier inequalities with Boolean variables instead of literals
2023-02-18 14:11:48 -08:00
Nikolaj Bjorner
bd10ddf6ae
wip - local search - use dispatch model from bool local search instead of separate phases.
2023-02-16 09:17:11 -08:00
Nikolaj Bjorner
c1ecc49021
wip - local search - move to plugin model
2023-02-15 13:32:30 -08:00
Nikolaj Bjorner
44fcf60a72
wip experiments with sls
2023-02-14 15:06:26 -08:00
Nikolaj Bjorner
2b77012993
fix build
2023-02-13 08:36:12 -08:00
Nikolaj Bjorner
52804b5c8f
save on dtt
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-13 08:29:32 -08:00
Nikolaj Bjorner
7956cf1201
annotate arith_sls
2023-02-12 20:55:44 -08:00
Nikolaj Bjorner
bb81bc5452
fix #6580
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-12 20:21:53 -08:00
Nikolaj Bjorner
102eee77dc
patch regressions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-12 20:12:01 -08:00
Nikolaj Bjorner
5e30323b1a
wip - bounded local search for arithmetic
2023-02-11 15:46:39 -08:00
Nikolaj Bjorner
4b2c166e8b
fixes to build
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2023-02-11 10:19:24 -08:00
Nikolaj Bjorner
7bef2f3e6f
wip - local search for euf/arithmetic
2023-02-11 09:33:43 -08:00
Nikolaj Bjorner
d22e4aa525
wip - integrating arithmetic local search
2023-02-11 09:33:42 -08:00
Nikolaj Bjorner
1b0c76e3f0
fixes to mbqi in the new core based on #6575
2023-02-10 16:56:06 -08:00
Nikolaj Bjorner
a8335f2d5e
use phase
2023-02-07 19:50:45 -08:00
Nikolaj Bjorner
b3ebce3966
fix compilation
2023-02-07 19:30:45 -08:00