3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-07 08:21:56 +00:00
Commit graph

455 commits

Author SHA1 Message Date
Lev Nachmanson
f336039da3 snap variables to bounds when maximizing terms
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-03-13 15:28:50 -07:00
Nikolaj Bjorner
75b1e8fe27 add tracing for 2157
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-12 20:12:17 -07:00
Nikolaj Bjorner
5c13acbf9f remove print directive that doesn't compile
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 20:48:13 -08:00
Nikolaj Bjorner
0c0e79a937 add logging to lar-solver to capture state for unbounded optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 20:33:12 -08:00
Nikolaj Bjorner
19e7b75536 set status optimal also on object
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 19:31:51 -08:00
Nikolaj Bjorner
7aa8b4ac2a restrict idiv-bound checks to bounded terms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 19:11:22 -08:00
Nikolaj Bjorner
3723c1af0a
Merge pull request #2166 from levnach/Prover
fixes in indices in lar_solver::maximize_term()
2019-03-03 13:00:51 -08:00
Lev Nachmanson
06725de477 fixes in indices in lar_solver::maximize_term()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-03-03 10:57:25 -10:00
Nikolaj Bjorner
7399f78dfd disable model compression for regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 12:40:59 -08:00
Nikolaj Bjorner
3ee5c0e7d9 fix #2164 address some of simplification shortcommings from #2151 #2152 #2153
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 11:33:44 -08:00
Lev Nachmanson
69f03952a7 enable lar_solver::constraint_holds
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-02-28 12:11:34 -10:00
Daniel Schemmel
721ea2a8d3
Move vector.h to old_vector.h and add a shim vector.h
To do so, one instance of the class keyword needs to be removed.
2019-02-21 15:38:08 +01:00
Bruce Mitchener
e570940662 Prefer using empty rather than size comparisons. 2018-11-27 21:42:04 +07:00
Lev Nachmanson
67ea2a2c88 test
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-11-20 09:52:43 -08:00
Florian Pigorsch
326bf401b9 Fix some spelling errors (mostly in comments). 2018-10-20 17:07:41 +02:00
Michał Janiszewski
844f400a62 Remove superfluous const from returned types 2018-10-16 19:30:48 +02:00
Lev
99339798ee fix the value oflar_solver.m_status during pop()
Signed-off-by: Lev <levnach@hotmail.com>
2018-10-04 19:43:01 -07:00
Nikolaj Bjorner
7082d85115
Merge pull request #1860 from waywardmonkeys/modernize-use-override
Use 'override' where possible.
2018-10-01 20:43:56 -07:00
Bruce Mitchener
373b691709 Use 'override' where possible. 2018-10-02 10:26:38 +07:00
Nikolaj Bjorner
3c7e7a7ffd
Merge pull request #1852 from janisozaur/unused-const
Drop unused CV-qualifiers from scalar return values
2018-10-01 20:10:21 -07:00
Nikolaj Bjorner
4bc6720af7
Merge pull request #1853 from janisozaur/solve-ax-eq-b
Add missing template instantion for lar_core_solver::m_r_solver
2018-10-01 20:09:50 -07:00
Bruce Mitchener
cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Michał Janiszewski
661826e27f Add missing template instantion for lar_core_solver::m_r_solver 2018-10-01 21:35:48 +02:00
Michał Janiszewski
cdbfd9654f Drop unused CV-qualifiers from scalar return values 2018-10-01 21:14:25 +02:00
Christoph M. Wintersteiger
35bf63d563 Fixed filename in CMakeLists.txt 2018-10-01 12:29:14 +01:00
Christoph M. Wintersteiger
f0e74b7f2a Fix for module name clash (and thus linking error) in the Visual Studio solution. 2018-10-01 12:11:42 +01:00
Lev
5d586c8fd1 set lar_solver.m_status = UNKNOWN in the constructor
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-30 15:12:50 -07:00
Lev Nachmanson
e68deab443 Merge branch 'master' of https://github.com/Z3Prover/z3 2018-09-25 13:34:23 -07:00
Lev Nachmanson
0b2b6b1306 assert all_constraints_hold() rarely
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-09-25 13:33:30 -07:00
Lev Nachmanson
066b5334ad refactor some parameters into fields in Gomory cuts
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-09-22 20:57:59 -07:00
Lev Nachmanson
43f89dc2cc changes in column_info of lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-09-22 12:01:24 -07:00
Nikolaj Bjorner
d75b6fd9c1 remove offsets from terms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-20 11:06:05 -07:00
Nikolaj Bjorner
dcda39e76e merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-19 17:12:32 -07:00
Nikolaj Bjorner
3c553c17e8 fix dump utility for cuts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-19 14:32:56 -07:00
Lev Nachmanson
a99ebed907 keep the coefficients of 'at lower' variables positive, and the rest negative for Gomory cuts
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-09-19 10:17:27 -07:00
Nikolaj Bjorner
ed19af4c4e merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-19 09:02:37 -07:00
Lev Nachmanson
b90d571d9a fixing the build
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-09-18 15:36:01 -07:00
Lev
041458f97a fixes the +- bug in gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-18 14:42:32 -07:00
Lev
b940b7873b work on Gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-18 13:47:18 -07:00
Lev
ca3ce964ce work on Gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-18 13:34:05 -07:00
Lev
106b677201 fixes in gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-15 17:47:54 -07:00
Lev
34bdea750c fixes in gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-15 17:46:16 -07:00
Lev
8c122ba9bd fixes in gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-15 17:33:35 -07:00
Lev
03d55426bb fixes in gomory cut
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-15 17:15:46 -07:00
Lev
324396e403 separate the gomory cut functionality in a separate file
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 17:12:49 -07:00
Lev
26764b076f adjust cuts and branch (m_t and m_k) for terms
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 12:39:46 -07:00
Lev
257ba6218f remove gomory.h
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 11:54:10 -07:00
Lev
22213a9e73 rebase
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 11:53:54 -07:00
Lev
5dee39721a rebase
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 11:52:14 -07:00
Lev
e705e5a309 branch on inf basic in gomory
Signed-off-by: Lev <levnach@hotmail.com>
2018-09-14 11:49:39 -07:00