From c83208419d1c320424f48eb245f41b33b84826eb Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Thu, 21 Nov 2024 13:30:33 -0500 Subject: [PATCH] hello --- CMakeLists.txt | 2 +- src/som.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fad41fe..36eeae6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(COSC-4P80-Assignment-3 VERSION 0.0.27) +project(COSC-4P80-Assignment-3 VERSION 0.0.28) include(FetchContent) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) diff --git a/src/som.cpp b/src/som.cpp index a8dfb0e..c5ca491 100644 --- a/src/som.cpp +++ b/src/som.cpp @@ -167,7 +167,7 @@ namespace assign3 } // we can assert the neurons are neighbours if the distance between the BMUs and the nearest neighbour are equal. - auto min_distances = neuron_t::distance(dist_func, array.get_map()[min1.first], array.get_map()[min2.first]); + const auto min_distances = neuron_t::distance(dist_func, array.get_map()[min1.first], array.get_map()[min2.first]); auto neighbour_distances = find_closest_neighbour_distance(min1.first); if (!blt::f_equal(min_distances, neighbour_distances)) @@ -187,15 +187,15 @@ namespace assign3 for (auto [i, v] : blt::enumerate(array.get_map())) { - auto half = find_closest_neighbour_distance(i) / distance; + const auto half = find_closest_neighbour_distance(i) / distance; // auto sigma = std::sqrt(-(half * half) / (2 * std::log(requested_activation))); // auto r = 1 / (2 * sigma * sigma); // - auto scale = topology_function->scale(half, activation); - for (const auto& data : file.data_points) + const auto scale = topology_function->scale(half, activation); + for (const auto& [is_bad, bins] : file.data_points) { - auto ds = topology_function->call(v.dist(data.bins), scale); - if (data.is_bad) + const auto ds = topology_function->call(v.dist(bins), scale); + if (is_bad) v.activate(-ds); else v.activate(ds);