diff --git a/.idea/editor.xml b/.idea/editor.xml
index 822bae1..b0d69ef 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -1,244 +1,483 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 63552dd..909b733 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,10 +2,68 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/workspace (conflicted copy 2024-11-22 103011).xml b/.idea/workspace (conflicted copy 2024-11-22 103011).xml
new file mode 100644
index 0000000..1104799
--- /dev/null
+++ b/.idea/workspace (conflicted copy 2024-11-22 103011).xml
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "useNewFormat": true
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 7
+}
+
+
+
+
+
+ {
+ "keyToString": {
+ "CMake Application.Assign3 Tests.executor": "Run",
+ "CMake Application.COSC-4P80-Assignment-3.executor": "Run",
+ "NIXITCH_NIXPKGS_CONFIG": "/etc/nix/nixpkgs-config.nix",
+ "NIXITCH_NIX_CONF_DIR": "",
+ "NIXITCH_NIX_OTHER_STORES": "",
+ "NIXITCH_NIX_PATH": "/home/brett/.nix-defexpr/channels:nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels",
+ "NIXITCH_NIX_PROFILES": "/run/current-system/sw /nix/var/nix/profiles/default /etc/profiles/per-user/brett /home/brett/.local/state/nix/profile /nix/profile /home/brett/.nix-profile",
+ "NIXITCH_NIX_REMOTE": "",
+ "NIXITCH_NIX_USER_PROFILE_DIR": "/nix/var/nix/profiles/per-user/brett",
+ "RunOnceActivity.RadMigrateCodeStyle": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "RunOnceActivity.west.config.association.type.startup.service": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "cf.advertisement.text.has.clang-format": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "git-widget-placeholder": "main",
+ "last_opened_file_path": "/home/brett/Documents/Brock/CS 4P80/COSC-4P80-Assignment-3",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "run.code.analysis.last.selected.profile": "pProject Default",
+ "settings.editor.selected.configurable": "CMakeSettings",
+ "structure.view.defaults.are.configured": "true",
+ "vue.rearranger.settings.migration": "true"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MAKEINDEX
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1730483030448
+
+
+ 1730483030448
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36eeae6..91aecb6 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.28)
+project(COSC-4P80-Assignment-3 VERSION 0.0.29)
include(FetchContent)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
diff --git a/include/assign3/array.h b/include/assign3/array.h
index c2085fb..3da1fd9 100644
--- a/include/assign3/array.h
+++ b/include/assign3/array.h
@@ -25,65 +25,79 @@
namespace assign3
{
-
class array_t
{
- public:
- explicit array_t(blt::size_t dimensions, blt::size_t width, blt::size_t height, shape_t shape):
- width(static_cast(width)), height(static_cast(height))
+ public:
+ explicit array_t(blt::size_t dimensions, blt::size_t width, blt::size_t height, shape_t shape):
+ width(static_cast(width)), height(static_cast(height))
+ {
+ switch (shape)
{
- switch (shape)
- {
- case shape_t::GRID:
- case shape_t::GRID_WRAP:
- for (blt::size_t j = 0; j < height; j++)
- for (blt::size_t i = 0; i < width; i++)
- map.emplace_back(dimensions, i, j);
- break;
- case shape_t::GRID_OFFSET:
- case shape_t::GRID_OFFSET_WRAP:
- for (blt::size_t j = 0; j < height; j++)
- for (blt::size_t i = 0; i < width; i++)
- map.emplace_back(dimensions, (j % 2 == 0 ? static_cast(i) : static_cast(i) + 0.5f), j);
- // static_cast(static_cast(j) * (std::sqrt(3) / 2.0))
- break;
- }
+ case shape_t::GRID:
+ case shape_t::GRID_WRAP:
+ for (blt::size_t j = 0; j < height; j++)
+ for (blt::size_t i = 0; i < width; i++)
+ map.emplace_back(dimensions, i, j);
+ break;
+ case shape_t::GRID_OFFSET:
+ case shape_t::GRID_OFFSET_WRAP:
+ for (blt::size_t j = 0; j < height; j++)
+ for (blt::size_t i = 0; i < width; i++)
+ map.emplace_back(dimensions, (j % 2 == 0 ? static_cast(i) : static_cast(i) + 0.5f), j);
+ // static_cast(static_cast(j) * (std::sqrt(3) / 2.0))
+ break;
}
-
- [[nodiscard]] blt::vec2ul from_index(blt::size_t index) const
- {
- return {index % width, index / width};
- }
-
- neuron_t& get(blt::size_t x, blt::size_t y)
- { return map[y * width + x]; }
-
- [[nodiscard]] const neuron_t& get(blt::size_t x, blt::size_t y) const
- { return map[y * width + x]; }
-
- [[nodiscard]] blt::size_t get_width() const
- { return width; }
-
- [[nodiscard]] blt::size_t get_height() const
- { return height; }
-
- [[nodiscard]] std::vector& get_map()
- { return map; }
-
- [[nodiscard]] const std::vector& get_map() const
- { return map; }
-
- private:
- [[nodiscard]] blt::i64 wrap_width(blt::i64 x) const;
-
- [[nodiscard]] blt::i64 wrap_height(blt::i64 y) const;
-
- private:
- blt::i64 width, height;
- std::vector map;
+ }
+
+ array_t(const array_t&) = delete;
+ array_t& operator=(const array_t&) = delete;
+ array_t(array_t&&) = default;
+ array_t& operator=(array_t&&) = default;
+
+ [[nodiscard]] blt::vec2ul from_index(blt::size_t index) const
+ {
+ return {index % width, index / width};
+ }
+
+ neuron_t& get(blt::size_t x, blt::size_t y)
+ {
+ return map[y * width + x];
+ }
+
+ [[nodiscard]] const neuron_t& get(blt::size_t x, blt::size_t y) const
+ {
+ return map[y * width + x];
+ }
+
+ [[nodiscard]] blt::size_t get_width() const
+ {
+ return width;
+ }
+
+ [[nodiscard]] blt::size_t get_height() const
+ {
+ return height;
+ }
+
+ [[nodiscard]] std::vector& get_map()
+ {
+ return map;
+ }
+
+ [[nodiscard]] const std::vector& get_map() const
+ {
+ return map;
+ }
+
+ private:
+ [[nodiscard]] blt::i64 wrap_width(blt::i64 x) const;
+
+ [[nodiscard]] blt::i64 wrap_height(blt::i64 y) const;
+
+ private:
+ blt::i64 width, height;
+ std::vector map;
};
-
-
}
#endif //COSC_4P80_ASSIGNMENT_3_ARRAY_H
diff --git a/include/assign3/neuron.h b/include/assign3/neuron.h
index ef5ab05..16a7bb8 100644
--- a/include/assign3/neuron.h
+++ b/include/assign3/neuron.h
@@ -29,47 +29,62 @@ namespace assign3
{
class neuron_t
{
- public:
- explicit neuron_t(blt::size_t dimensions, Scalar x, Scalar y): x_pos(x), y_pos(y)
- {
- data.resize(dimensions);
- }
-
- neuron_t& randomize(blt::size_t seed, init_t init, bool normalize, const data_file_t& file);
-
- neuron_t& update(const std::vector& new_data, Scalar dist, Scalar eta);
-
- static Scalar distance(distance_function_t* dist_func, const neuron_t& n1, const neuron_t& n2);
-
- [[nodiscard]] Scalar dist(const std::vector& X) const;
-
- neuron_t& set_activation(Scalar act)
- {
- activation = act;
- return *this;
- }
-
- void activate(Scalar act)
- { activation += act; }
-
- [[nodiscard]] const std::vector& get_data() const
- { return data; }
-
- [[nodiscard]] Scalar get_x() const
- { return x_pos; }
-
- [[nodiscard]] Scalar get_y() const
- { return y_pos; }
-
- [[nodiscard]] Scalar get_activation() const
- { return activation; }
-
- private:
- Scalar x_pos, y_pos;
- Scalar activation = 0;
- std::vector data;
+ public:
+ explicit neuron_t(blt::size_t dimensions, Scalar x, Scalar y): x_pos(x), y_pos(y)
+ {
+ data.resize(dimensions);
+ }
+
+ neuron_t(const neuron_t&) = delete;
+ neuron_t& operator=(const neuron_t&) = delete;
+
+ neuron_t(neuron_t&&) = default;
+ neuron_t& operator=(neuron_t&&) = default;
+
+ neuron_t& randomize(blt::size_t seed, init_t init, bool normalize, const data_file_t& file);
+
+ neuron_t& update(const std::vector& new_data, Scalar dist, Scalar eta);
+
+ static Scalar distance(distance_function_t* dist_func, const neuron_t& n1, const neuron_t& n2);
+
+ [[nodiscard]] Scalar dist(const std::vector& X) const;
+
+ neuron_t& set_activation(Scalar act)
+ {
+ activation = act;
+ return *this;
+ }
+
+ void activate(Scalar act)
+ {
+ activation += act;
+ }
+
+ [[nodiscard]] const std::vector& get_data() const
+ {
+ return data;
+ }
+
+ [[nodiscard]] Scalar get_x() const
+ {
+ return x_pos;
+ }
+
+ [[nodiscard]] Scalar get_y() const
+ {
+ return y_pos;
+ }
+
+ [[nodiscard]] Scalar get_activation() const
+ {
+ return activation;
+ }
+
+ private:
+ Scalar x_pos, y_pos;
+ Scalar activation = 0;
+ std::vector data;
};
-
}
#endif //COSC_4P80_ASSIGNMENT_3_NEURON_H
diff --git a/include/assign3/som.h b/include/assign3/som.h
index 701c008..1a7de05 100644
--- a/include/assign3/som.h
+++ b/include/assign3/som.h
@@ -25,67 +25,80 @@
namespace assign3
{
-
class som_t
{
- public:
- som_t(const data_file_t& file, blt::size_t width, blt::size_t height, blt::size_t max_epochs, distance_function_t* dist_func,
- topology_function_t* topology_function, shape_t shape, init_t init, bool normalize);
-
- blt::size_t get_closest_neuron(const std::vector& data);
-
- Scalar find_closest_neighbour_distance(blt::size_t v0);
-
- void train_epoch(Scalar initial_learn_rate);
-
- blt::vec2 get_topological_position(const std::vector& data);
-
- Scalar topological_error();
-
- Scalar quantization_error();
-
- void compute_errors();
-
- void compute_neuron_activations(Scalar distance = 2, Scalar activation = 0.5);
-
- void write_activations(std::ostream& out);
-
- void write_topology_errors(std::ostream& out);
-
- void write_quantization_errors(std::ostream& out);
-
- void write_all_errors(std::ostream& out);
-
- [[nodiscard]] const array_t& get_array() const
- { return array; }
-
- [[nodiscard]] blt::size_t get_current_epoch() const
- { return current_epoch; }
-
- [[nodiscard]] blt::size_t get_max_epochs() const
- { return max_epochs; }
-
- [[nodiscard]] const std::vector& get_topological_errors() const
- { return topological_errors; }
-
- [[nodiscard]] const std::vector& get_quantization_errors() const
- { return quantization_errors; }
-
- private:
- array_t array;
- data_file_t file;
- blt::size_t current_epoch = 0;
- blt::size_t max_epochs;
- distance_function_t* dist_func;
- topology_function_t* topology_function;
-
- // normalized value for which below this will be considered neural
- float quantization_distance = 0.25;
-
- std::vector topological_errors;
- std::vector quantization_errors;
+ public:
+ som_t(const data_file_t& file, blt::size_t width, blt::size_t height, blt::size_t max_epochs, distance_function_t* dist_func,
+ topology_function_t* topology_function, shape_t shape, init_t init, bool normalize);
+
+ som_t(const som_t&) = delete;
+ som_t& operator=(const som_t&) = delete;
+ som_t(som_t&&) = default;
+ som_t& operator=(som_t&&) = default;
+
+ blt::size_t get_closest_neuron(const std::vector& data);
+
+ Scalar find_closest_neighbour_distance(blt::size_t v0);
+
+ void train_epoch(Scalar initial_learn_rate);
+
+ blt::vec2 get_topological_position(const std::vector& data);
+
+ Scalar topological_error();
+
+ Scalar quantization_error();
+
+ void compute_errors();
+
+ void compute_neuron_activations(Scalar distance = 2, Scalar activation = 0.5);
+
+ void write_activations(std::ostream& out);
+
+ void write_topology_errors(std::ostream& out);
+
+ void write_quantization_errors(std::ostream& out);
+
+ void write_all_errors(std::ostream& out);
+
+ [[nodiscard]] const array_t& get_array() const
+ {
+ return array;
+ }
+
+ [[nodiscard]] blt::size_t get_current_epoch() const
+ {
+ return current_epoch;
+ }
+
+ [[nodiscard]] blt::size_t get_max_epochs() const
+ {
+ return max_epochs;
+ }
+
+ [[nodiscard]] const std::vector& get_topological_errors() const
+ {
+ return topological_errors;
+ }
+
+ [[nodiscard]] const std::vector& get_quantization_errors() const
+ {
+ return quantization_errors;
+ }
+
+ private:
+ array_t array;
+ data_file_t file;
+ blt::size_t current_epoch = 0;
+ blt::size_t max_epochs;
+ distance_function_t* dist_func;
+ topology_function_t* topology_function;
+
+ // normalized value for which below this will be considered neural
+ float quantization_distance = 0.25;
+
+ std::vector topological_errors;
+ std::vector