mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 23:10:26 +00:00
Code Issues Releases Wiki Activity

rulegen:: use more of rdebug_flags

Browse Source
This commit is contained in:
Zeno Rogue 2022-08-17 17:43:25 +02:00
parent 304c9efe54
commit a26234012f
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devmods/rulegen-tests.cpp
View File

@ -239,7 +239,7 @@ void debug_menu() {
} }
println(hlog, "parent_dir = ", c->parent_dir); println(hlog, "parent_dir = ", c->parent_dir);
c->parent_dir = MYSTERY; c->parent_dir = MYSTERY;
parent_debug = true; rulegen::rdebug_flags |= 16;
try { try {
twalker cw(c, 0); twalker cw(c, 0);
get_parent_dir(cw); get_parent_dir(cw);
@ -247,7 +247,7 @@ void debug_menu() {
catch(rulegen_failure& f) { catch(rulegen_failure& f) {
println(hlog, "catched: ", f.what()); println(hlog, "catched: ", f.what());
} }
parent_debug = false; rulegen::rdebug_flags &= ~16;
println(hlog, "parent_dir = ", c->parent_dir); println(hlog, "parent_dir = ", c->parent_dir);
cleanup_protomap(); cleanup_protomap();
}); });
@ -1725,7 +1725,7 @@ int testargs() {
} }
else if(argis("-veb")) { else if(argis("-veb")) {
view_examine_branch = true; rulegen::rdebug_flags |= 32;
} }
else if(argis("-act-seq")) { else if(argis("-act-seq")) {

18
rulegen.cpp
View File

@ -42,8 +42,6 @@ const int MYSTERY = 31999;
const int MYSTERY_LARGE = 31999999; const int MYSTERY_LARGE = 31999999;
#endif #endif
EX bool parent_debug;
/* === tcell === */ /* === tcell === */
/** number of tcells created */ /** number of tcells created */
@ -545,7 +543,7 @@ EX void shortcut_found(tcell *c, tcell *alt, vector<twalker> &walkers, vector<tw
int delta = walkers[wpos].to_spin(walkers2.back().spin); int delta = walkers[wpos].to_spin(walkers2.back().spin);
for(auto& s: shortcuts[c->id]) if(s->pre == pre && s->post == post) { for(auto& s: shortcuts[c->id]) if(s->pre == pre && s->post == post) {
if(parent_debug) if(rdebug_flags & 16)
println(hlog, "already knew that ", pre, " ~ ", post); println(hlog, "already knew that ", pre, " ~ ", post);
return; return;
} }
@ -977,12 +975,12 @@ EX twalker get_parent_dir(twalker& cw) {
ensure_shorter(cw+i); ensure_shorter(cw+i);
tcell *c1 = c->cmove(i); tcell *c1 = c->cmove(i);
be_solid(c1); be_solid(c1);
if(parent_debug) println(hlog, "direction = ", i, " is ", c1, " distance = ", c1->dist); if(rdebug_flags & 16) println(hlog, "direction = ", i, " is ", c1, " distance = ", c1->dist);
if(c1->dist < d) nearer.push_back(i); if(c1->dist < d) nearer.push_back(i);
ufind(cw); if(d != cw.at->dist || oc != cw.at) return get_parent_dir(cw); ufind(cw); if(d != cw.at->dist || oc != cw.at) return get_parent_dir(cw);
} }
if(parent_debug) println(hlog, "nearer = ", nearer, " n=", n, " k=", k); if(rdebug_flags & 16) println(hlog, "nearer = ", nearer, " n=", n, " k=", k);
bool failed = false; bool failed = false;
if(flags & w_parent_always) {failed = true; goto resolve; } if(flags & w_parent_always) {failed = true; goto resolve; }
@ -993,7 +991,7 @@ EX twalker get_parent_dir(twalker& cw) {
if(beats(ne, bestd)) if(beats(ne, bestd))
bestd = ne; bestd = ne;
if(parent_debug) for(auto ne: nearer) println(hlog, "beats", tie(ne, bestd), " = ", beats(ne, bestd)); if(rdebug_flags & 16) for(auto ne: nearer) println(hlog, "beats", tie(ne, bestd), " = ", beats(ne, bestd));
for(auto ne: nearer) for(auto ne: nearer)
if(ne != bestd && beats(ne, bestd)) if(ne != bestd && beats(ne, bestd))
@ -1027,7 +1025,7 @@ EX twalker get_parent_dir(twalker& cw) {
} }
} }
if(parent_debug) println(hlog, "set parent_dir to ", bestd); if(rdebug_flags & 16) println(hlog, "set parent_dir to ", bestd);
c->parent_dir = bestd; c->parent_dir = bestd;
if(c->old_parent_dir != MYSTERY && c->old_parent_dir != bestd && c == oc) { if(c->old_parent_dir != MYSTERY && c->old_parent_dir != bestd && c == oc) {
@ -1732,8 +1730,6 @@ void verified_treewalk(twalker& tw, int id, int dir) {
treewalk(tw, dir); treewalk(tw, dir);
} }
EX bool view_examine_branch = false;
bool examine_branch(int id, int left, int right) { bool examine_branch(int id, int left, int right) {
if(WDIM == 3) return true; if(WDIM == 3) return true;
auto rg = treestates[id].giver; auto rg = treestates[id].giver;
@ -1776,7 +1772,7 @@ bool examine_branch(int id, int left, int right) {
auto rl = get_rule(wl, tsl); auto rl = get_rule(wl, tsl);
auto rr = get_rule(wr, tsr); auto rr = get_rule(wr, tsr);
if(view_examine_branch) if(debugflags & DF_GEOM) if(rdebug_flags & 32)
println(hlog, "wl = ", wl, " -> ", wl+wstep, " R", rl, " wr = ", wr, " -> ", wr+wstep, " R", rr, " lstack = ", lstack, " rstack = ", rstack); println(hlog, "wl = ", wl, " -> ", wl+wstep, " R", rl, " wr = ", wr, " -> ", wr+wstep, " R", rr, " lstack = ", lstack, " rstack = ", rstack);
if(rl == DIR_RIGHT && rr == DIR_LEFT && lstack.empty() && rstack.empty()) { if(rl == DIR_RIGHT && rr == DIR_LEFT && lstack.empty() && rstack.empty()) {
@ -1784,7 +1780,7 @@ bool examine_branch(int id, int left, int right) {
push_deadstack(hash, wl, tsl, -1); push_deadstack(hash, wl, tsl, -1);
hash.emplace_back(-1, wl.at->dist - wr.at->dist); hash.emplace_back(-1, wl.at->dist - wr.at->dist);
push_deadstack(hash, wr, tsr, +1); push_deadstack(hash, wr, tsr, +1);
if(view_examine_branch) if(debugflags & DF_GEOM) if(rdebug_flags & 32)
println(hlog, "got hash: ", hash); println(hlog, "got hash: ", hash);
if(verified_branches.count(hash)) { if(verified_branches.count(hash)) {
return true; return true;