From b9a8d3ffbc11407b66d60369ff17c3a8b572089b Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Tue, 19 Nov 2024 15:48:33 -0500 Subject: [PATCH] wow --- ...ce (conflicted copy 2024-11-18 173055).xml | 222 ------------------ CMakeLists.txt | 10 +- include/assign3/functions.h | 3 + include/assign3/manager.h | 16 +- include/assign3/som.h | 13 + src/functions.cpp | 16 ++ ...in (conflicted copy 2024-11-18 194147).cpp | 125 ---------- src/main.cpp | 138 ++++++++++- src/manager.cpp | 10 +- src/neuron.cpp | 2 +- src/som.cpp | 47 ++++ 11 files changed, 234 insertions(+), 368 deletions(-) delete mode 100644 .idea/workspace (conflicted copy 2024-11-18 173055).xml delete mode 100644 src/main (conflicted copy 2024-11-18 194147).cpp diff --git a/.idea/workspace (conflicted copy 2024-11-18 173055).xml b/.idea/workspace (conflicted copy 2024-11-18 173055).xml deleted file mode 100644 index 7688f0a..0000000 --- a/.idea/workspace (conflicted copy 2024-11-18 173055).xml +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - - { - "useNewFormat": true -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "associatedIndex": 7 -} - - - - { - "keyToString": { - "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", - "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": "preferences.sourceCode.C/C++", - "structure.view.defaults.are.configured": "true", - "vue.rearranger.settings.migration": "true" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1730483030448 - - - - - - - - - - - - - - - -