mirror of
https://github.com/Z3Prover/z3
synced 2025-10-08 17:01:55 +00:00
0a93ff515d
* Introduce X-macro-based trace tag definition - Created trace_tags.def to centralize TRACE tag definitions - Each tag includes a symbolic name and description - Set up enum class TraceTag for type-safe usage in TRACE macros * Add script to generate Markdown documentation from trace_tags.def - Python script parses trace_tags.def and outputs trace_tags.md * Refactor TRACE_NEW to prepend TraceTag and pass enum to is_trace_enabled * trace: improve trace tag handling system with hierarchical tagging - Introduce hierarchical tag-class structure: enabling a tag class activates all child tags - Unify TRACE, STRACE, SCTRACE, and CTRACE under enum TraceTag - Implement initial version of trace_tag.def using X(tag, tag_class, description) (class names and descriptions to be refined in a future update) * trace: replace all string-based TRACE tags with enum TraceTag - Migrated all TRACE, STRACE, SCTRACE, and CTRACE macros to use enum TraceTag values instead of raw string literals * trace : add cstring header * trace : Add Markdown documentation generation from trace_tags.def via mk_api_doc.py * trace : rename macro parameter 'class' to 'tag_class' and remove Unicode comment in trace_tags.h. * trace : Add TODO comment for future implementation of tag_class activation * trace : Disable code related to tag_class until implementation is ready (#7663).
113 lines
3.1 KiB
C++
113 lines
3.1 KiB
C++
/*++
|
|
Copyright (c) 2020 Microsoft Corporation
|
|
|
|
Module Name:
|
|
|
|
int_branch.cpp
|
|
|
|
Abstract:
|
|
|
|
Branch heuristic
|
|
|
|
Author:
|
|
Lev Nachmanson (levnach)
|
|
Nikolaj Bjorner (nbjorner)
|
|
|
|
Revision History:
|
|
--*/
|
|
#include "math/lp/int_solver.h"
|
|
#include "math/lp/lar_solver.h"
|
|
#include "math/lp/int_branch.h"
|
|
|
|
namespace lp {
|
|
|
|
int_branch::int_branch(int_solver& lia):lia(lia), lra(lia.lra) {}
|
|
|
|
lia_move int_branch::operator()() {
|
|
lra.move_non_basic_columns_to_bounds();
|
|
int j = find_inf_int_base_column();
|
|
return j == -1? lia_move::sat : create_branch_on_column(j);
|
|
}
|
|
|
|
lia_move int_branch::create_branch_on_column(int j) {
|
|
TRACE(check_main_int, tout << "branching" << std::endl;);
|
|
lia.get_term().clear();
|
|
|
|
SASSERT(j != -1);
|
|
lia.get_term().add_monomial(mpq(1), j);
|
|
if (lia.is_free(j)) {
|
|
lia.is_upper() = lia.settings().random_next() % 2;
|
|
lia.offset() = mpq(0);
|
|
}
|
|
else {
|
|
lia.is_upper() = lia.settings().random_next() % 2;
|
|
lia.offset() = lia.is_upper()? floor(lia.get_value(j)) : ceil(lia.get_value(j));
|
|
}
|
|
|
|
TRACE(int_solver,
|
|
lia.display_column(tout << "branching v" << j << " = " << lia.get_value(j) << "\n", j);
|
|
tout << "k = " << lia.offset() << std::endl;);
|
|
return lia_move::branch;
|
|
}
|
|
|
|
|
|
int int_branch::find_inf_int_base_column() {
|
|
|
|
#if 1
|
|
return lia.select_int_infeasible_var();
|
|
#endif
|
|
|
|
int result = -1;
|
|
mpq range;
|
|
mpq new_range;
|
|
mpq small_value(1024);
|
|
unsigned n = 0;
|
|
lar_core_solver & lcs = lra.get_core_solver();
|
|
unsigned prev_usage = 0; // to quiet down the compiler
|
|
unsigned k = 0;
|
|
unsigned usage;
|
|
unsigned j;
|
|
|
|
// this loop looks for a column with the most usages, but breaks when
|
|
// a column with a small span of bounds is found
|
|
for (; k < lra.r_basis().size(); k++) {
|
|
j = lra.r_basis()[k];
|
|
if (!lia.column_is_int_inf(j))
|
|
continue;
|
|
usage = lra.usage_in_terms(j);
|
|
if (lia.is_boxed(j) && (range = lcs.m_r_upper_bounds[j].x - lcs.m_r_lower_bounds[j].x - rational(2*usage)) <= small_value) {
|
|
result = j;
|
|
k++;
|
|
n = 1;
|
|
break;
|
|
}
|
|
|
|
if (n == 0 || usage > prev_usage) {
|
|
result = j;
|
|
prev_usage = usage;
|
|
n = 1;
|
|
} else if (usage == prev_usage && (lia.settings().random_next() % (++n) == 0)) {
|
|
result = j;
|
|
}
|
|
}
|
|
SASSERT(k == lra.r_basis().size() || n == 1);
|
|
// this loop looks for boxed columns with a small span
|
|
for (; k < lra.r_basis().size(); k++) {
|
|
j = lra.r_basis()[k];
|
|
if (!lia.column_is_int_inf(j) || !lia.is_boxed(j))
|
|
continue;
|
|
SASSERT(!lia.is_fixed(j));
|
|
usage = lra.usage_in_terms(j);
|
|
new_range = lcs.m_r_upper_bounds[j].x - lcs.m_r_lower_bounds[j].x - rational(2*usage);
|
|
if (new_range < range) {
|
|
n = 1;
|
|
result = j;
|
|
range = new_range;
|
|
} else if (new_range == range && (lia.settings().random_next() % (++n) == 0)) {
|
|
result = j;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
}
|