From 1eb3e3be2d641cc36f3a93da94a5657f79a2bfc4 Mon Sep 17 00:00:00 2001 From: Dominik Demuth Date: Mon, 11 Nov 2024 11:03:02 +0100 Subject: [PATCH] move files --- CMakeLists.txt | 16 ++++++++-------- main.cpp | 4 ++-- sims.cpp => simulation/sims.cpp | 16 +++++++--------- sims.h => simulation/sims.h | 6 +++--- functions.cpp => utils/functions.cpp | 4 ---- functions.h => utils/functions.h | 0 io.cpp => utils/io.cpp | 0 io.h => utils/io.h | 0 ranges.cpp => utils/ranges.cpp | 0 ranges.h => utils/ranges.h | 0 10 files changed, 20 insertions(+), 26 deletions(-) rename sims.cpp => simulation/sims.cpp (97%) rename sims.h => simulation/sims.h (95%) rename functions.cpp => utils/functions.cpp (97%) rename functions.h => utils/functions.h (100%) rename io.cpp => utils/io.cpp (100%) rename io.h => utils/io.h (100%) rename ranges.cpp => utils/ranges.cpp (100%) rename ranges.h => utils/ranges.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94498c7..1352afe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,10 +4,10 @@ project(RWSim VERSION 1.0) set(CMAKE_CXX_STANDARD 17) add_executable(rwsim main.cpp - functions.cpp - functions.h - io.cpp - io.h + utils/functions.h + utils/functions.cpp + utils/io.cpp + utils/io.h motions/base.cpp motions/base.h motions/random.cpp @@ -16,10 +16,10 @@ add_executable(rwsim main.cpp times/base.h times/delta.cpp times/delta.h - sims.cpp - sims.h - ranges.cpp - ranges.h + simulation/sims.cpp + simulation/sims.h + utils/ranges.cpp + utils/ranges.h motions/tetrahedral.cpp motions/tetrahedral.h motions/isosmallangle.cpp diff --git a/main.cpp b/main.cpp index e1716b8..4d3be2f 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,7 @@ -#include "io.h" -#include "sims.h" +#include "utils/io.h" +#include "simulation/sims.h" #include "motions/base.h" #include "times/delta.h" #include "times/lognormal.h" diff --git a/sims.cpp b/simulation/sims.cpp similarity index 97% rename from sims.cpp rename to simulation/sims.cpp index 7e77849..cc2b190 100644 --- a/sims.cpp +++ b/simulation/sims.cpp @@ -1,6 +1,10 @@ -// -// Created by dominik on 8/14/24. -// +#include "sims.h" +#include "../motions/base.h" +#include "../times/base.h" +#include "../utils/functions.h" +#include "../utils/ranges.h" +#include "../utils/io.h" + #include #include #include @@ -10,12 +14,6 @@ #include #include -#include "motions/base.h" -#include "times/base.h" -#include "functions.h" -#include "ranges.h" -#include "sims.h" -#include "io.h" void run_spectrum(std::unordered_map& parameter, Motion& motion, Distribution& dist) { diff --git a/sims.h b/simulation/sims.h similarity index 95% rename from sims.h rename to simulation/sims.h index 4575163..e98e047 100644 --- a/sims.h +++ b/simulation/sims.h @@ -5,12 +5,12 @@ #ifndef RWSIM_SIMS_H #define RWSIM_SIMS_H +#include "../motions/base.h" +#include "../times/base.h" + #include #include -#include "motions/base.h" -#include "times/base.h" - /** * @brief Run simulation for spectra * diff --git a/functions.cpp b/utils/functions.cpp similarity index 97% rename from functions.cpp rename to utils/functions.cpp index 95b4689..0399869 100644 --- a/functions.cpp +++ b/utils/functions.cpp @@ -1,7 +1,3 @@ -// -// Created by dominik on 8/14/24. -//# - #include #include #include diff --git a/functions.h b/utils/functions.h similarity index 100% rename from functions.h rename to utils/functions.h diff --git a/io.cpp b/utils/io.cpp similarity index 100% rename from io.cpp rename to utils/io.cpp diff --git a/io.h b/utils/io.h similarity index 100% rename from io.h rename to utils/io.h diff --git a/ranges.cpp b/utils/ranges.cpp similarity index 100% rename from ranges.cpp rename to utils/ranges.cpp diff --git a/ranges.h b/utils/ranges.h similarity index 100% rename from ranges.h rename to utils/ranges.h