mirror of
https://github.com/Z3Prover/z3
synced 2025-04-12 20:18:18 +00:00
moved network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
26a3d2ca31
commit
f6fd426c28
|
@ -213,7 +213,6 @@ namespace simplex {
|
||||||
em.div(delta2, si.m_base_coeff, delta2);
|
em.div(delta2, si.m_base_coeff, delta2);
|
||||||
delta2.neg();
|
delta2.neg();
|
||||||
update_value_core(s, delta2);
|
update_value_core(s, delta2);
|
||||||
// TBD m.add(si.m_base_coeff, delta2, si.m_base_coeff);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ Revision History:
|
||||||
#include"numeral_factory.h"
|
#include"numeral_factory.h"
|
||||||
#include"smt_clause.h"
|
#include"smt_clause.h"
|
||||||
#include"theory_opt.h"
|
#include"theory_opt.h"
|
||||||
#include"network_flow.h"
|
|
||||||
|
|
||||||
// The DL theory can represent term such as n + k, where n is an enode and k is a numeral.
|
// The DL theory can represent term such as n + k, where n is an enode and k is a numeral.
|
||||||
namespace smt {
|
namespace smt {
|
||||||
|
|
|
@ -28,7 +28,6 @@ Revision History:
|
||||||
#include"ast_pp.h"
|
#include"ast_pp.h"
|
||||||
#include"warning.h"
|
#include"warning.h"
|
||||||
#include"smt_model_generator.h"
|
#include"smt_model_generator.h"
|
||||||
#include"network_flow_def.h"
|
|
||||||
#include"model_implicant.h"
|
#include"model_implicant.h"
|
||||||
|
|
||||||
using namespace smt;
|
using namespace smt;
|
||||||
|
@ -998,6 +997,10 @@ void theory_diff_logic<Ext>::get_implied_bound_antecedents(edge_id bridge_edge,
|
||||||
|
|
||||||
template<typename Ext>
|
template<typename Ext>
|
||||||
inf_eps_rational<inf_rational> theory_diff_logic<Ext>::maximize(theory_var v) {
|
inf_eps_rational<inf_rational> theory_diff_logic<Ext>::maximize(theory_var v) {
|
||||||
|
|
||||||
|
#ifdef 0
|
||||||
|
// disabled until fixed.
|
||||||
|
|
||||||
objective_term const& objective = m_objectives[v];
|
objective_term const& objective = m_objectives[v];
|
||||||
|
|
||||||
IF_VERBOSE(1,
|
IF_VERBOSE(1,
|
||||||
|
@ -1058,6 +1061,10 @@ inf_eps_rational<inf_rational> theory_diff_logic<Ext>::maximize(theory_var v) {
|
||||||
IF_VERBOSE(1, verbose_stream() << "Unbounded objective" << std::endl;);
|
IF_VERBOSE(1, verbose_stream() << "Unbounded objective" << std::endl;);
|
||||||
return inf_eps_rational<inf_rational>::infinity();
|
return inf_eps_rational<inf_rational>::infinity();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
return inf_eps_rational<inf_rational>::infinity();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Ext>
|
template<typename Ext>
|
||||||
|
|
Loading…
Reference in a new issue