Nikolaj Bjorner
5a2a8d7d5c
Merge pull request #1715 from levnach/master
...
merge lar_solver/int_solver
2018-07-01 12:20:02 -07:00
Thai Trinh
cd62017afd
fixed failures with regression tests
2018-06-30 15:52:20 +08:00
Lev Nachmanson
9ba4026bc6
avoid going creating hnf_cuts if all involved vars have integral values
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
add explanations to hnf cuts
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
nits and virtual methods (#68 )
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
cleanup from std::cout
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
handle the case when the number of terms is greater than the number of variables in hnf
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
method name's fix
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
restore hnf_cutter to work with m_row_count <= m_column_count
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
tune addition of rational numbers (#70 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* prepare for mixed integer-real
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix default tactic usage
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
give shorter explanations, call hnf only when have a not integral var
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
overhaul of mpq (#71 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* prepare for mixed integer-real
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix default tactic usage
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* overhaul of mpz/mpq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* disabled temporary setting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* remove prints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
fix for 32 bit build (#72 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* prepare for mixed integer-real
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix default tactic usage
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* overhaul of mpz/mpq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* disabled temporary setting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* remove prints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* customize for 64 bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
yes (#74 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* prepare for mixed integer-real
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix default tactic usage
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* overhaul of mpz/mpq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* disabled temporary setting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* remove prints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* customize for 64 bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* customize for 64 bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* more refactor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
fix the merge
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
fixes in maximize_term untested
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
fix compilation (#75 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* virtual method in bound propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* prepare for mixed integer-real
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix default tactic usage
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* overhaul of mpz/mpq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* disabled temporary setting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* remove prints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* customize for 64 bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* customize for 64 bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* more refactor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* relax check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* change for gcc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-06-27 12:16:58 -07:00
Lev Nachmanson
9be49ff6ff
add cancel to hnf_cutter
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
exit earlier on a large matrix in hnf_cutter
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
call hnf only for the boundary points
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
fix a bug in hnf_cutter initialization
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
initialize has_bounds in lar_solver::get_equality_for_term_on_corrent_x
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
initialize has_bounds in lar_solver::get_equality_for_term_on_corrent_x
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
initialize has_bounds in lar_solver::get_equality_for_term_on_corrent_x
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
initialize has_bounds in lar_solver::get_equality_for_term_on_corrent_x
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
fixes in determinant_of_rectangular_matrix calculations
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
changes in debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
init m_hnf_cut_period from globals settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
fix some warnings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
Lev2 (#66 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
remove a comment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
simplify gomory cut return's logic
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
simplify uniformly int_solver::check()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
making new arith solver default for LIA (#67 )
* log quantifiers only if present
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* merge and fix some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* set new arith as default for LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
remove chase_cut_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
remove integer_domain
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
restore call for find_cube()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
remove a method
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
remove some debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2018-06-27 11:54:10 -07:00
trinhmt
54a9482716
Merge pull request #8 from Z3Prover/master
...
merge with Z3Prover/z3
2018-06-27 18:10:54 +08:00
Thai Trinh
1892d31794
add parameter to enable splitting guided by length constraints
2018-06-27 18:10:40 +08:00
Nikolaj Bjorner
520ce9a5ee
integrate lambda expressions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-06-26 07:23:04 -07:00
Thai Trinh
aacb7289be
merge with Z3Prover/master
2018-06-25 19:44:46 +08:00
Arie Gurfinkel
b17be763d3
User control over more arith options
2018-06-14 16:08:49 -07:00
Arie Gurfinkel
1c06229755
User control over qi.quick_checker smt_params option
2018-06-14 16:08:49 -07:00
Arie Gurfinkel
ec8a86b78a
Removed unused m_qi_ematching parameter from smt_params
2018-06-14 16:08:49 -07:00
Arie Gurfinkel
477ac4a19a
Remove dead m_propagate_booleans param
2018-06-14 16:08:49 -07:00
Nikolaj Bjorner
f525f43e43
merge
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-30 09:30:43 -07:00
Nikolaj Bjorner
859c68c2ac
merge with opt
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-30 08:27:54 -07:00
Nikolaj Bjorner
012a96fd81
adding smt parallel solving
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-15 16:16:48 -07:00
Nikolaj Bjorner
c513f3ca09
merge with master
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-25 14:57:01 -07:00
Murphy Berzish
49b810e00f
Merge branch 'master' into regex-develop
2018-03-11 23:18:55 -04:00
Nikolaj Bjorner
eb1122c5cb
delay updating parameters to ensure rewriting in asserted_formulas is applied using configuration overrides. Fixes build regression for tree_interpolation documentation test
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 21:57:08 -08:00
Nikolaj Bjorner
534a31f74e
inherit solver parameters in asserted formulas rewriter. #1511
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 05:06:36 -08:00
Nikolaj Bjorner
a64fd7145c
remove buggy legacy code, rely on pull_cheap_ite option in rewriter, #1511
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 03:36:03 -08:00
Murphy Berzish
54206e3674
Merge branch 'develop' into regex-develop
...
Conflicts:
src/smt/theory_str.h
2018-02-12 17:25:50 -05:00
Bruce Mitchener
76eb7b9ede
Use nullptr.
2018-02-12 14:05:55 +07:00
Murphy Berzish
ca3784449f
regex failsafe and intersect WIP
2018-01-12 13:53:02 -05:00
Murphy Berzish
6b799706b5
add path constraint generation for regex terms
2018-01-10 17:24:47 -05:00
Murphy Berzish
09dc5cd0f8
Merge branch 'develop' into regex-develop
2018-01-03 16:12:33 -05:00
Murphy Berzish
a5180edc76
make linear search the default for theory_str
2018-01-03 16:05:34 -05:00
Murphy Berzish
fbe8d1577e
new regex automata start; add complexity estimation
2017-12-04 18:05:00 -05:00
Nikolaj Bjorner
fd49a0c89c
added facility to persist model transformations
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-02 00:05:52 -05:00
Murphy Berzish
b2af690c6d
enable binary search for theory_str
2017-09-22 12:31:46 -04:00
Nikolaj Bjorner
651587ce01
merge with master branch
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-19 09:39:22 -07:00
Nikolaj Bjorner
5492d0e135
re-introduce eq2ineq name for rewriting parameter
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-04 11:03:57 -07:00
Nikolaj Bjorner
fff54d5d08
fix perf regression with negative polynomial normalization, adding new datatype plugin
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-03 03:56:10 -07:00
Nikolaj Bjorner
f20e95184e
remove old_simplify dependencies
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-28 13:29:51 -07:00
Nikolaj Bjorner
bcf229dcfd
removing dependencies on simplifier
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-26 11:23:41 -07:00
Nikolaj Bjorner
2955b0c2ef
removing more dependencies
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-26 03:05:34 -07:00
Nikolaj Bjorner
c03be16039
merge
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-26 01:33:19 -07:00
Nikolaj Bjorner
ac0bb6a3d0
remove simplify dependencies
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-25 23:56:09 -07:00
Christoph M. Wintersteiger
36dd2b6530
Re-enabled macro-related options for the smt_context
2017-08-25 15:01:54 +01:00
Christoph M. Wintersteiger
6f8a954532
added missing addition to smt_params_helper.pyg
2017-08-23 12:37:26 +01:00
Christoph M. Wintersteiger
3e960eadd2
(Re-)added option to disable lemma deletion in the smt_context.
2017-08-23 12:14:19 +01:00
Nikolaj Bjorner
2b82fd5d0c
updated include directives
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-01 10:51:47 -07:00
Arie Gurfinkel
ba6594b241
extra smt params used by spacer
2017-07-31 17:01:47 -04:00
Nikolaj Bjorner
b19f94ae5b
make include paths uniformly use path relative to src. #534
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 13:24:11 -07:00
Nikolaj Bjorner
a28a8304b7
Dev ( #56 )
...
* introduce int_solver.h
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* add int_solver class
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* track which var is an integer
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add queries for integrality of vars
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* resurrect lp_tst in its own director lp
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add file
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add_constraint has got a body
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* fix add_constraint and substitute_terms_in_linear_expression
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* after merge with Z3Prover
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* adding stub check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* Dev (#50 )
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* small fix in lar_solver.cpp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* adding some content to the new check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* Dev (#51 )
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding more nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* nlsat integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* add missing initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* test
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* Dev (#53 )
* change in a comment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* Disabled debug output
* removing FOCI2 interface from interp
* remove foci reference from cmakelist.txt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding more nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* nlsat integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* add missing initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* debugging nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* integrate nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* preserve is_int flag
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* remove a debug printout
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* Dev (#54 )
* change in a comment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* Disabled debug output
* removing FOCI2 interface from interp
* remove foci reference from cmakelist.txt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding more nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* nlsat integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* add missing initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* adding nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* debugging nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* integrate nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* use integer test from lra solver, updated it to work on term variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix equality check in assume-eq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* fix model_is_int_feasible
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* untested gcd_test()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* call fill_explanation_from_fixed_columns()
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add the call to pivot_fixed_vars_from_basis() to int_solver.cpp::check()
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* port more of theory_arith_int.h
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* use statistics of lar_solver by theory_lra.cpp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* port more code to int_solver.cpp
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add an assert
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* more int porting
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* fix a bug in pivot_fixed_vars_from_basis
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* small change
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
* implement find_inf_int_base_column()
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* catch unregistered vars in add_var_bound
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add a file
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* compile for vs2012
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* fix asserts in add_var_bound
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* fix the lp_solver init when workig on an mps file
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* towards int_solver::check()
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* change in int_solver::check() signature
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
* add handlers for lia moves
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* spacing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-28 13:12:12 -07:00
Dan Liew
4b517b96df
[CMake] Move CMake files into their intended location so the
...
`contrib/cmake/bootstrap.py` script no longer needs to be executed.
The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461 . While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.
The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.
This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
2017-06-12 11:59:00 +01:00
Nikolaj Bjorner
6f2cd4817b
ensure arith.reflect has default true
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 14:09:45 -07:00
Nikolaj Bjorner
af4346f16a
expose arith reflection, get rid of long m_manager attribute in asserted fromulas
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-23 10:04:29 -07:00
Murphy Berzish
41a242fab1
Merge branch 'upstream-master' into develop
...
Conflicts:
src/smt/params/smt_params.h
src/smt/params/smt_params_helper.pyg
src/smt/smt_case_split_queue.cpp
src/smt/smt_context.h
src/smt/smt_setup.cpp
src/smt/smt_setup.h
2017-05-03 17:03:13 -04:00
Nikolaj Bjorner
52dfdedb9b
Merge pull request #1000 from mtrberzi/theory_str-smt-setup
...
smt_setup for strings/sequences
2017-05-02 20:44:23 -07:00
Murphy Berzish
92755b0185
smt_setup framework, all hooks to theory_str are redirected to theory_seq
2017-05-02 17:16:35 -04:00