mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-29 21:13:00 +00:00
Code Issues Releases Wiki Activity

fixed a bug causing skipped branches to interact badly with single live branches

Browse Source
This commit is contained in:
Zeno Rogue
2021-12-29 03:34:31 +01:00
parent 61c5ad9344
commit d7d3d21d2a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rulegen.cpp
View File

@@ -1565,6 +1565,10 @@ void verified_treewalk(twalker& tw, int id, int dir) {
treewalk(tw, dir); treewalk(tw, dir);
} }
vector<reaction_t> skipped_branches;
using branch_check = tuple<int, int, int>;
set<branch_check> checks_to_skip;
bool examine_branch(int id, int left, int right) { bool examine_branch(int id, int left, int right) {
auto rg = treestates[id].giver; auto rg = treestates[id].giver;
@@ -1585,7 +1589,11 @@ bool examine_branch(int id, int left, int right) {
steps++; steps++;
if(steps > max_examine_branch) { if(steps > max_examine_branch) {
debuglist = { rg+left, wl, wr }; debuglist = { rg+left, wl, wr };
if(branch_conflicts_seen.size()) if(skipped_branches.size()) {
checks_to_skip.clear();
throw rulegen_retry("max_examine_branch exceeded after a skipped check");
}
else if(branch_conflicts_seen.size())
/* may be not a real problem, but caused by incorrect detection of live branches */ /* may be not a real problem, but caused by incorrect detection of live branches */
throw rulegen_retry("max_examine_branch exceeded after a conflict"); throw rulegen_retry("max_examine_branch exceeded after a conflict");
else else
@@ -1693,9 +1701,6 @@ EX void clean_analyzers() {
next_analyzer_id = 0; next_analyzer_id = 0;
} }
using branch_check = tuple<int, int, int>;
set<branch_check> checks_to_skip;
EX void clean_data() { EX void clean_data() {
clean_analyzers(); clean_analyzers();
checks_to_skip.clear(); checks_to_skip.clear();
@@ -1818,7 +1823,7 @@ EX void rules_iteration() {
handle_queued_extensions(); handle_queued_extensions();
vector<reaction_t> skipped_branches; skipped_branches.clear();
auto examine_or_skip_branch = [&] (int id, int fb, int sb) { auto examine_or_skip_branch = [&] (int id, int fb, int sb) {
auto b = branch_check{treestates[id].astate, fb, sb}; auto b = branch_check{treestates[id].astate, fb, sb};