From bd00ccf442d407c1e8b2ca79aadc8ece7d4e2fa3 Mon Sep 17 00:00:00 2001 From: allem Date: Fri, 13 Sep 2019 23:37:58 -0400 Subject: [PATCH] restructure files --- cosets/CMakeLists.txt | 5 ++-- cosets/src/coxeter.cpp | 27 +++++++++++++++++++++ cosets/src/mirrors.cpp | 15 ++++++++++++ cosets/src/{tc.cpp => util/coxeter.hpp} | 26 -------------------- cosets/src/{mirror.cpp => util/mirrors.hpp} | 16 +----------- 5 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 cosets/src/coxeter.cpp create mode 100644 cosets/src/mirrors.cpp rename cosets/src/{tc.cpp => util/coxeter.hpp} (89%) rename cosets/src/{mirror.cpp => util/mirrors.hpp} (75%) diff --git a/cosets/CMakeLists.txt b/cosets/CMakeLists.txt index 5a14367..3b9bca0 100644 --- a/cosets/CMakeLists.txt +++ b/cosets/CMakeLists.txt @@ -13,7 +13,6 @@ add_custom_command( ${CMAKE_CURRENT_BINARY_DIR}/shaders ) -add_executable(coxeter src/tc.cpp) - -add_executable(mirror src/mirror.cpp) +add_executable(coxeter scr/coxeter.cpp) +add_executable(mirror src/mirrors.cpp) target_link_libraries(mirror PRIVATE glm) diff --git a/cosets/src/coxeter.cpp b/cosets/src/coxeter.cpp new file mode 100644 index 0000000..a4e3e9b --- /dev/null +++ b/cosets/src/coxeter.cpp @@ -0,0 +1,27 @@ +#include "util/coxeter.hpp" + +int main(int argc, char *argv[]) { + std::vector> ids{ + {0, 0}, + {1, 1}, + {2, 2}, + {0, 1, 0, 1, 0, 1, 0, 1}, + {1, 2, 1, 2, 1, 2}, + {0, 2, 0, 2} + }; + + Table *table = solve(3, {0, 1}, ids); + + std::cout << table->size() << std::endl; + std::cout << *table << std::endl; + + for (const auto &v : table->words()) { + std::cout << "[ "; + for (auto e : v) { + std::cout << e << " "; + } + std::cout << "]\n"; + } + + return 0; +} diff --git a/cosets/src/mirrors.cpp b/cosets/src/mirrors.cpp new file mode 100644 index 0000000..aa9d2b4 --- /dev/null +++ b/cosets/src/mirrors.cpp @@ -0,0 +1,15 @@ +#include "util/mirrors.hpp" + +int main(int argc, char *argv[]) { + auto normals = mirror<3>({ + {}, + {4}, + {2, 3} + }); + + for (const auto &normal : normals) { + std::cout << glm::to_string(normal) << std::endl; + } + + return 0; +} \ No newline at end of file diff --git a/cosets/src/tc.cpp b/cosets/src/util/coxeter.hpp similarity index 89% rename from cosets/src/tc.cpp rename to cosets/src/util/coxeter.hpp index 013714e..19af6e2 100644 --- a/cosets/src/tc.cpp +++ b/cosets/src/util/coxeter.hpp @@ -195,29 +195,3 @@ std::ostream &operator<<(std::ostream &out, const Table &table) { return out; } - -int main(int argc, char *argv[]) { - std::vector> ids{ - {0, 0}, - {1, 1}, - {2, 2}, - {0, 1, 0, 1, 0, 1, 0, 1}, - {1, 2, 1, 2, 1, 2}, - {0, 2, 0, 2} - }; - - Table *table = solve(3, {0, 1}, ids); - - std::cout << table->size() << std::endl; - std::cout << *table << std::endl; - - for (const auto &v : table->words()) { - std::cout << "[ "; - for (auto e : v) { - std::cout << e << " "; - } - std::cout << "]\n"; - } - - return 0; -} diff --git a/cosets/src/mirror.cpp b/cosets/src/util/mirrors.hpp similarity index 75% rename from cosets/src/mirror.cpp rename to cosets/src/util/mirrors.hpp index 098e5c4..06ce895 100644 --- a/cosets/src/mirror.cpp +++ b/cosets/src/util/mirrors.hpp @@ -5,7 +5,7 @@ #include #include -#include "util/numeric.hpp" +#include "numeric.hpp" template std::vector mirror(const float (&arr)[N][N]) { @@ -32,17 +32,3 @@ std::vector mirror(const float (&arr)[N][N]) { return mirrors; } - -int main(int argc, char *argv[]) { - auto normals = mirror<3>({ - {}, - {4}, - {2, 3} - }); - - for (const auto &normal : normals) { - std::cout << glm::to_string(normal) << std::endl; - } - - return 0; -} \ No newline at end of file