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

feat(library/blast): add option for disabling simplifier

Browse source
This commit is contained in:
Leonardo de Moura 2015-11-21 12:19:55 -08:00
parent c280ddb2b0
commit a61869ba1a
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,9 @@ Author: Leonardo de Moura
#ifndef LEAN_DEFAULT_BLAST_SUBST #ifndef LEAN_DEFAULT_BLAST_SUBST
#define LEAN_DEFAULT_BLAST_SUBST true #define LEAN_DEFAULT_BLAST_SUBST true
#endif #endif
#ifndef LEAN_DEFAULT_BLAST_SIMP
#define LEAN_DEFAULT_BLAST_SIMP true
#endif
namespace lean { namespace lean {
namespace blast { namespace blast {
@ -31,6 +34,7 @@ static name * g_blast_init_depth = nullptr;
static name * g_blast_inc_depth = nullptr; static name * g_blast_inc_depth = nullptr;
static name * g_blast_trace = nullptr; static name * g_blast_trace = nullptr;
static name * g_blast_subst = nullptr; static name * g_blast_subst = nullptr;
static name * g_blast_simp = nullptr;
unsigned get_blast_max_depth(options const & o) { unsigned get_blast_max_depth(options const & o) {
return o.get_unsigned(*g_blast_max_depth, LEAN_DEFAULT_BLAST_MAX_DEPTH); return o.get_unsigned(*g_blast_max_depth, LEAN_DEFAULT_BLAST_MAX_DEPTH);
@ -47,6 +51,9 @@ bool get_blast_trace(options const & o) {
bool get_blast_subst(options const & o) { bool get_blast_subst(options const & o) {
return o.get_bool(*g_blast_subst, LEAN_DEFAULT_BLAST_SUBST); return o.get_bool(*g_blast_subst, LEAN_DEFAULT_BLAST_SUBST);
} }
bool get_blast_simp(options const & o) {
return o.get_bool(*g_blast_simp, LEAN_DEFAULT_BLAST_SIMP);
}
config::config(options const & o) { config::config(options const & o) {
m_max_depth = get_blast_max_depth(o); m_max_depth = get_blast_max_depth(o);
@ -54,6 +61,7 @@ config::config(options const & o) {
m_inc_depth = get_blast_inc_depth(o); m_inc_depth = get_blast_inc_depth(o);
m_trace = get_blast_trace(o); m_trace = get_blast_trace(o);
m_subst = get_blast_subst(o); m_subst = get_blast_subst(o);
m_simp = get_blast_simp(o);
} }
LEAN_THREAD_PTR(config, g_config); LEAN_THREAD_PTR(config, g_config);
@ -79,6 +87,7 @@ void initialize_options() {
g_blast_inc_depth = new name{"blast", "inc_depth"}; g_blast_inc_depth = new name{"blast", "inc_depth"};
g_blast_trace = new name{"blast", "trace"}; g_blast_trace = new name{"blast", "trace"};
g_blast_subst = new name{"blast", "subst"}; g_blast_subst = new name{"blast", "subst"};
g_blast_simp = new name{"blast", "simp"};
register_unsigned_option(*blast::g_blast_max_depth, LEAN_DEFAULT_BLAST_MAX_DEPTH, register_unsigned_option(*blast::g_blast_max_depth, LEAN_DEFAULT_BLAST_MAX_DEPTH,
"(blast) max search depth for blast"); "(blast) max search depth for blast");
@ -90,6 +99,8 @@ void initialize_options() {
"(blast) trace"); "(blast) trace");
register_bool_option(*blast::g_blast_subst, LEAN_DEFAULT_BLAST_SUBST, register_bool_option(*blast::g_blast_subst, LEAN_DEFAULT_BLAST_SUBST,
"(blast) enable subst action"); "(blast) enable subst action");
register_bool_option(*blast::g_blast_simp, LEAN_DEFAULT_BLAST_SIMP,
"(blast) enable simplier actions");
} }
void finalize_options() { void finalize_options() {
delete g_blast_max_depth; delete g_blast_max_depth;
@ -97,5 +108,6 @@ void finalize_options() {
delete g_blast_inc_depth; delete g_blast_inc_depth;
delete g_blast_trace; delete g_blast_trace;
delete g_blast_subst; delete g_blast_subst;
delete g_blast_simp;
} }
}} }}

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

@ -16,6 +16,7 @@ struct config {
unsigned m_inc_depth; unsigned m_inc_depth;
bool m_trace; bool m_trace;
bool m_subst; bool m_subst;
bool m_simp;
config(options const & o); config(options const & o);
}; };

3
src/library/blast/simplifier/simplifier_actions.cpp
View file

@ -8,6 +8,7 @@ Author: Leonardo de Moura
#include "library/blast/simple_actions.h" #include "library/blast/simple_actions.h"
#include "library/blast/blast.h" #include "library/blast/blast.h"
#include "library/blast/trace.h" #include "library/blast/trace.h"
#include "library/blast/options.h"
#include "library/blast/simplifier/simplifier.h" #include "library/blast/simplifier/simplifier.h"
namespace lean { namespace lean {
@ -64,6 +65,8 @@ public:
}; };
action_result simplify_target_action() { action_result simplify_target_action() {
if (!get_config().m_simp)
return action_result::failed();
state & s = curr_state(); state & s = curr_state();
expr target = s.get_target(); expr target = s.get_target();
bool iff = use_iff(target); bool iff = use_iff(target);