mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

merging with the lp fork

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2017-05-10 16:53:25 -07:00
parent cf695ab876
commit b08f094620
44 changed files with 902 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/lp.cpp
View file

@ -1077,7 +1077,7 @@ bool get_double_from_args_parser(const char * option, argument_parser & args_par
void update_settings(argument_parser & args_parser, lp_settings& settings) {
unsigned n;
settings.m_simplex_strategy = simplex_strategy_enum::no_tableau;
settings.m_simplex_strategy = simplex_strategy_enum::lu;
if (get_int_from_args_parser("--rep_frq", args_parser, n))
settings.report_frequency = n;
else

11
src/test/smt_reader.h
View file

@ -56,10 +56,11 @@ namespace lean {
struct formula_constraint {
lconstraint_kind m_kind;
std::vector<std::pair<mpq, std::string>> m_coeffs;
mpq m_right_side = numeric_traits<mpq>::zero();
mpq m_right_side;
void add_pair(mpq c, std::string name) {
m_coeffs.push_back(make_pair(c, name));
}
formula_constraint() : m_right_side(numeric_traits<mpq>::zero()) {}
};
lisp_elem m_formula_lisp_elem;
@ -69,9 +70,11 @@ namespace lean {
std::string m_file_name;
std::ifstream m_file_stream;
std::string m_line;
bool m_is_OK = true;
unsigned m_line_number = 0;
smt_reader(std::string file_name):
bool m_is_OK;
unsigned m_line_number;
smt_reader(std::string file_name):
m_is_OK(true),
m_line_number(0),
m_file_name(file_name), m_file_stream(file_name) {
}