michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(library/blast/congruence_closure): add blast.trace_cc option

Browse source
This commit is contained in:
Leonardo de Moura 2015-11-23 14:24:59 -08:00
parent 46e60abda6
commit f1a3f8ec9d
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/library/blast/congruence_closure.cpp
View file

@ -13,6 +13,7 @@ Author: Leonardo de Moura
#include "library/blast/util.h"
#include "library/blast/blast.h"
#include "library/blast/trace.h"
#include "library/blast/options.h"
namespace lean {
namespace blast {
@ -831,6 +832,11 @@ void congruence_closure::add_eqv_step(name const & R, expr e1, expr e2, expr con
s.mk_hypothesis(type, pr);
}
}
if (get_config().m_trace_cc) {
diagnostic(env(), ios()) << "added equivalence " << ppb(e1) << " [" << R << "] " << ppb(e2) << "\n";
display();
}
}
void congruence_closure::process_todo() {
@ -1283,6 +1289,7 @@ void congruence_closure::display() const {
diagnostic(env(), ios()) << "congruence closure state\n";
display_eqcs();
display_parents();
diagnostic(env(), ios()) << "\n";
}
bool congruence_closure::check_eqc(name const & R, expr const & e) const {

14
src/library/blast/options.cpp
View file

@ -31,6 +31,9 @@ Author: Leonardo de Moura
#ifndef LEAN_DEFAULT_BLAST_CC
#define LEAN_DEFAULT_BLAST_CC true
#endif
#ifndef LEAN_DEFAULT_BLAST_TRACE_CC
#define LEAN_DEFAULT_BLAST_TRACE_CC false
#endif
#ifndef LEAN_DEFAULT_BLAST_RECURSOR
#define LEAN_DEFAULT_BLAST_RECURSOR true
#endif
@ -46,6 +49,7 @@ static name * g_blast_trace = nullptr;
static name * g_blast_subst = nullptr;
static name * g_blast_simp = nullptr;
static name * g_blast_cc = nullptr;
static name * g_blast_trace_cc = nullptr;
static name * g_blast_recursor = nullptr;
static name * g_blast_show_failure = nullptr;
@ -70,6 +74,9 @@ bool get_blast_simp(options const & o) {
bool get_blast_cc(options const & o) {
return o.get_bool(*g_blast_cc, LEAN_DEFAULT_BLAST_CC);
}
bool get_blast_trace_cc(options const & o) {
return o.get_bool(*g_blast_trace_cc, LEAN_DEFAULT_BLAST_TRACE_CC);
}
bool get_blast_recursor(options const & o) {
return o.get_bool(*g_blast_recursor, LEAN_DEFAULT_BLAST_RECURSOR);
}
@ -85,6 +92,7 @@ config::config(options const & o) {
m_subst = get_blast_subst(o);
m_simp = get_blast_simp(o);
m_cc = get_blast_cc(o);
m_trace_cc = get_blast_trace_cc(o);
m_recursor = get_blast_recursor(o);
m_show_failure = get_blast_show_failure(o);
}
@ -114,6 +122,7 @@ void initialize_options() {
g_blast_subst = new name{"blast", "subst"};
g_blast_simp = new name{"blast", "simp"};
g_blast_cc = new name{"blast", "cc"};
g_blast_trace_cc = new name{"blast", "trace_cc"};
g_blast_recursor = new name{"blast", "recursor"};
g_blast_show_failure = new name{"blast", "show_failure"};
@ -131,9 +140,11 @@ void initialize_options() {
"(blast) enable simplier actions");
register_bool_option(*blast::g_blast_cc, LEAN_DEFAULT_BLAST_CC,
"(blast) enable congruence closure");
register_bool_option(*blast::g_blast_trace_cc, LEAN_DEFAULT_BLAST_TRACE_CC,
"(blast) (for debugging purposes) trace congruence closure");
register_bool_option(*blast::g_blast_recursor, LEAN_DEFAULT_BLAST_RECURSOR,
"(blast) enable recursor action");
register_bool_option(*blast::g_blast_cc, LEAN_DEFAULT_BLAST_SHOW_FAILURE,
register_bool_option(*blast::g_blast_show_failure, LEAN_DEFAULT_BLAST_SHOW_FAILURE,
"(blast) show failure state");
}
void finalize_options() {
@ -144,6 +155,7 @@ void finalize_options() {
delete g_blast_subst;
delete g_blast_simp;
delete g_blast_cc;
delete g_blast_trace_cc;
delete g_blast_recursor;
delete g_blast_show_failure;
}

1
src/library/blast/options.h
View file

@ -19,6 +19,7 @@ struct config {
bool m_simp;
bool m_recursor;
bool m_cc;
bool m_trace_cc;
bool m_show_failure;
config(options const & o);
};