refactor: move time utility into time dir

Disservin · Oct 2, 2024 · 26b3397 · 26b3397
1 parent 1350fc3
commit 26b3397
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -31,7 +31,7 @@ SRC_FILES        := \
 	$(SRCDIR)/matchmaking/tournament/roundrobin/roundrobin.cpp \
 	$(SRCDIR)/matchmaking/tournament/tournament_manager.cpp \
 	$(SRCDIR)/pgn/pgn_builder.cpp \
-	$(SRCDIR)/time/timecontrol.cpp \
+	$(SRCDIR)/timecontrol/timecontrol.cpp \
 	$(SRCDIR)/util/logger/logger.cpp \
 	$(SRCDIR)/printing/printing.cpp \
 	$(SRCDIR)/main.cpp

diff --git a/app/src/matchmaking/match/match.cpp b/app/src/matchmaking/match/match.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>
 
+#include <time/time.hpp>
 #include <types/tournament.hpp>
-#include <util/date.hpp>
 #include <util/helper.hpp>
 #include <util/logger/logger.hpp>
 

diff --git a/app/src/util/date.hpp → app/src/time/time.hpp b/app/src/util/date.hpp → app/src/time/time.hpp
diff --git a/app/src/time/timecontrol.cpp → app/src/timecontrol/timecontrol.cpp b/app/src/time/timecontrol.cpp → app/src/timecontrol/timecontrol.cpp
diff --git a/app/src/time/timecontrol.hpp → app/src/timecontrol/timecontrol.hpp b/app/src/time/timecontrol.hpp → app/src/timecontrol/timecontrol.hpp
diff --git a/app/src/types/engine_config.hpp b/app/src/types/engine_config.hpp
@@ -7,7 +7,7 @@
 #include <tuple>
 #include <vector>
 
-#include <time/timecontrol.hpp>
+#include <timecontrol/timecontrol.hpp>
 #include <types/enums.hpp>
 #include <util/helper.hpp>
 

diff --git a/app/src/types/match_data.hpp b/app/src/types/match_data.hpp
@@ -7,8 +7,8 @@
 
 #include <chess.hpp>
 
+#include <time/time.hpp>
 #include <types/engine_config.hpp>
-#include <util/date.hpp>
 #include <util/game_pair.hpp>
 
 namespace fastchess {

diff --git a/app/src/util/logger/logger.cpp b/app/src/util/logger/logger.cpp
@@ -5,7 +5,7 @@
 #include <thread>
 #include <variant>
 
-#include <util/date.hpp>
+#include <time/time.hpp>
 
 #ifdef USE_ZLIB
 #    include "../../../third_party/gzip/gzstream.h"

diff --git a/app/src/util/logger/logger.hpp b/app/src/util/logger/logger.hpp
@@ -9,7 +9,7 @@
 #include <thread>
 #include <variant>
 
-#include <util/date.hpp>
+#include <time/time.hpp>
 
 #define FMT_HEADER_ONLY
 #include "../../../third_party/fmt/include/fmt/core.h"

diff --git a/app/tests/timecontrol_test.cpp b/app/tests/timecontrol_test.cpp
@@ -1,4 +1,4 @@
-#include <time/timecontrol.hpp>
+#include <timecontrol/timecontrol.hpp>
 
 #include "doctest/doctest.hpp"
 
@@ -7,9 +7,9 @@ using namespace fastchess;
 TEST_SUITE("TimeControl") {
     TEST_CASE("moves/time+increment") {
         TimeControl::Limits limits;
-        limits.moves = 3;
-        limits.time = 10000;
-        limits.increment = 100;
+        limits.moves      = 3;
+        limits.time       = 10000;
+        limits.increment  = 100;
         limits.timemargin = 100;
 
         TimeControl tc(limits);
@@ -38,10 +38,9 @@ TEST_SUITE("TimeControl") {
 
         TimeControl tc(limits);
 
-
         CHECK(tc.updateTime(limits.fixed_time + limits.timemargin - 1) == true);
         CHECK(tc.getTimeLeft() == limits.fixed_time);
-        
+
         CHECK(tc.updateTime(limits.fixed_time + limits.timemargin) == true);
         CHECK(tc.getTimeLeft() == limits.fixed_time);