mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 01:54:08 +00:00
Code Activity
19486 commits 23 branches 48 tags 156 MiB
Commit graph

120 commits

Author SHA1 Message Date
Nikolaj Bjorner b784b748d4 fix #7550 2025-02-27 14:43:11 -08:00
Nikolaj Bjorner be8febedc3 add throttle, fixup bp.init() for proper initialization 2025-02-22 16:27:58 -08:00
Lev Nachmanson 67d77e26d2 remove a parameter when calling bound_analyzer_on_row 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-21 14:43:08 -08:00
Nikolaj Bjorner 10c2af85c1 try for mixed-mode 2025-02-21 13:24:37 -08:00
Nikolaj Bjorner ead8478046 fix build per new API for analyze_row 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2025-02-21 12:48:34 -08:00
Nikolaj Bjorner 1a3d1ad69d add base line bounds tightening utility 2025-02-21 12:46:51 -08:00
Lev Nachmanson bd3d288a08 tighten only core constrants 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-20 08:40:16 -08:00
Lev Nachmanson a19e10912f make dio less aggressive, allow other cuts 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 7bba8bc0c9 fix some warnings 2025-02-11 12:23:00 -10:00
Lev Nachmanson 008e9229a5 use std_vector more and getting NOT_IMPLEMENTING in C:\dev\z3\src\math\lp\dioph_eq.cpp 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson deac00ada3 persist dio handler 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 2c8a6f83e4 change int_solver to call find_cube and hnf_cut, conditionally 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson e4f3b5753f solving regressions/smt2/b1.smt2 2025-02-11 12:23:00 -10:00
Lev Nachmanson d68ebeeb9f use var_register in dioph_eq 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson acc2149270 remove redundant m_row_index from entry 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 36293ac773 test that pivoting is correct in dioph_eq.cpp 2025-02-11 12:23:00 -10:00
Lev Nachmanson 392c24a145 throttle dioph equalities 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 06faf03eaa use cuts from proofs, remove gcc warnings 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 2ebb957cc8 enable cuts from proofs 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 18c75e6333 less eager dio 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 78a58b06aa dio passes regression\smt2 tests with limited functionality 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson df18885f97 debug dio 2025-02-11 12:23:00 -10:00
Lev Nachmanson 59e2dab69a create a conflict explanation 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 52653e6e43 a version with less pointers: got a conflict 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson 122e0135d2 use std::list 2025-02-11 12:23:00 -10:00
Lev Nachmanson 3b22d3b19d fix the crash 2025-02-11 12:23:00 -10:00
Lev Nachmanson abf29b57aa crash 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Lev Nachmanson a5dd59fdfb fix the build 2025-02-11 12:23:00 -10:00
Lev Nachmanson a1a01b9da6 move some functionality from int_solver to int_solver::imp 2025-02-11 12:23:00 -10:00
Lev Nachmanson 3d6cc64e2e prepare for calling diophantine equations 2025-02-11 12:23:00 -10:00
Lev Nachmanson 097a25ebfe add parameter to control calling diophantine equations 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2025-02-11 12:23:00 -10:00
Nikolaj Bjorner bdb9106f99
Api (#7097) 
* rename ul_pair to column

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

* t

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

* simple test passed

* remove an assert

* relax an assertion

* remove an obsolete function

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

* access a term by the term column

* remove the column index from colunm.h

* remove an unused method

* remove debug code

* fix the build of lp_tst

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

---------

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
Co-authored-by: Lev Nachmanson <levnach@hotmail.com>
 2024-01-24 16:05:18 -08:00
Lev Nachmanson 0728b81e9e add parameter lp_settings.m_gomory_simplify 2023-12-28 06:00:57 -10:00
Lev Nachmanson af7691224e adding the polarity bound 2023-12-28 06:00:57 -10:00
Lev Nachmanson 4317d134bf refactor: move gomory functionaly from int_solver to gomory 2023-12-20 12:56:20 -10:00
Lev Nachmanson e28b644a67 remove an empty line 2023-12-20 06:53:59 -10:00
Lev Nachmanson d6365610d5 change some TRACE statements 2023-12-20 06:49:55 -10:00
Lev Nachmanson fc23a498c4 a simple version of choosing a column for gomory cut 2023-12-04 15:06:50 -10:00
Nikolaj Bjorner 26440ed3d8 deal with ubuntu/clang warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-11-29 15:45:19 -08:00
Nikolaj Bjorner 4350bd77ac check cancel flag to avoid unsound conflicts 2023-11-19 11:43:52 -08:00
Nikolaj Bjorner 3de5af3cb0 fix bug in bound simplification in Gomory for mixed integer linear cuts, enable fixed variable redution after bugfix, add notes that rewriting bounds does not work 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-11-10 16:39:04 +01:00
Nikolaj Bjorner 3d99ed9dd4 Gomory cut / branch and bound improvements 
Improve fairness of cut generation by switching to find_infeasible_int_var with cascading priorities, allow stronger cuts by inlining terms.
 2023-11-07 19:59:02 +01:00
Nikolaj Bjorner f97dd34028 tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-10-30 14:54:04 -07:00
Nikolaj Bjorner 938a89e197 prepare for local version of Gomory cuts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-10-29 19:45:14 -07:00
Nikolaj Bjorner bd8e5eee4b add simplification experiment (disabled) for tracking, some reshuffling of equation/fixed_equation structs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-10-29 10:21:31 -07:00
Nikolaj Bjorner d04807e8c3 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-10-10 13:43:38 -07:00
Nikolaj Bjorner eff3f5f65e port bug fixes from unit prop branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-09-22 09:45:58 -07:00
Nikolaj Bjorner 5e3df9ee77
Arith min max (#6864) 
* prepare for dependencies

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

* snapshot

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

* more refactoring

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

* more refactoring

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

* build

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

* pass in u_dependency_manager

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

* address NYIs

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

* more refactoring names

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

* eq_explanation update

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

* add outline of bounds improvement functionality

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

* fix unit tests

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

* remove unused structs

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

* more bounds

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

* more bounds

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

* convert more internals to use u_dependency instead of constraint_index

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

* convert more internals to use u_dependency instead of constraint_index

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

* remember to push/pop scopes

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

* use the main function for updating bounds

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

* na

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

* na

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

* remove reset of shared dep manager

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

* disable improve-bounds, add statistics

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

---------

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-08-19 17:44:09 -07:00
Nikolaj Bjorner 51df7b75ce fix 6800 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-08-17 15:18:22 -07:00
Nikolaj Bjorner a6ab0a7d49 formatting hygiene 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2023-08-08 13:50:49 -07:00