3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Commit graph

120 commits

Author SHA1 Message Date
Lev Nachmanson 0fbf8f92f5 delete remove_fixed_vars_from_base() from
int_solver
2023-08-07 14:55:13 -10:00
Nikolaj Bjorner 125787c458 remove dead code 2023-08-07 11:22:34 -07:00
Lev Nachmanson fd5902f76e relax an assertion in int_solver::patcher 2023-07-16 11:55:42 -10:00
Lev Nachmanson 401ec04ec3
code cleaning around m_touched_rows of lar_solver (#6814) 2023-07-14 20:19:13 -07:00
Lev Nachmanson e091a2e775 remove the line with clang-format off 2023-07-10 12:05:59 -07:00
Lev Nachmanson 1c907e8d09 add a comment 2023-07-05 09:14:57 -07:00
Lev Nachmanson 61948fa1ff find minimal deltas in patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-07-01 07:48:07 -07:00
Lev Nachmanson f5d9ffaca1 clean up and add clang-format off
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-06-30 11:57:42 -07:00
Lev Nachmanson 30a2ced9aa
patching merge (#6780)
* patching merge

* fix the format and some warnings

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* a fix in the delta calculation

* test patching

* try a new version of get_patching_deltas

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove dead code from lp_tst and try optimizing patching

* add comments, replace VERIFY with lp_assert

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* cleanup

---------

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-06-27 17:53:27 -07:00
Nikolaj Bjorner 368d60f553 add branch / cut selection heuristic from solver=2
disabled for testing.
2023-04-10 22:14:16 -07:00
Lev Nachmanson 25f103db1a rm_lp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2023-03-08 10:27:05 -08:00
Lev Nachmanson 7758b519bc
Handle correctly cancelled run (#5695)
* remove the bound on total iterations in simplex

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove unncesseray checks in  get_freedom_interval_for_column()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix the build of test-z3

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Revert "remove unncesseray checks in  get_freedom_interval_for_column()"

This reverts commit 6770ed85e3.

* optimize get_freedom_interval_for_column() for feasible case

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* add function lar_solver::status_feasible

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* rename status_is_feasible() to is_feasible()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix the linux build

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2021-12-05 18:38:37 -08:00
Nikolaj Bjorner 1618c970df adding checks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-12-03 13:17:48 -08:00
Nikolaj Bjorner 970347e797 infeas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-12-03 13:00:52 -08:00
Lev Nachmanson d50c4bfcc1 remove an unused var
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2021-11-28 09:44:50 -08:00
Lev Nachmanson 3b67dd8288 add a trace statement
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2021-03-19 13:17:27 -07:00
Nikolaj Bjorner 857557ad93 deal with compiler warnings 2021-03-08 20:39:19 -08:00
Nikolaj Bjorner b5a6c6bc66 attempt at more graceful timeout handling #4821 2020-11-26 06:33:44 -08:00
Lev Nachmanson 1e7998f03a
no big nums in patching (#4705)
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-09-23 08:46:41 -07:00
Nikolaj Bjorner 1e6d2fbbdc debugging cuts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-09-21 20:02:12 -07:00
Nikolaj Bjorner c13e3ce693 fix #4640
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-17 08:38:07 -07:00
Nikolaj Bjorner df8b14d77c fix #4641
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-17 08:35:59 -07:00
Lev Nachmanson c4fbe05a96 simplify cheap_eqs
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-06-20 11:31:22 -07:00
Lev Nachmanson e3503f060f debug cheap_eqs
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-06-20 11:31:22 -07:00
Lev Nachmanson 4de38d09e2 cheap eqs
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-06-12 22:11:11 -07:00
Lev Nachmanson 110ab5e6ef debug cheap_eqs
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-06-12 22:11:11 -07:00
Lev Nachmanson 4b76e213a5 move declarations closer to usage
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-31 20:20:49 -07:00
Lev Nachmanson 9b7f97fab9 change try_patch to a template
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-31 20:20:49 -07:00
Lev Nachmanson a53ed5bddd change try_patch to a template
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-31 20:20:49 -07:00
Lev Nachmanson b84585beeb more aggressive patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-31 20:20:49 -07:00
Lev Nachmanson caa384f6c9 make m_inf_set private and cosmetic improvements in nla patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-26 12:44:47 -07:00
Lev Nachmanson 6b28973799
nla review (#4321)
* simplify the nla_solver interface

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* more simplifications

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* init m_use_nra_model

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* work on NSB comments

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* work on NSB comments

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-13 13:52:42 -07:00
Lev Nachmanson 5208b64a6b expose only necessary methods of lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-16 12:58:39 -07:00
Nikolaj Bjorner c2e5cd78c8 change lar_terms to use column indices
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-06 12:13:59 -07:00
Nikolaj Bjorner 4f575d3158 fix build warning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-27 21:19:40 -08:00
Nikolaj Bjorner 11199619a5 prepare for throttling gcd test and patching based on cost/success ratio
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-26 19:02:56 -08:00
Lev Nachmanson b5276e93bb bug fix in shift_var
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-14 16:59:31 -08:00
Nikolaj Bjorner c46e36ce58 bug fixes to LUT extraction, bug fix for real value case of freedom intervals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-11 14:25:25 -08:00
Nikolaj Bjorner f1abc71c35 fix #2962
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-10 11:44:10 -08:00
Lev Nachmanson fd3c3a2599 make the column shift in random_update divisible by m
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-09 16:30:09 -08:00
Nikolaj Bjorner c8b98d8b48 move hnf cut functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-09 09:22:02 -08:00
Nikolaj Bjorner 9451dd9a74 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-09 09:00:34 -08:00
Nikolaj Bjorner 5964969f29 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-09 08:38:07 -08:00
Nikolaj Bjorner 5dc8c93897 separate out gcd test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 16:44:25 -08:00
Nikolaj Bjorner 8b9a80e232 separate out int-branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 15:58:06 -08:00
Nikolaj Bjorner 3f1f4e0f67 remove pragma once from cpp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 15:41:13 -08:00
Nikolaj Bjorner 8d293171d5 separate int-cube functionalty
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 15:27:11 -08:00
Nikolaj Bjorner c12c9a75e6 move all gomory functionality into gomory class
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 15:03:58 -08:00
Nikolaj Bjorner d44855f262 move all gomory functionality into gomory class
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 13:02:19 -08:00
Nikolaj Bjorner 094f203167 fix #2949 fix #2955 experiment with cut selection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 10:41:35 -08:00
Nikolaj Bjorner f29b455611 fix #2949 fix #2955 experiment with cut selection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 10:34:14 -08:00
Nikolaj Bjorner b2c265496e dbg
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 19:41:50 -08:00
Lev Nachmanson 5ee7103e3c roll back the branching experiment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 17:35:42 -08:00
Lev Nachmanson bbfcd00627 experiment with branching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 15:40:33 -08:00
Lev Nachmanson 6b01376f51 fix column patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 13:42:39 -08:00
Lev Nachmanson f45e17c47e fix column patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 13:42:39 -08:00
Nikolaj Bjorner a59745c2f2 isolate constraints in a constraint_set
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 09:13:40 -08:00
Nikolaj Bjorner d4a24aff1e local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 17:08:52 -08:00
Lev Nachmanson abb13f8c76 randomise branches in int_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-31 14:38:28 -08:00
Lev Nachmanson 35aa98436f fix term columns after rounding in cube()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-30 14:29:36 -08:00
Lev Nachmanson 41a4dcf90c do not increment m_number_of_calls twice in check()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-30 10:10:15 -08:00
Nikolaj Bjorner eefb685fa9 fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 18:49:25 -08:00
Nikolaj Bjorner ff5bdd6f1f speed up freedom interval computation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 15:21:39 -08:00
Nikolaj Bjorner 8b7426f5ad add filter to gcd test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 11:30:16 -08:00
Lev Nachmanson 8ebeaf03b4 rebase with Z3Prover/z3/master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 90f14ec0b3 rebase with Z3Prover/master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson d310ae9060 rebase with Z3Prover
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson a0bdb8135d rename monomial to monic
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 490672a5ba start porting grobner basis functionality
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
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
Renamed from src/util/lp/int_solver.cpp (Browse further)