3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Commit graph

106 commits

Author SHA1 Message Date
Lev Nachmanson 33cbd29ed0 mv util/lp to math/lp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 3b9b4d973b do not print external names in nla_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 218e155603 fix feasibility tracking in lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson d32e50bc3c fix the build
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson e6561c983f debug emons
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 884a2628de debug emons
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson c96c37e878 fix an assert
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson c557743be4 fix in rounding rows
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 7f12dfbbe8 fix in rounding rows
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 2d12874f30 fix errors in cube rounding
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 43758cbc66 more efficiend handling of rounded in cube heuristic rows
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson b47e0cd4fb fix tableau's Ax=b after cube heuristic
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 1810d7e77d cleanup mostly, more asserts in tangent lemma 2020-01-28 10:04:21 -08:00
Lev Nachmanson 9c62b431e4 address the NB's comments
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson f784120312 rebase with Z3Prover/master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 76e1aeb2bb move the indices housekeeping from theory_lra to lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 63e62ec1bb stronger lemmas to avoid branching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson b102710b2f map term indices to columns when test checking lemmas
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 5c0f76a702 fix a bug in nla_solver's divide
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev ca0ce579b1 work on order lemma
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 2993453798 remove explanation.reset() and fixes in add_var_bound()
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 1d51c5689e roll back add_var api
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 4fa38b5aa2 process conflicts immediately aftep add_var_bound()
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev c9be7b89c1 change the add_var_bound() signature
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev ca5666cabd add diagnostics for registering vars in lar_solver
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 9407c4e96f add an assert
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 2fb63f559c rebase with up/master
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 5344dedf42 going over the binary factor for basic lemmas
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 103808094a clear the model in lar_solver::get_model()
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev c09c944922 rebase with upstream
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev 822b0c1d5c in get_modele do not return values for terms
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 0644194fc9 work on lemma from product to factors, and some renaming
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner e16d8118ac going over niil_solver (#79)
* change conflict to th_axiom

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* going over niil_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 0911fc2bda use explanation.h for conflict explanations everywhere
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson f6291abccb change the type of lar_solver:get_model to a template
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson b6f07e2a23 roll back changes in get_model
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 0dbe8982ce simplify lar_solver::get_model
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson f2015b3f49 rename m_rounded_columns to m_incorrect_columns
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-23 15:31:07 -08:00
Lev Nachmanson 4ba4d41346 track rounded columns in lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-23 17:21:55 -06:00
Lev Nachmanson c3ed06915c avoid the state change in an assert statement
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-12-31 14:03:48 -08:00
Lev Nachmanson 1fff7bb51d use u_map in lar_term
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-12-30 20:31:36 -08:00
Lev Nachmanson 0f772482b8 remove an incorrect assert
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2019-12-29 15:28:38 -08:00
Nikolaj Bjorner 876cfb4dc9 optimization of phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-12 09:50:31 -07:00
Nikolaj Bjorner 9fa9aa09ff fix #2468, adding assignment phase heuristic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-10 15:25:05 -07:00
Lev Nachmanson 95eb0a0521 remove an unnecessary call m_mpq_lar_core_solver.m_r_solver.track_column_feasibility(j)
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-08-02 09:53:32 -07:00
Lev Nachmanson db5ac5afa8 fix a bug in lar_solver in queryaing if a column is int
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-08-01 11:51:56 -07:00
Nikolaj Bjorner 90b78eb64a use random_next instead of library random
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-13 19:59:05 -07:00
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 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