mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-09-23 03:28:41 +00:00
Code Issues Releases Wiki Activity

use vectors not maps for shortcuts and analyzers

Browse Source
This commit is contained in:
Zeno Rogue
2021-12-27 20:19:18 +01:00
parent f9b23b6c39
commit 77bfa5c9a7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rulegen.cpp
+9 -4
View File
@@ -438,7 +438,7 @@ struct shortcut {
}; };
#endif #endif
EX map<int, vector<unique_ptr<shortcut>> > shortcuts; EX vector<vector<unique_ptr<shortcut>> > shortcuts;
vector<int> root_path(twalker& cw) { vector<int> root_path(twalker& cw) {
cw += wstep; cw += wstep;
@@ -962,7 +962,7 @@ struct analyzer_state {
int next_analyzer_id; int next_analyzer_id;
EX map<aid_t, analyzer_state*> analyzers; EX vector<vector<analyzer_state*>> analyzers;
EX vector<analyzer_state*> all_analyzers; EX vector<analyzer_state*> all_analyzers;
analyzer_state *alloc_analyzer() { analyzer_state *alloc_analyzer() {
@@ -1187,7 +1187,7 @@ int move_code(twalker cs) {
EX void id_at_spin(twalker cw, vector<twalker>& sprawl, vector<analyzer_state*>& states) { EX void id_at_spin(twalker cw, vector<twalker>& sprawl, vector<analyzer_state*>& states) {
ufind(cw); ufind(cw);
auto aid = get_aid(cw); auto aid = get_aid(cw);
auto a_ptr = &(analyzers[aid]); auto a_ptr = &(analyzers[aid.first][aid.second]);
sprawl = { cw }; sprawl = { cw };
states = { nullptr }; states = { nullptr };
@@ -1669,7 +1669,7 @@ void find_single_live_branch(twalker& at) {
EX void clean_analyzers() { EX void clean_analyzers() {
for(auto a: all_analyzers) delete a; for(auto a: all_analyzers) delete a;
analyzers.clear(); for(auto& av: analyzers) for(auto& a: av) a = nullptr;
all_analyzers.clear(); all_analyzers.clear();
next_analyzer_id = 0; next_analyzer_id = 0;
} }
@@ -1902,6 +1902,11 @@ EX void generate_rules() {
treestates.clear(); treestates.clear();
hard_parents = single_live_branches = double_live_branches = all_solid_errors = 0; hard_parents = single_live_branches = double_live_branches = all_solid_errors = 0;
int NS = isize(arb::current.shapes);
shortcuts.resize(NS);
analyzers.resize(NS);
for(int i=0; i<NS; i++) analyzers[i].resize(arb::current.shapes[i].cycle_length);
t_origin.clear(); t_origin.clear();
cell_to_tcell.clear(); cell_to_tcell.clear();
tcell_to_cell.clear(); tcell_to_cell.clear();