Move position Vector classes to core/object

src/openvic-simulation/dataloader/NodeTools.cpp

@@ -15,10 +15,10 @@
 #include <range/v3/iterator/operations.hpp>
 #include <range/v3/view/enumerate.hpp>
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/fixed_point/String.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 using namespace OpenVic;

src/openvic-simulation/dataloader/NodeTools.hpp

@@ -20,6 +20,7 @@
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/stl/MutableIterator.hpp"
 #include "openvic-simulation/core/string/Utility.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
@@ -28,7 +29,6 @@
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 #define MOV(...) static_cast<std::remove_reference_t<decltype(__VA_ARGS__)>&&>(__VA_ARGS__)
 #define FWD(...) static_cast<decltype(__VA_ARGS__)>(__VA_ARGS__)

src/openvic-simulation/interface/GFXObject.hpp

@@ -3,9 +3,9 @@
 #include <cstdint>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/interface/LoadBase.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic::GFX {
 

src/openvic-simulation/map/MapDefinition.cpp

@@ -18,6 +18,7 @@
 
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/io/BMP.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
@@ -28,7 +29,6 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
 using namespace OpenVic;

src/openvic-simulation/map/MapDefinition.hpp

@@ -9,14 +9,14 @@
 
 #include "openvic-simulation/core/io/BMP.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/map/Region.hpp"
 #include "openvic-simulation/map/TerrainType.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 	struct BuildingTypeManager;

src/openvic-simulation/map/ProvinceDefinition.hpp

@@ -6,14 +6,14 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 

src/openvic-simulation/pathfinding/PointMap.cpp

@@ -12,9 +12,9 @@
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/Formatting.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 using namespace OpenVic;
 

src/openvic-simulation/pathfinding/PointMap.hpp

@@ -10,10 +10,10 @@
 #include <tsl/ordered_set.h>
 
 #include "openvic-simulation/core/Hash.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/Signal.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 namespace OpenVic {
 	struct PointMap {

tests/src/types/Vector.hpp → tests/src/core/object/Vector.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
-#include "Numeric.hpp"
+#include "types/Numeric.hpp"
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>
 

tests/src/types/Vector2.cpp → tests/src/core/object/Vector2.cpp

@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>

tests/src/types/Vector3.cpp → tests/src/core/object/Vector3.cpp

@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>

tests/src/types/Vector4.cpp → tests/src/core/object/Vector4.cpp

@@ -1,13 +1,13 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "openvic-simulation/types/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 
-#include "Approx.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp"
+#include "types/Approx.hpp"
+#include "types/Numeric.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>

tests/src/pathfinding/AStarPathing.cpp

@@ -1,7 +1,7 @@
 #include "openvic-simulation/pathfinding/AStarPathing.hpp"
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"

tests/src/pathfinding/FringePathing.cpp

@@ -1,7 +1,7 @@
 #include "openvic-simulation/pathfinding/FringePathing.hpp"
 
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"

tests/src/pathfinding/Pathing.hpp

@@ -5,8 +5,8 @@
 #include <fmt/core.h>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/Vector.hpp"
 
 #include "Helper.hpp"
 #include <snitch/snitch_macros_misc.hpp>

tests/src/types/Approx.hpp

@@ -5,10 +5,10 @@
 #include <cstdlib>
 #include <limits>
 
-#include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/core/Math.hpp"
+#include "openvic-simulation/core/object/Vector.hpp"
 
-#include "Vector.hpp" // IWYU pragma: keep
+#include "core/object/Vector.hpp" // IWYU pragma: keep
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>