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

honeycomb-rules-generator:: no more need to set XS7

Browse Source
This commit is contained in:
Zeno Rogue
2021-05-20 23:03:13 +02:00
parent ce3098de65
commit f485441650
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
devmods/honeycomb-rule-generator.cpp
View File

@@ -39,9 +39,6 @@ int exh;
map<string, map<string,int> > rules; map<string, map<string,int> > rules;
/** \brief S7 -- for efficiency this is a fixed constant */
#define XS7 20
/** \brief distance from the center */ /** \brief distance from the center */
#define FV master->fiftyval #define FV master->fiftyval
@@ -144,8 +141,6 @@ string find_path(cell *x, cell *y) {
} }
} }
vector<array<string, XS7>> rule_list;
/** a map of all the cells vertex-adjacent to c */ /** a map of all the cells vertex-adjacent to c */
struct ext_nei_rules_t { struct ext_nei_rules_t {
vector<int> from, dir, original; vector<int> from, dir, original;
@@ -270,13 +265,13 @@ vector<cell*> rep_of;
int number_states = 0; int number_states = 0;
/** \brief for state s, child_rules[s][i] is -1 if i-th neighbor not a child; otherwise, the state index of that neighbor */ /** \brief for state s, child_rules[s][i] is -1 if i-th neighbor not a child; otherwise, the state index of that neighbor */
vector<array<int, XS7> > child_rules; vector<vector<int> > child_rules;
/** parent direction for every state */ /** parent direction for every state */
vector<int> parent_list; vector<int> parent_list;
/** \brief if child_rules[s][i] is -1, the rules to get to that neighbor */ /** \brief if child_rules[s][i] is -1, the rules to get to that neighbor */
vector<array<string, XS7> > side_rules; vector<vector<string> > side_rules;
void add_candidate(cell *c) { void add_candidate(cell *c) {
if(candidates.count(c)) return; if(candidates.count(c)) return;
@@ -286,7 +281,6 @@ void add_candidate(cell *c) {
/** the main function */ /** the main function */
void test_canonical(string fname) { void test_canonical(string fname) {
if(S7 != XS7) { println(hlog, "fix XS7=", S7); exit(4); }
stop_game(); stop_game();
reg3::reg3_rule_available = false; reg3::reg3_rule_available = false;
start_game(); start_game();
@@ -313,7 +307,7 @@ void test_canonical(string fname) {
for(cell* c: c0) add_candidate(c); for(cell* c: c0) add_candidate(c);
array<int, XS7> empty; vector<int> empty(S7);
for(auto& e: empty) e = -1; for(auto& e: empty) e = -1;
println(hlog, "empty = ", empty); println(hlog, "empty = ", empty);
@@ -378,13 +372,13 @@ void test_canonical(string fname) {
int lqids = 0; int lqids = 0;
for(int a=0; a<100; a++) { for(int a=0; a<100; a++) {
set<array<int, XS7+1>> found; set<vector<int>> found;
vector<array<int, XS7+1>> v(number_states); vector<vector<int>> v(number_states);
map<array<int, XS7+1>, int> ids; map<vector<int>, int> ids;
for(int i=0; i<number_states; i++) { for(int i=0; i<number_states; i++) {
array<int, XS7+1> res; vector<int> res(S7+1);
for(int d=0; d<XS7; d++) res[d] = (child_rules[i][d] != -1) ? ih[child_rules[i][d]] : -1; for(int d=0; d<S7; d++) res[d] = (child_rules[i][d] != -1) ? ih[child_rules[i][d]] : -1;
res[XS7] = parent_list[i]; res[S7] = parent_list[i];
v[i] = res; v[i] = res;
found.insert(res); found.insert(res);
} }
@@ -398,11 +392,11 @@ void test_canonical(string fname) {
} }
println(hlog, "reduced states to = ", lqids); println(hlog, "reduced states to = ", lqids);
vector<array<int, XS7> > new_child_rules; vector<vector<int> > new_child_rules;
new_child_rules.resize(lqids, empty); new_child_rules.resize(lqids, empty);
for(int i=0; i<number_states; i++) { for(int i=0; i<number_states; i++) {
int j = ih[i]; int j = ih[i];
for(int d=0; d<XS7; d++) { for(int d=0; d<S7; d++) {
int cid = child_rules[i][d]; int cid = child_rules[i][d];
new_child_rules[j][d] = cid == -1 ? -1 : ih[cid]; new_child_rules[j][d] = cid == -1 ? -1 : ih[cid];
} }
@@ -419,6 +413,7 @@ void test_canonical(string fname) {
/* generate side rules */ /* generate side rules */
side_rules.resize(number_states); side_rules.resize(number_states);
for(auto& s: side_rules) s.resize(S7);
for(int i=0; i<isize(candidates_list); i++) { for(int i=0; i<isize(candidates_list); i++) {
cell *c = candidates_list[i]; cell *c = candidates_list[i];