From 053e0223559c68d6b6057034621a2191fa683bba Mon Sep 17 00:00:00 2001 From: Brett Date: Tue, 2 Apr 2024 01:58:34 -0400 Subject: [PATCH] writing --- ...ignore (conflicted copy 2024-04-01 082422) | 2 - .idea/workspace.xml | 55 +- CMakeLists.txt | 2 +- ...ry-lib.blt-Debug-bf98b24a06ef09440a84.json | 683 ------ cmake-build-debug/.ninja_deps | Bin 72756 -> 70980 bytes .../CMakeFiles/clion-Debug-log.txt | 5 +- cmake-build-debug/build.ninja | 10 +- cmake-build-debug/lib/blt/cmake_install.cmake | 4 + ...-lib.blt-Release-10f7f85701821834e3cd.json | 683 ------ cmake-build-release/.ninja_deps | Bin 71520 -> 69740 bytes .../CMakeFiles/clion-Release-log.txt | 3 +- cmake-build-release/build.ninja | 10 +- .../lib/blt/cmake_install.cmake | 4 + ...t-RelWithDebInfo-5ccdd9f0ec480547e141.json | 701 ------ .../.ninja_deps | Bin 74600 -> 72804 bytes .../clion-RelWithDebInfo Addrsan-log.txt | 5 +- .../build.ninja | 10 +- .../lib/blt/cmake_install.cmake | 4 + ...t-RelWithDebInfo-081d7b11eab1e8179aff.json | 701 ------ cmake-build-relwithdebinfo/.ninja_deps | Bin 74592 -> 106460 bytes cmake-build-relwithdebinfo/.ninja_log | 50 + .../FinalProject.dir/lib/lilgp/kernel/gp.c.o | Bin 87576 -> 87560 bytes .../FinalProject.dir/src/program/app.cpp.o | Bin 571632 -> 574656 bytes .../src/runner/main.cpp.o | Bin 3918504 -> 2775544 bytes .../CMakeFiles/clion-RelWithDebInfo-log.txt | 3 +- cmake-build-relwithdebinfo/FinalProject | Bin 2434504 -> 2435488 bytes .../FinalProject_Runner | Bin 8033768 -> 5657296 bytes .../Testing/Temporary/LastTest.log | 4 +- cmake-build-relwithdebinfo/build.ninja | 10 +- .../lib/blt/cmake_install.cmake | 4 + cmake-build-relwithdebinfo/run_0/regress.bst | 25 +- cmake-build-relwithdebinfo/run_0/regress.fn | 23 +- cmake-build-relwithdebinfo/run_0/regress.his | 1200 +--------- cmake-build-relwithdebinfo/run_0/regress.prg | 1994 ++++++++-------- cmake-build-relwithdebinfo/run_0/regress.stt | 62 +- cmake-build-relwithdebinfo/run_0/regress.sys | 159 +- cmake-build-relwithdebinfo/run_1/regress.bst | 31 +- cmake-build-relwithdebinfo/run_1/regress.fn | 29 +- cmake-build-relwithdebinfo/run_1/regress.his | 510 ++--- cmake-build-relwithdebinfo/run_1/regress.prg | 1988 ++++++++-------- cmake-build-relwithdebinfo/run_1/regress.stt | 30 +- cmake-build-relwithdebinfo/run_1/regress.sys | 39 +- cmake-build-relwithdebinfo/run_2/regress.bst | 40 +- cmake-build-relwithdebinfo/run_2/regress.fn | 40 +- cmake-build-relwithdebinfo/run_2/regress.his | 556 ++++- cmake-build-relwithdebinfo/run_2/regress.prg | 1972 ++++++++-------- cmake-build-relwithdebinfo/run_2/regress.stt | 25 +- cmake-build-relwithdebinfo/run_2/regress.sys | 50 +- cmake-build-relwithdebinfo/run_3/regress.bst | 23 +- cmake-build-relwithdebinfo/run_3/regress.fn | 23 +- cmake-build-relwithdebinfo/run_3/regress.his | 295 ++- cmake-build-relwithdebinfo/run_3/regress.prg | 1992 ++++++++-------- cmake-build-relwithdebinfo/run_3/regress.stt | 25 +- cmake-build-relwithdebinfo/run_3/regress.sys | 24 +- cmake-build-relwithdebinfo/run_4/regress.bst | 33 +- cmake-build-relwithdebinfo/run_4/regress.fn | 31 +- cmake-build-relwithdebinfo/run_4/regress.his | 139 +- cmake-build-relwithdebinfo/run_4/regress.prg | 1988 ++++++++-------- cmake-build-relwithdebinfo/run_4/regress.stt | 10 +- cmake-build-relwithdebinfo/run_4/regress.sys | 7 +- cmake-build-relwithdebinfo/run_5/regress.bst | 29 +- cmake-build-relwithdebinfo/run_5/regress.fn | 27 +- cmake-build-relwithdebinfo/run_5/regress.his | 590 +---- cmake-build-relwithdebinfo/run_5/regress.prg | 1988 ++++++++-------- cmake-build-relwithdebinfo/run_5/regress.stt | 30 +- cmake-build-relwithdebinfo/run_5/regress.sys | 67 +- cmake-build-relwithdebinfo/run_6/regress.bst | 27 +- cmake-build-relwithdebinfo/run_6/regress.fn | 25 +- cmake-build-relwithdebinfo/run_6/regress.his | 1375 ++---------- cmake-build-relwithdebinfo/run_6/regress.prg | 1996 ++++++++--------- cmake-build-relwithdebinfo/run_6/regress.stt | 67 +- cmake-build-relwithdebinfo/run_6/regress.sys | 144 +- cmake-build-relwithdebinfo/run_7/regress.bst | 29 +- cmake-build-relwithdebinfo/run_7/regress.fn | 27 +- cmake-build-relwithdebinfo/run_7/regress.his | 1444 ++++++------ cmake-build-relwithdebinfo/run_7/regress.prg | 1990 ++++++++-------- cmake-build-relwithdebinfo/run_7/regress.stt | 103 +- cmake-build-relwithdebinfo/run_7/regress.sys | 41 +- cmake-build-relwithdebinfo/run_8/regress.bst | 28 +- cmake-build-relwithdebinfo/run_8/regress.fn | 28 +- cmake-build-relwithdebinfo/run_8/regress.his | 265 +-- cmake-build-relwithdebinfo/run_8/regress.prg | 1986 ++++++++-------- cmake-build-relwithdebinfo/run_8/regress.stt | 15 +- cmake-build-relwithdebinfo/run_8/regress.sys | 22 +- cmake-build-relwithdebinfo/run_9/regress.bst | 22 +- cmake-build-relwithdebinfo/run_9/regress.fn | 20 +- cmake-build-relwithdebinfo/run_9/regress.his | 1088 +++------ cmake-build-relwithdebinfo/run_9/regress.prg | 1994 ++++++++-------- cmake-build-relwithdebinfo/run_9/regress.stt | 77 +- cmake-build-relwithdebinfo/run_9/regress.sys | 116 +- include/aggregation.h | 117 +- include/ipc.h | 12 +- src/runner/aggregation.cpp | 319 +-- src/runner/main.cpp | 239 +- src/runner/main.disabled | 8 +- 95 files changed, 13006 insertions(+), 19665 deletions(-) delete mode 100644 .gitignore (conflicted copy 2024-04-01 082422) delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/directory-lib.blt-Debug-bf98b24a06ef09440a84.json delete mode 100644 cmake-build-release/.cmake/api/v1/reply/directory-lib.blt-Release-10f7f85701821834e3cd.json delete mode 100644 cmake-build-relwithdebinfo-addrsan/.cmake/api/v1/reply/directory-lib.blt-RelWithDebInfo-5ccdd9f0ec480547e141.json delete mode 100644 cmake-build-relwithdebinfo/.cmake/api/v1/reply/directory-lib.blt-RelWithDebInfo-081d7b11eab1e8179aff.json diff --git a/.gitignore (conflicted copy 2024-04-01 082422) b/.gitignore (conflicted copy 2024-04-01 082422) deleted file mode 100644 index e28c4f5..0000000 --- a/.gitignore (conflicted copy 2024-04-01 082422) +++ /dev/null @@ -1,2 +0,0 @@ -build/ -cmake-build-*/ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7537d3b..ecab4ac 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -284,7 +284,7 @@ - - { - "keyToString": { - "CMake Application.Assignment_1.executor": "Run", - "CMake Application.Assignment_1_RUNNER.executor": "Run", - "CMake Application.FinalProject.executor": "Run", - "CMake Application.FinalProject_Runner.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.cidr.known.project.marker": "true", - "RunOnceActivity.readMode.enableVisualFormatting": "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 4P82/Final Project/FP-C-Project", - "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", - "settings.editor.selected.configurable": "preferences.sourceCode.C/C++", - "structure.view.defaults.are.configured": "true", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -341,6 +341,11 @@ + + + +