mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-05 11:12:49 +00:00
Code Issues Releases Wiki Activity

rulegen:: branch skipping now made optional, also reset in case of serious errors

Browse Source
This commit is contained in:
Zeno Rogue 2021-12-29 04:20:19 +01:00
parent d40ea1d6ba
commit e190fc63a7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rulegen.cpp
View File

@ -83,6 +83,7 @@ static const flagtype w_no_smart_shortcuts = Flag(21); /*< disable the 'smart sh
static const flagtype w_less_smart_retrace = Flag(22); /*< stop early when examining smart shortcut retraction */ static const flagtype w_less_smart_retrace = Flag(22); /*< stop early when examining smart shortcut retraction */
static const flagtype w_less_smart_advance = Flag(23); /*< stop early when examining smart shortcut advancement */ static const flagtype w_less_smart_advance = Flag(23); /*< stop early when examining smart shortcut advancement */
static const flagtype w_no_queued_extensions = Flag(24); /*< consider extensions one by one */ static const flagtype w_no_queued_extensions = Flag(24); /*< consider extensions one by one */
static const flagtype w_no_branch_skipping = Flag(24); /*< do not skip branches */
#endif #endif
EX flagtype flags = 0; EX flagtype flags = 0;
@ -454,6 +455,10 @@ struct shortcut {
EX vector<vector<unique_ptr<shortcut>> > shortcuts; EX vector<vector<unique_ptr<shortcut>> > shortcuts;
vector<reaction_t> skipped_branches;
using branch_check = tuple<int, int, int>;
set<branch_check> checks_to_skip;
vector<int> root_path(twalker& cw) { vector<int> root_path(twalker& cw) {
cw += wstep; cw += wstep;
vector<int> res; vector<int> res;
@ -694,12 +699,14 @@ EX void handle_distance_errors() {
if(flags & w_always_clean) clean_data(); if(flags & w_always_clean) clean_data();
debuglist = solid_errors_list; debuglist = solid_errors_list;
solid_errors_list = {}; solid_errors_list = {};
checks_to_skip.clear();
throw hr_solid_error(); throw hr_solid_error();
} }
b = distance_warnings; b = distance_warnings;
distance_warnings = 0; distance_warnings = 0;
if(b && !no_errors) { if(b && !no_errors) {
clean_parents(); clean_parents();
checks_to_skip.clear();
throw rulegen_retry("distance exceeded"); throw rulegen_retry("distance exceeded");
} }
} }
@ -1191,6 +1198,7 @@ int get_side(twalker what) {
handle_distance_errors(); handle_distance_errors();
steps++; if(steps > max_getside) { steps++; if(steps > max_getside) {
debuglist = {what, to_what, wl, wr}; debuglist = {what, to_what, wl, wr};
checks_to_skip.clear();
if(parent_updates) throw rulegen_retry("xsidefreeze"); if(parent_updates) throw rulegen_retry("xsidefreeze");
else throw rulegen_failure("xsidefreeze"); else throw rulegen_failure("xsidefreeze");
} }
@ -1613,10 +1621,6 @@ 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;
@ -1874,6 +1878,10 @@ EX void rules_iteration() {
skipped_branches.clear(); 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) {
if(flags & w_no_branch_skipping) {
examine_branch(id, fb, sb);
return;
}
auto b = branch_check{treestates[id].astate, fb, sb}; auto b = branch_check{treestates[id].astate, fb, sb};
if(checks_to_skip.count(b)) { if(checks_to_skip.count(b)) {
skipped_branches.emplace_back([id, fb, sb] { examine_branch(id, fb, sb); }); skipped_branches.emplace_back([id, fb, sb] { examine_branch(id, fb, sb); });