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

rogueviz::kohonen:: made kohrestrict cell order more deterministic

Browse Source
This commit is contained in:
Zeno Rogue 2021-04-23 21:00:15 +02:00
parent 7086c16c04
commit c8b26954c2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rogueviz/kohonen.cpp
View File

@ -40,7 +40,8 @@ struct neuron {
int lpbak; int lpbak;
color_t col; color_t col;
int allsamples, drawn_samples, csample, bestsample, max_group_here; int allsamples, drawn_samples, csample, bestsample, max_group_here;
neuron() { drawn_samples = allsamples = bestsample = 0; max_group_here = max_group; } int debug;
neuron() { drawn_samples = allsamples = bestsample = 0; max_group_here = max_group; debug = 0; }
}; };
vector<string> colnames; vector<string> colnames;
@ -538,7 +539,8 @@ void buildcellcrawler(cell *c, cellcrawler& cr, int dir) {
map<int, cellcrawler> scc; map<int, cellcrawler> scc;
pair<int, int> get_cellcrawler_id(cell *c) { pair<int, int> get_cellcrawler_id(cell *c) {
if(among(geometry, gZebraQuotient, gMinimal, gField435, gField534) || (euclid && quotient && !bounded) || IRREGULAR || (GDIM == 3 && sphere)) { if(among(geometry, gZebraQuotient, gMinimal, gArnoldCat, gField435, gField534) || (euclid && quotient && !bounded) || IRREGULAR || (GDIM == 3 && sphere) || (hyperbolic && GDIM == 3 && quotient)
|| (euclid && nonorientable)) {
// Zebra Quotient does exhibit some symmetries, // Zebra Quotient does exhibit some symmetries,
// but these are so small anyway that it is safer to just build // but these are so small anyway that it is safer to just build
// a crawler for every neuron // a crawler for every neuron
@ -679,6 +681,7 @@ void step() {
for(auto& sd: s.data) { for(auto& sd: s.data) {
neuron *n2 = getNeuron(sd.target.at); neuron *n2 = getNeuron(sd.target.at);
if(!n2) continue; if(!n2) continue;
n2->debug++;
double nu = learning_factor; double nu = learning_factor;
if(gaussian) { if(gaussian) {
@ -696,6 +699,11 @@ void step() {
} }
} }
for(auto& n2: net) {
if(n2.debug > 1) throw hr_exception("sprawler error");
n2.debug = 0;
}
t--; t--;
if(t == 0) analyze(); if(t == 0) analyze();
} }
@ -791,8 +799,13 @@ vector<cell*> gen_neuron_cells() {
map<cell*, int> clindex; map<cell*, int> clindex;
for(int i=0; i<isize(allcells); i++) clindex[allcells[i]] = i; for(int i=0; i<isize(allcells); i++) clindex[allcells[i]] = i;
sort(allcells.begin(), allcells.end(), [&clindex] (cell *c1, cell *c2) { sort(allcells.begin(), allcells.end(), [&clindex] (cell *c1, cell *c2) {
return make_pair(hdist0(tC0(ggmatrix(c1))), clindex[c1]) < ld d1 = hdist0(tC0(ggmatrix(c1)));
make_pair(hdist0(tC0(ggmatrix(c2))), clindex[c2]); ld d2 = hdist0(tC0(ggmatrix(c2)));
if(d1 < d2 - 1e-6)
return true;
if(d2 < d1 - 1e-6)
return false;
return clindex[c1] < clindex[c2];
}); });
int at = kohrestrict; int at = kohrestrict;
ld dist = hdist0(tC0(ggmatrix(allcells[at-1]))); ld dist = hdist0(tC0(ggmatrix(allcells[at-1])));