mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-04 06:15:46 +00:00
Code Activity

fix issues #581: nested timeouts canceled each-other

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-04-30 11:18:34 -07:00
parent a020b13f10
commit e29adbf304
12 changed files with 96 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/math/simplex/model_based_opt.h
View file

@ -33,11 +33,6 @@ namespace opt {
t_le
};
enum bound_type {
unbounded,
strict,
non_strict
};
typedef inf_eps_rational<inf_rational> inf_eps;
@ -78,7 +73,7 @@ namespace opt {
rational get_coefficient(unsigned row_id, unsigned var_id);
bool resolve(unsigned row_id1, rational const& a1, unsigned row_id2, unsigned x);
void resolve(unsigned row_src, rational const& a1, unsigned row_dst, unsigned x);
void mul_add(unsigned row_id1, rational const& c, unsigned row_id2);
@ -118,7 +113,6 @@ namespace opt {
}
std::ostream& operator<<(std::ostream& out, opt::bound_type bt);
std::ostream& operator<<(std::ostream& out, opt::ineq_type ie);