Added sub folders for common, extra, and framework code files

2025-04-30 20:37:03 +02:00
parent 08a94ba068
commit 01c300dce1
75 changed files with 103 additions and 103 deletions
--- a/include/aoc/BridgeRepair.hpp
+++ b/include/aoc/BridgeRepair.hpp
@@ -17,7 +17,7 @@

 #include <vector>

-#include <aoc/Solver.hpp>
+#include <aoc/framework/Solver.hpp>

 class BridgeRepair
    : public Solver
--- a/include/aoc/CeresSearch.hpp
+++ b/include/aoc/CeresSearch.hpp
@@ -17,7 +17,7 @@

 #include <vector>

-#include <aoc/LinesSolver.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class CeresSearch
    : public LinesSolver
--- a/include/aoc/ClawContraption.hpp
+++ b/include/aoc/ClawContraption.hpp
@@ -15,8 +15,8 @@

 #pragma once

-#include <aoc/Solver.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/Solver.hpp>

 class ClawContraption
    : public Solver
--- a/include/aoc/DiskFragmenter.hpp
+++ b/include/aoc/DiskFragmenter.hpp
@@ -18,8 +18,8 @@
 #include <array>
 #include <vector>

-#include <aoc/Interval.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Interval.hpp>
+#include <aoc/framework/Solver.hpp>

 class DiskFragmenter
    : public Solver
--- a/include/aoc/GardenGroups.hpp
+++ b/include/aoc/GardenGroups.hpp
@@ -17,9 +17,9 @@

 #include <stack>

-#include <aoc/Grid.hpp>
-#include <aoc/LinesSolver.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Grid.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class GardenGroups
    : public LinesSolver
--- a/include/aoc/GuardGallivant.hpp
+++ b/include/aoc/GuardGallivant.hpp
@@ -18,9 +18,9 @@
 #include <bitset>
 #include <vector>

-#include <aoc/Grid.hpp>
-#include <aoc/LinesSolver.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Grid.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class GuardGallivant
    : public LinesSolver
--- a/include/aoc/HistorianHysteria.hpp
+++ b/include/aoc/HistorianHysteria.hpp
@@ -17,7 +17,7 @@

 #include <set>

-#include <aoc/Solver.hpp>
+#include <aoc/framework/Solver.hpp>

 class HistorianHysteria
    : public Solver
--- a/include/aoc/HoofIt.hpp
+++ b/include/aoc/HoofIt.hpp
@@ -17,8 +17,8 @@

 #include <vector>

-#include <aoc/LinesSolver.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class HoofIt
    : public LinesSolver
--- a/include/aoc/LanParty.hpp
+++ b/include/aoc/LanParty.hpp
@@ -15,8 +15,8 @@

 #pragma once

-#include <aoc/Graph.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Graph.hpp>
+#include <aoc/framework/Solver.hpp>

 class LanParty : public Solver
 {
--- a/include/aoc/MullItOver.hpp
+++ b/include/aoc/MullItOver.hpp
@@ -15,9 +15,9 @@

 #pragma once

-#include <aoc/MullData.hpp>
-#include <aoc/MullStates.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/extra/MullData.hpp>
+#include <aoc/extra/MullStates.hpp>
+#include <aoc/framework/Solver.hpp>

 class MullItOver
    : public Solver
--- a/include/aoc/PlutonianPebbles.hpp
+++ b/include/aoc/PlutonianPebbles.hpp
@@ -18,7 +18,7 @@
 #include <map>
 #include <vector>

-#include <aoc/Solver.hpp>
+#include <aoc/framework/Solver.hpp>

 class PlutonianPebbles : public Solver
 {
--- a/include/aoc/PrintQueue.hpp
+++ b/include/aoc/PrintQueue.hpp
@@ -17,8 +17,8 @@

 #include <vector>

-#include <aoc/Grid.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Grid.hpp>
+#include <aoc/framework/Solver.hpp>

 class PrintQueue
    : public Solver
--- a/include/aoc/RedNosedReports.hpp
+++ b/include/aoc/RedNosedReports.hpp
@@ -15,9 +15,9 @@

 #pragma once

-#include <aoc/RedNosedReportData.hpp>
-#include <aoc/Slope.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Slope.hpp>
+#include <aoc/extra/RedNosedReportData.hpp>
+#include <aoc/framework/Solver.hpp>

 class RedNosedReports
    : public Solver
--- a/include/aoc/ReindeerMaze.hpp
+++ b/include/aoc/ReindeerMaze.hpp
@@ -18,10 +18,10 @@
 #include <list>
 #include <vector>

-#include <aoc/LinesSolver.hpp>
-#include <aoc/ReindeerMazeCrossing.hpp>
-#include <aoc/ReindeerMazePathIncidence.hpp>
-#include <aoc/WeightedEdgeGraph.hpp>
+#include <aoc/common/WeightedEdgeGraph.hpp>
+#include <aoc/extra/ReindeerMazeCrossing.hpp>
+#include <aoc/extra/ReindeerMazePathIncidence.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class ReindeerMaze
    : public LinesSolver
--- a/include/aoc/ResonantCollinearity.hpp
+++ b/include/aoc/ResonantCollinearity.hpp
@@ -18,9 +18,9 @@
 #include <map>
 #include <vector>

-#include <aoc/Grid.hpp>
-#include <aoc/LinesSolver.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Grid.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class ResonantCollinearity
    : public LinesSolver
--- a/include/aoc/RestroomRedoubt.hpp
+++ b/include/aoc/RestroomRedoubt.hpp
@@ -18,8 +18,8 @@
 #include <array>
 #include <vector>

-#include <aoc/Point2.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/Solver.hpp>

 class RestroomRedoubt
    : public Solver
--- a/include/aoc/WarehouseWoes.hpp
+++ b/include/aoc/WarehouseWoes.hpp
@@ -15,10 +15,10 @@

 #pragma once

-#include <aoc/Lines.hpp>
-#include <aoc/LinesSolver.hpp>
-#include <aoc/WarehouseBoxPusher.hpp>
-#include <aoc/WarehouseWideBoxPusher.hpp>
+#include <aoc/common/Lines.hpp>
+#include <aoc/extra/WarehouseBoxPusher.hpp>
+#include <aoc/extra/WarehouseWideBoxPusher.hpp>
+#include <aoc/framework/LinesSolver.hpp>

 class WarehouseWoes
    : public LinesSolver
--- a/include/aoc/common/Graph.hpp
+++ b/include/aoc/common/Graph.hpp
@@ -19,7 +19,7 @@
 #include <memory>
 #include <vector>

-#include <aoc/Vertex.hpp>
+#include <aoc/common/Vertex.hpp>

 class Graph
 {
--- a/include/aoc/common/Grid.hpp
+++ b/include/aoc/common/Grid.hpp
@@ -17,7 +17,7 @@

 #include <memory>

-#include <aoc/Point2.hpp>
+#include <aoc/common/Point2.hpp>

 // Inspired by https://stackoverflow.com/a/32279494
 template <typename T>
--- a/include/aoc/common/Interval.hpp
+++ b/include/aoc/common/Interval.hpp
--- a/include/aoc/common/Lines.hpp
+++ b/include/aoc/common/Lines.hpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>

-#include <aoc/Point2.hpp>
+#include <aoc/common/Point2.hpp>

 /// <summary>
 /// A vector of strings of the same length, with methods to treat it as a rectangular, two-dimensional map of char and
--- a/include/aoc/common/Math.hpp
+++ b/include/aoc/common/Math.hpp
--- a/include/aoc/common/Point2.hpp
+++ b/include/aoc/common/Point2.hpp
--- a/include/aoc/common/Slope.hpp
+++ b/include/aoc/common/Slope.hpp
--- a/include/aoc/common/StringState.hpp
+++ b/include/aoc/common/StringState.hpp
@@ -17,7 +17,7 @@

 #include <vector>

-#include <aoc/StringStateMachine.hpp>
+#include <aoc/common/StringStateMachine.hpp>

 class StringStateMachine;

--- a/include/aoc/common/StringStateMachine.hpp
+++ b/include/aoc/common/StringStateMachine.hpp
@@ -17,7 +17,7 @@

 #include <string>

-#include <aoc/StringState.hpp>
+#include <aoc/common/StringState.hpp>

 class StringState;

--- a/include/aoc/common/Vertex.hpp
+++ b/include/aoc/common/Vertex.hpp
--- a/include/aoc/common/VertexEdgeIncidence.hpp
+++ b/include/aoc/common/VertexEdgeIncidence.hpp
--- a/include/aoc/common/WeightedEdgeGraph.hpp
+++ b/include/aoc/common/WeightedEdgeGraph.hpp
@@ -17,7 +17,7 @@

 #include <vector>

-#include <aoc/VertexEdgeIncidence.hpp>
+#include <aoc/common/VertexEdgeIncidence.hpp>

 class WeightedEdgeGraph
 {
--- a/include/aoc/extra/MullCharState.hpp
+++ b/include/aoc/extra/MullCharState.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/StringState.hpp>
+#include <aoc/common/StringState.hpp>

 class MullCharState
    : public StringState
--- a/include/aoc/extra/MullData.hpp
+++ b/include/aoc/extra/MullData.hpp
--- a/include/aoc/extra/MullDataState.hpp
+++ b/include/aoc/extra/MullDataState.hpp
@@ -15,8 +15,8 @@

 #pragma once

-#include <aoc/MullData.hpp>
-#include <aoc/StringState.hpp>
+#include <aoc/common/StringState.hpp>
+#include <aoc/extra/MullData.hpp>

 class MullDataState
    : public StringState
--- a/include/aoc/extra/MullDoOpenState.hpp
+++ b/include/aoc/extra/MullDoOpenState.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/MullDataState.hpp>
+#include <aoc/extra/MullDataState.hpp>

 class MullDoOpenState
    : public MullDataState
--- a/include/aoc/extra/MullEntryState.hpp
+++ b/include/aoc/extra/MullEntryState.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/StringState.hpp>
+#include <aoc/common/StringState.hpp>

 class MullEntryState
    : public StringState
--- a/include/aoc/extra/MullFactorState.hpp
+++ b/include/aoc/extra/MullFactorState.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/MullDataState.hpp>
+#include <aoc/extra/MullDataState.hpp>

 class MullFactorState
    : public MullDataState
--- a/include/aoc/extra/MullStates.hpp
+++ b/include/aoc/extra/MullStates.hpp
@@ -15,11 +15,11 @@

 #pragma once

-#include <aoc/MullCharState.hpp>
-#include <aoc/MullDoOpenState.hpp>
-#include <aoc/MullEntryState.hpp>
-#include <aoc/MullFactorState.hpp>
-#include <aoc/MullToggleCloseState.hpp>
+#include <aoc/extra/MullCharState.hpp>
+#include <aoc/extra/MullDoOpenState.hpp>
+#include <aoc/extra/MullEntryState.hpp>
+#include <aoc/extra/MullFactorState.hpp>
+#include <aoc/extra/MullToggleCloseState.hpp>

 class MullStates
 {
--- a/include/aoc/extra/MullToggleCloseState.hpp
+++ b/include/aoc/extra/MullToggleCloseState.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/MullDataState.hpp>
+#include <aoc/extra/MullDataState.hpp>

 class MullToggleCloseState
    : public MullDataState
--- a/include/aoc/extra/RedNosedReportData.hpp
+++ b/include/aoc/extra/RedNosedReportData.hpp
@@ -17,7 +17,7 @@

 #include<vector>

-#include <aoc/Slope.hpp>
+#include <aoc/common/Slope.hpp>

 class RedNosedReportData
 {
--- a/include/aoc/extra/ReindeerMazeCrossing.hpp
+++ b/include/aoc/extra/ReindeerMazeCrossing.hpp
@@ -17,8 +17,8 @@

 #include <vector>

-#include <aoc/Point2.hpp>
-#include <aoc/ReindeerMazePathIncidence.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/extra/ReindeerMazePathIncidence.hpp>

 class ReindeerMazeCrossing
 {
--- a/include/aoc/extra/ReindeerMazePathIncidence.hpp
+++ b/include/aoc/extra/ReindeerMazePathIncidence.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/Point2.hpp>
+#include <aoc/common/Point2.hpp>

 class ReindeerMazePathIncidence
 {
--- a/include/aoc/extra/WarehouseBoxPusher.hpp
+++ b/include/aoc/extra/WarehouseBoxPusher.hpp
@@ -18,8 +18,8 @@
 #include <string>
 #include <vector>

-#include <aoc/Lines.hpp>
-#include <aoc/Point2.hpp>
+#include <aoc/common/Lines.hpp>
+#include <aoc/common/Point2.hpp>

 class WarehouseBoxPusher
 {
--- a/include/aoc/extra/WarehouseWideBoxPusher.hpp
+++ b/include/aoc/extra/WarehouseWideBoxPusher.hpp
@@ -15,7 +15,7 @@

 #pragma once

-#include <aoc/WarehouseBoxPusher.hpp>
+#include <aoc/extra/WarehouseBoxPusher.hpp>

 class WarehouseWideBoxPusher
    : public WarehouseBoxPusher
--- a/include/aoc/framework/LinesSolver.hpp
+++ b/include/aoc/framework/LinesSolver.hpp
@@ -17,9 +17,9 @@

 #include <vector>

-#include <aoc/Lines.hpp>
-#include <aoc/Point2.hpp>
-#include <aoc/Solver.hpp>
+#include <aoc/common/Lines.hpp>
+#include <aoc/common/Point2.hpp>
+#include <aoc/framework/Solver.hpp>

 class LinesSolver
    : public Solver
--- a/include/aoc/framework/Solver.hpp
+++ b/include/aoc/framework/Solver.hpp
--- a/include/aoc/framework/SolverEngine.hpp
+++ b/include/aoc/framework/SolverEngine.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 #include <vector>

-#include <aoc/Solver.hpp>
+#include <aoc/framework/Solver.hpp>

 class SolverEngine
 {