mirror of
https://github.com/Z3Prover/z3
synced 2025-12-07 12:32:24 +00:00
* Make spacer_sem_matcher::reset() public * Add .clang-format for src/muz/spacer * Mark substitution::get_bindings() as const * Fix in spacer_antiunify * Various helper methods in spacer_util Minor functions to compute number of free variables, detect presence of certain sub-expressions, etc. The diff is ugly because of clang-format * Add spacer_cluster for clustering lemmas A cluster of lemmas is a set of lemmas that are all instances of the same pattern, where a pattern is a qff formula with free variables. Currently, the instances are required to be explicit, that is, they are all obtained by substituting concrete values (i.e., numbers) for free variables of the pattern. Lemmas are clustered in cluster_db in each predicate transformer. * Integrate spacer_cluster into spacer_context * Custom clang-format pragmas for spacer_context spacer_context.(cpp|h) are large and have inconsistent formatting. Disable clang-format for them until merge with main z3 branch and re-format. * Computation of convex closure and matrix kernel Various LA functions. The implementations are somewhat preliminary. Convex closure is simplemented via syntactic convex closure procedure. Kernel computation considers many common cases. spacer_arith_kernel_sage implements kernel computation by call external Sage binary. It is used only for debugging and experiments. There is no link dependence on Sage. If desired, it can be removed. * Add spacer_concretize * Utility methods for spacer conjecture rule * Add spacer_expand_bnd_generalizer Generalizes arithmetic inequality literals of the form x <= c, by changing constant c to other constants found in the problem. * Add spacer_global_generalizer Global generalizer checks every new lemma against a cluster of previously learned lemmas, and, if possible, conjectures a new pob, that, when blocked, generalizes multiple existing lemmas. * Remove fp.spacer.print_json option The option is used to dump state of spacer into json for debugging. It has been replaced by `fp.spacer.trace_file` that allows dumping an execution of spacer. The json file can be reconstructed from the trace file elsewhere. * Workaround for segfault in spacer_proof_utils Issue #3 in hgvk94/z3 Segfault in some proof reduction. Avoid by bailing out on reduction. * Revert bug for incomplete models * Use local fresh variables in spacer_global_generalizer * Cleanup of spacer_convex_closure * Allow arbitrary expressions to name cols in convex_closure * WIP: convex closure * WIP: convex closure * Fix bindings order in spacer_global_generalizer The matcher creates substitution using std_order, which is reverse of expected order (variable 0 is last). Adjust the code appropriately for that. * Increase verbosity level for smt_context stats * Dead code in qe_mbp * bug fixes in spacer_global_generalizer::subsumer * Partially remove dependence of size of m_alphas I want m_alphas to potentially be greater than currently used alpha variables. This is helpful for reusing them across multiple calls to convex closure * Subtle bug in kernel computation Coefficient was being passed by reference and, therefore, was being changed indirectly. In the process, updated the code to be more generic to avoid rational computation in the middle of matrix manipulation. * another test for sparse_matrix_ops::kernel * Implementation of matrix kernel using Fraction Free Elimination Ensures that the kernel is int for int matrices. All divisions are exact. * clang-format sparse_matrix_ops.h * another implementation of ffe kernel in sparse_matrix_ops * Re-do arith_kernel and convex_closure * update spacer_global_generalization for new subsumer * remove spacer.gg.use_sage parameter * cleanup of spacer_global_generalizer * Removed dependency on sage * fix in spacer_convex_closure * spacer_sem_matcher: consider an additional semantic matching disabled until it is shown useful * spacer_global_generalizer: improve do_conjecture - if conjecture does not apply to pob, use lemma instead - better normalization - improve debug prints * spacer_conjecture: formatting * spacer_cluster: improve debug prints * spacer_context: improve debug prints * spacer_context: re-queue may pobs enabled even if global re-queue is disabled * spacer_cluster print formatting * reset methods on pob * cleanup of print and local variable names * formatting * reset generalization data once it has been used * refactored extra pob creation during global guidance * fix bug copying sparse matrix into spacer matrix * bug fix in spacer_convex_closure * formatting change in spacer_context * spacer_cluster: get_min_lvl chose level based on pob as well as lemmas * spacer_context: add desired_level to pob desired_level indicates at which level pob should be proved. A pob will be pushed to desired_level if necessary * spacer_context: renamed subsume stats the name of success/failed was switched * spacer_convex_closure: fix prototype of is_congruent_mod() * spacer_convex_closure: hacks in infer_div_pred() * spacer_util: do not expand literals with mod By default, equality literal t=p is expanded into t<=p && t>=p Disable the expansion in case t contains 'mod' operator since such expansion is usually not helpful for divisibility * spacer_util: rename m_util into m_arith * spacer_util: cleanup normalize() * spacer_util: formatting * spacer_context: formatting cleanup on subsume and conjecture * spacer_context: fix handling may pobs when abs_weakness is enabled A pob might be undef, so weakness must be bumped up * spacer_arith_kernel: enhance debug print * spacer_global_generalizer: improve matching on conjecture * spacer_global_generalizer: set desired level on conjecture pob * spacer_global_generalizer: debug print * spacer_global_generalizer: set min level on new pobs the new level should not be higher than the pob that was generalized * spacer_global_generalizer: do no re-create closed pobs If a generalized pob exist and closed, do not re-create it. * spacer_context: normalize twice * spacer_context: forward propagate only same kind of pobs * sketch of inductive generalizer A better implementation of inductive generalizer that in addition to dropping literals also attempts to weaken them. Current implementation is a sketch to be extended based on examples/requirements. * fix ordering in spacer_cluster_util * fix resetting of substitution matcher in spacer_conjecture Old code would forget to reset the substitution provided to the sem_matcher. Thus, if the substitution was matched once (i.e., one literal of interest is found), no other literal would be matched. * add spacer_util is_normalized() method used for debugging only * simplify normalization of pob expressions pob expressions are normalized to increase syntactic matching. Some of the normalization rules seem out of place, so removing them for now. * fix in spacer_global_generalizer If conjecture fails, do not try other generalization strategies -- they will not apply. * fix in spacer_context do not check that may pob is blocked by existing lemmas. It is likely to be blocked. Our goal is to block it again and generalize to a new lemma. This can be further improved by moving directly to generalization when pob is blocked by existing lemmas... Co-authored-by: hgvk94 <hgvk94@gmail.com>
187 lines
5.4 KiB
C++
187 lines
5.4 KiB
C++
#pragma once
|
|
/**++
|
|
Copyright (c) 2020 Arie Gurfinkel
|
|
|
|
Module Name:
|
|
|
|
spacer_convex_closure.h
|
|
|
|
Abstract:
|
|
|
|
Compute convex closure of polyhedra
|
|
|
|
Author:
|
|
|
|
Hari Govind
|
|
Arie Gurfinkel
|
|
|
|
Notes:
|
|
|
|
--*/
|
|
|
|
#include "ast/arith_decl_plugin.h"
|
|
#include "ast/ast.h"
|
|
#include "ast/ast_util.h"
|
|
#include "muz/spacer/spacer_arith_kernel.h"
|
|
#include "muz/spacer/spacer_matrix.h"
|
|
#include "muz/spacer/spacer_util.h"
|
|
#include "util/statistics.h"
|
|
|
|
namespace spacer {
|
|
|
|
/// Computes a convex closure of a set of points
|
|
class convex_closure {
|
|
struct stats {
|
|
unsigned m_num_reductions;
|
|
unsigned m_max_dim;
|
|
stopwatch watch;
|
|
stats() { reset(); }
|
|
void reset() {
|
|
m_num_reductions = 0;
|
|
m_max_dim = 0;
|
|
watch.reset();
|
|
}
|
|
};
|
|
stats m_st;
|
|
|
|
ast_manager &m;
|
|
arith_util m_arith;
|
|
bv_util m_bv;
|
|
|
|
// size of all bit vectors in m_col_vars
|
|
unsigned m_bv_sz;
|
|
|
|
// Enable computation of implicit syntactic convex closure
|
|
bool m_enable_implicit;
|
|
|
|
// number of columns in \p m_data
|
|
unsigned m_dim;
|
|
|
|
// A vector of rational valued points
|
|
spacer_matrix m_data;
|
|
|
|
// Variables naming columns in `m_data`
|
|
// \p m_col_vars[k] is a var for column \p k
|
|
expr_ref_vector m_col_vars;
|
|
vector<bool> m_dead_cols;
|
|
|
|
// Kernel of \p m_data
|
|
// Set at the end of computation
|
|
spacer_arith_kernel m_kernel;
|
|
|
|
// Free variables introduced by syntactic convex closure
|
|
// These variables are always of sort Real
|
|
expr_ref_vector m_alphas;
|
|
|
|
expr_ref_vector m_implicit_cc;
|
|
expr_ref_vector m_explicit_cc;
|
|
|
|
/// Reduces dimension of \p m_data and returns its rank
|
|
unsigned reduce();
|
|
|
|
/// Constructs an equality corresponding to a given row in the kernel
|
|
///
|
|
/// The equality is conceptually corresponds to
|
|
/// row * m_col_vars = 0
|
|
/// where row is a row vector and m_col_vars is a column vector.
|
|
/// However, the equality is put in a form so that exactly one variable from
|
|
/// \p m_col_vars is on the LHS
|
|
void kernel_row2eq(const vector<rational> &row, expr_ref &out);
|
|
|
|
/// Construct all linear equations implied by points in \p m_data
|
|
/// This is defined by \p m_kernel * m_col_vars = 0
|
|
void kernel2fmls(expr_ref_vector &out);
|
|
|
|
/// Compute syntactic convex closure of \p m_data
|
|
void cc2fmls(expr_ref_vector &out);
|
|
|
|
/// Construct the equality ((m_alphas . m_data[*][k]) = m_col_vars[k])
|
|
///
|
|
/// \p m_data[*][k] is the kth column of m_data
|
|
/// The equality is added to \p out.
|
|
void cc_col2eq(unsigned k, expr_ref_vector &out);
|
|
|
|
/// Compute one dimensional convex closure over \p var
|
|
///
|
|
/// \p var is the dimension over which convex closure is computed
|
|
/// Result is stored in \p out
|
|
void cc_1dim(const expr_ref &var, expr_ref_vector &out);
|
|
|
|
/// Computes div constraint implied by a set of data points
|
|
///
|
|
/// Finds the largest numbers \p m, \p d such that \p m_data[i] mod m = d
|
|
/// Returns true if successful
|
|
bool infer_div_pred(const vector<rational> &data, rational &m, rational &d);
|
|
|
|
/// Constructs a formula \p var ~ n , where ~ = is_le ? <= : >=
|
|
expr *mk_le_ge(expr *var, rational n, bool is_le);
|
|
|
|
expr *mk_add(const expr_ref_buffer &vec);
|
|
expr *mk_numeral(const rational &n, bool is_int);
|
|
|
|
/// Returns equality (v = r mod d)
|
|
expr *mk_eq_mod(expr *v, rational d, rational r);
|
|
|
|
bool has_bv() { return m_bv_sz > 0; }
|
|
|
|
public:
|
|
convex_closure(ast_manager &_m);
|
|
|
|
/// Resets all data points
|
|
///
|
|
/// n_cols is the number of dimensions of new expected data points
|
|
void reset(unsigned n_cols);
|
|
|
|
/// Turn support for fixed sized bit-vectors of size \p sz
|
|
///
|
|
/// Disables syntactic convex closure as a side-effect
|
|
void set_bv(unsigned sz) {
|
|
SASSERT(sz > 0);
|
|
m_bv_sz = sz;
|
|
m_enable_implicit = false;
|
|
}
|
|
|
|
/// \brief Name dimension \p i with a variable \p v.
|
|
void set_col_var(unsigned i, expr *v) {
|
|
SASSERT(i < dims());
|
|
SASSERT(m_col_vars.get(i) == nullptr);
|
|
m_col_vars[i] = v;
|
|
}
|
|
|
|
/// \brief Return number of dimensions of each point
|
|
unsigned dims() const { return m_dim; }
|
|
|
|
/// \brief Add an n-dimensional point to convex closure
|
|
void add_row(const vector<rational> &point) {
|
|
SASSERT(point.size() == dims());
|
|
m_data.add_row(point);
|
|
};
|
|
|
|
bool operator()() { return this->compute(); }
|
|
bool compute();
|
|
bool has_implicit() { return !m_implicit_cc.empty(); }
|
|
bool has_explicit() { return !m_explicit_cc.empty(); }
|
|
|
|
/// Returns the implicit component of convex closure (if available)
|
|
///
|
|
/// Implicit component contains constants from get_alphas() that are
|
|
/// implicitly existentially quantified
|
|
const expr_ref_vector &get_implicit() { return m_implicit_cc; }
|
|
|
|
/// \brief Return implicit constants in implicit convex closure
|
|
const expr_ref_vector &get_alphas() const { return m_alphas; }
|
|
|
|
/// Returns the explicit component of convex closure (if available)
|
|
///
|
|
/// The explicit component is in term of column variables
|
|
const expr_ref_vector &get_explicit() { return m_explicit_cc; }
|
|
|
|
/// Returns constants used to name columns
|
|
///
|
|
/// Explicit convex closure is in terms of these variables
|
|
const expr_ref_vector &get_col_vars() { return m_col_vars; }
|
|
|
|
void collect_statistics(statistics &st) const;
|
|
void reset_statistics() { m_st.reset(); }
|
|
};
|
|
} // namespace spacer
|