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

rogueviz::som:: fixup to last

Browse Source
This commit is contained in:
Zeno Rogue
2022-05-28 19:02:20 +02:00
parent 3b6dac7471
commit a28e9e4df5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rogueviz/som/kohonen.cpp
View File

@@ -545,9 +545,9 @@ 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(!bounded) if(!closed_manifold)
return make_pair(neuronId(*getNeuronSlow(c)), 0); return make_pair(neuronId(*getNeuronSlow(c)), 0);
if(among(geometry, gZebraQuotient, gMinimal, gArnoldCat, gField435, gField534) || (euclid && quotient && !bounded) || IRREGULAR || (GDIM == 3 && sphere) || (hyperbolic && GDIM == 3) if(among(geometry, gZebraQuotient, gMinimal, gArnoldCat, gField435, gField534) || (euclid && quotient && !closed_manifold) || IRREGULAR || (GDIM == 3 && sphere) || (hyperbolic && GDIM == 3)
|| (euclid && nonorientable)) { || (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
@@ -555,7 +555,7 @@ pair<int, int> get_cellcrawler_id(cell *c) {
return make_pair(neuronId(*getNeuronSlow(c)), 0); return make_pair(neuronId(*getNeuronSlow(c)), 0);
// not yet implemented for cylinder // not yet implemented for cylinder
} }
if(euclid && bounded && PURE && nonorientable) if(euclid && closed_manifold && PURE && nonorientable)
return make_pair(euc2_coordinates(c).second * 2 + ctof(c), 0); return make_pair(euc2_coordinates(c).second * 2 + ctof(c), 0);
int id = 0, dir = 0; int id = 0, dir = 0;
#if CAP_GP #if CAP_GP

6
rogueviz/som/tests.cpp
View File

@@ -776,7 +776,7 @@ void shot_settings() {
pconf.alpha = 1; pconf.alpha = 1;
pconf.scale = pconf.scale / 2 / maxs / cd->radius; pconf.scale = pconf.scale / 2 / maxs / cd->radius;
pconf.scale /= 1.2; pconf.scale /= 1.2;
if(bounded) pconf.scale = WDIM == 3 ? 0.2 : 0.07; if(closed_manifold) pconf.scale = WDIM == 3 ? 0.2 : 0.07;
} }
if(GDIM == 3) pmodel = mdPerspective; if(GDIM == 3) pmodel = mdPerspective;
@@ -886,7 +886,7 @@ void create_index() {
Out("gpy", gp::univ_param().second); Out("gpy", gp::univ_param().second);
Out("orientable", nonorientable ? 0 : 1); Out("orientable", nonorientable ? 0 : 1);
Out("symmetric", (flags & m_symmetric) ? 1 : 0); Out("symmetric", (flags & m_symmetric) ? 1 : 0);
Out("closed", bounded ? 1 : 0); Out("closed", closed_manifold ? 1 : 0);
Out("quotient", quotient ? 1 : 0); Out("quotient", quotient ? 1 : 0);
Out("dim", WDIM); Out("dim", WDIM);
Out("valence", S3); Out("valence", S3);
@@ -1352,7 +1352,7 @@ auto khook = arg::add3("-kst-keys", [] { rv_hook(hooks_handleKey, 150, kst_key);
+ addHook(hooks_markers, 100, [] () { + addHook(hooks_markers, 100, [] () {
int N = isize(net); int N = isize(net);
bool multidraw = quotient; bool multidraw = quotient;
bool use_brm = bounded && isize(currentmap->allcells()) <= brm_limit; bool use_brm = closed_manifold && isize(currentmap->allcells()) <= brm_limit;
vid.linewidth *= 3; vid.linewidth *= 3;
for(auto e: voronoi_edges) for(auto e: voronoi_edges)
if(e.first < N && e.second < N) if(e.first < N && e.second < N)