From a28e9e4df56807ecfb63f26b85d2d83790c55fa5 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 28 May 2022 19:02:20 +0200 Subject: [PATCH] rogueviz::som:: fixup to last --- rogueviz/som/kohonen.cpp | 6 +++--- rogueviz/som/tests.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rogueviz/som/kohonen.cpp b/rogueviz/som/kohonen.cpp index 907eb5fc..42424423 100644 --- a/rogueviz/som/kohonen.cpp +++ b/rogueviz/som/kohonen.cpp @@ -545,9 +545,9 @@ void buildcellcrawler(cell *c, cellcrawler& cr, int dir) { map scc; pair get_cellcrawler_id(cell *c) { - if(!bounded) + if(!closed_manifold) 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)) { // Zebra Quotient does exhibit some symmetries, // but these are so small anyway that it is safer to just build @@ -555,7 +555,7 @@ pair get_cellcrawler_id(cell *c) { return make_pair(neuronId(*getNeuronSlow(c)), 0); // 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); int id = 0, dir = 0; #if CAP_GP diff --git a/rogueviz/som/tests.cpp b/rogueviz/som/tests.cpp index 82fdca0d..261927b0 100644 --- a/rogueviz/som/tests.cpp +++ b/rogueviz/som/tests.cpp @@ -776,7 +776,7 @@ void shot_settings() { pconf.alpha = 1; pconf.scale = pconf.scale / 2 / maxs / cd->radius; 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; @@ -886,7 +886,7 @@ void create_index() { Out("gpy", gp::univ_param().second); Out("orientable", nonorientable ? 0 : 1); Out("symmetric", (flags & m_symmetric) ? 1 : 0); - Out("closed", bounded ? 1 : 0); + Out("closed", closed_manifold ? 1 : 0); Out("quotient", quotient ? 1 : 0); Out("dim", WDIM); Out("valence", S3); @@ -1352,7 +1352,7 @@ auto khook = arg::add3("-kst-keys", [] { rv_hook(hooks_handleKey, 150, kst_key); + addHook(hooks_markers, 100, [] () { int N = isize(net); 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; for(auto e: voronoi_edges) if(e.first < N && e.second < N)