mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

in hrmap_h3_subrule, better debugging of conficts

Browse Source
This commit is contained in:
Zeno Rogue
2022-07-17 12:48:28 +02:00
parent 7c6fece132
commit f2efc6f295
1 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
reg3.cpp
View File

@@ -2197,8 +2197,7 @@ EX namespace reg3 {
} }
}; };
int lev; vector<heptspin> starts = {nullptr};
int err_on = 500;
struct hrmap_h3_subrule : hrmap, ruleset { struct hrmap_h3_subrule : hrmap, ruleset {
@@ -2210,6 +2209,46 @@ EX namespace reg3 {
return quotient_map->local_id[quotient_map->acells[fv]->move(d)].first; return quotient_map->local_id[quotient_map->acells[fv]->move(d)].first;
} }
void explain_conflict(vector<heptspin> hs) {
vector<heptagon*> v;
for(auto h: hs) v.push_back(h.at);
int N = isize(v);
vector<vector<int>> paths(N);
while(true) {
bool eq = true;
for(auto c: v) if(c != v[0]) eq = false;
if(eq) break;
int mindist = 999999;
int maxdist = -999999;
for(auto c: v) {
if(c->distance < mindist) mindist = c->distance;
if(c->distance > maxdist) maxdist = c->distance;
}
int goal = min(mindist, maxdist-1);
println(hlog, "mindist = ", mindist, " maxdist = ", maxdist, " goal = ", goal);
int id = 0;
for(auto& c: v) {
while(c->distance > goal) {
println(hlog, c, " distance is ", c);
int d = find_parent(c);
paths[id].push_back(c->c.spin(d));
c = c->move(d);
}
id++;
}
}
for(auto& p: paths) reverse(p.begin(), p.end());
hs.push_back(heptspin(v[0], find_parent(v[0])));
for(auto h: hs) {
println(hlog, h, " : dist = ", h.at->distance, " id = ", h.at->fiftyval, " qid = ", h.at->fieldval);
}
println(hlog, "paths = ", paths);
}
hrmap_h3_subrule() { hrmap_h3_subrule() {
println(hlog, "loading a subrule ruleset"); println(hlog, "loading a subrule ruleset");
@@ -2232,20 +2271,25 @@ EX namespace reg3 {
} }
heptagon *create_step(heptagon *parent, int d) override { heptagon *create_step(heptagon *parent, int d) override {
dynamicval<int> rl(lev, lev+1); if(starts[isize(starts)/2] == parent) {
if(lev > err_on) println(hlog, "create_step called for ", tie(parent, d), " in distance ", parent->distance); int i = 0;
indenter ind(lev > err_on ? 2 : 0); vector<heptspin> cut;
for(auto s: starts) if(i++ >= isize(starts)/2) cut.push_back(s);
println(hlog, "cycle detected is ", cut);
explain_conflict(cut);
throw hr_exception("create_step cycle detected");
}
starts.push_back(parent);
finalizer f([] { starts.pop_back(); });
int id = parent->fiftyval; int id = parent->fiftyval;
if(id < 0) id += (1<<16); if(id < 0) id += (1<<16);
if(lev > err_on) throw hr_exception("create_step deep recursion");
int qid = parent->fieldval; int qid = parent->fieldval;
int d2 = quotient_map->acells[qid]->c.spin(d); int d2 = quotient_map->acells[qid]->c.spin(d);
int qid2 = quotient_map->local_id[quotient_map->acells[qid]->move(d)].first; int qid2 = quotient_map->local_id[quotient_map->acells[qid]->move(d)].first;
if(lev > 10) println(hlog, tie(id, qid, d2, qid2));
heptagon *res = nullptr; heptagon *res = nullptr;
int id1 = children[childpos[id]+d]; int id1 = children[childpos[id]+d];
@@ -2286,12 +2330,30 @@ EX namespace reg3 {
if(!res) throw hr_exception("res missing"); if(!res) throw hr_exception("res missing");
if(res->move(d2)) println(hlog, "res conflict: ", heptspin(res,d2), " already connected to ", heptspin(res,d2)+wstep, " and should be connected to ", heptspin(parent,d)); if(res->move(d2)) {
heptspin a(res, d2);
heptspin b = a + wstep;
heptspin c(parent, d);
println(hlog, "res conflict: ", a, " already connected to ", b, " and should be connected to ", c);
explain_conflict({a, b, c});
}
res->c.connect(d2, parent, d, false); res->c.connect(d2, parent, d, false);
return res; return res;
} }
int find_parent(heptagon *h) {
int id = h->fiftyval;
int pos = childpos[id];
for(int i=0; i<childpos[id+1]-childpos[id]; i++)
if(other[otherpos[pos+i]] == 'A'+i && other[otherpos[pos+i]+1] == ',') {
println(hlog, "find_parent returns ", i, " for ", h);
return i;
}
println(hlog, "find_parent fails");
return 0;
}
~hrmap_h3_subrule() { ~hrmap_h3_subrule() {
if(quotient_map) delete quotient_map; if(quotient_map) delete quotient_map;
clearfrom(origin); clearfrom(origin);