mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 04:13:38 +00:00
Code Activity

Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls

Browse source 
Conflicts:
	src/tactic/sls/sls_evaluator.h
	src/tactic/sls/sls_tactic.cpp
	src/tactic/sls/sls_tracker.h
This commit is contained in:
Andreas Froehlich 2014-03-19 12:09:29 +00:00
commit eabebedabf
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tactic/sls/sls_evaluator.h
View file

@ -586,7 +586,7 @@ public:
#else #else
m_tracker.set_score(cur, m_tracker.score(cur)); m_tracker.set_score(cur, m_tracker.score(cur));
#endif #endif
#endif #endif
if (m_tracker.has_uplinks(cur)) { if (m_tracker.has_uplinks(cur)) {
ptr_vector<expr> & ups = m_tracker.get_uplinks(cur); ptr_vector<expr> & ups = m_tracker.get_uplinks(cur);
for (unsigned j = 0; j < ups.size(); j++) { for (unsigned j = 0; j < ups.size(); j++) {
@ -645,7 +645,7 @@ public:
#else #else
m_tracker.set_score(cur, m_tracker.score(cur)); m_tracker.set_score(cur, m_tracker.score(cur));
#endif #endif
#endif #endif
if (m_tracker.has_uplinks(cur)) { if (m_tracker.has_uplinks(cur)) {
ptr_vector<expr> & ups = m_tracker.get_uplinks(cur); ptr_vector<expr> & ups = m_tracker.get_uplinks(cur);
for (unsigned j = 0; j < ups.size(); j++) { for (unsigned j = 0; j < ups.size(); j++) {

1
src/tactic/sls/sls_tactic.cpp
View file

@ -518,7 +518,6 @@ class sls_tactic : public tactic {
void mk_random_move(ptr_vector<func_decl> & unsat_constants) void mk_random_move(ptr_vector<func_decl> & unsat_constants)
{ {
unsigned rnd_mv = 0; unsigned rnd_mv = 0;
unsigned ucc = unsat_constants.size(); unsigned ucc = unsat_constants.size();
unsigned rc = (m_tracker.get_random_uint((ucc < 16) ? 4 : (ucc < 256) ? 8 : (ucc < 4096) ? 12 : (ucc < 65536) ? 16 : 32)) % ucc; unsigned rc = (m_tracker.get_random_uint((ucc < 16) ? 4 : (ucc < 256) ? 8 : (ucc < 4096) ? 12 : (ucc < 65536) ? 16 : 32)) % ucc;
func_decl * fd = unsat_constants[rc]; func_decl * fd = unsat_constants[rc];

3
src/tactic/sls/sls_tracker.h
View file

@ -1147,11 +1147,12 @@ public:
#if _PROBABILISTIC_UCT_ #if _PROBABILISTIC_UCT_
double sum_score = 0.0; double sum_score = 0.0;
unsigned start_index = get_random_uint(16) % sz; unsigned start_index = get_random_uint(16) % sz;
for (unsigned i = start_index; i < sz; i++) for (unsigned i = start_index; i < sz; i++)
{ {
expr * e = g->form(i); expr * e = g->form(i);
vscore = m_scores.find(e); vscore = m_scores.find(e);
#if _PROBABILISTIC_UCT_ == 2 #if _PROBABILISTIC_UCT_ == 2
double q = vscore.score * vscore.score; double q = vscore.score * vscore.score;
#else #else