warrence/AdventOfCode2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stefan Müller 2025-04-30 20:37:03 +02:00
parent 08a94ba068
commit 01c300dce1
75 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -30,13 +30,13 @@ Here, we have a few conditionals to determine on the fly which of the numbers wo
:mag_right: Puzzle: <https://adventofcode.com/2024/day/3>, :white_check_mark: Solver: [`MullItOver.cpp`](src/MullItOver.cpp) :mag_right: Puzzle: <https://adventofcode.com/2024/day/3>, :white_check_mark: Solver: [`MullItOver.cpp`](src/MullItOver.cpp)
A simple [finite state machine](include/aoc/StringStateMachine.hpp) crawling along the input character by character solves both parts nicely. The algorithm tracks whether `mul` instructions are enabled or not, but ignores this setting for part 1. A simple [finite state machine](include/aoc/common/StringStateMachine.hpp) crawling along the input character by character solves both parts nicely. The algorithm tracks whether `mul` instructions are enabled or not, but ignores this setting for part 1.
### Day 4: Ceres Search ### Day 4: Ceres Search
:mag_right: Puzzle: <https://adventofcode.com/2024/day/4>, :white_check_mark: Solver: [`CeresSearch.cpp`](src/CeresSearch.cpp) :mag_right: Puzzle: <https://adventofcode.com/2024/day/4>, :white_check_mark: Solver: [`CeresSearch.cpp`](src/CeresSearch.cpp)
For this puzzle I added a class for [points in two-dimensional space](include/aoc/Point2.hpp), so I can use these for simplifying directional computations. With that, the algorithm looks for all `X` and `A` for part 1 and 2, respectively, and tries to find the remaining characters, starting from that `X` or `A`. For this puzzle I added a class for [points in two-dimensional space](include/aoc/common/Point2.hpp), so I can use these for simplifying directional computations. With that, the algorithm looks for all `X` and `A` for part 1 and 2, respectively, and tries to find the remaining characters, starting from that `X` or `A`.
### Day 5: Print Queue ### Day 5: Print Queue

2
include/aoc/BridgeRepair.hpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class BridgeRepair class BridgeRepair
: public Solver : public Solver

2
include/aoc/CeresSearch.hpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <aoc/LinesSolver.hpp> #include <aoc/framework/LinesSolver.hpp>
class CeresSearch class CeresSearch
: public LinesSolver : public LinesSolver

4
include/aoc/ClawContraption.hpp
View File

@ -15,8 +15,8 @@
#pragma once #pragma once
#include <aoc/Solver.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Point2.hpp> #include <aoc/framework/Solver.hpp>
class ClawContraption class ClawContraption
: public Solver : public Solver

4
include/aoc/DiskFragmenter.hpp
View File

@ -18,8 +18,8 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include <aoc/Interval.hpp> #include <aoc/common/Interval.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class DiskFragmenter class DiskFragmenter
: public Solver : public Solver

6
include/aoc/GardenGroups.hpp
View File

@ -17,9 +17,9 @@
#include <stack> #include <stack>
#include <aoc/Grid.hpp> #include <aoc/common/Grid.hpp>
#include <aoc/LinesSolver.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Point2.hpp> #include <aoc/framework/LinesSolver.hpp>
class GardenGroups class GardenGroups
: public LinesSolver : public LinesSolver

6
include/aoc/GuardGallivant.hpp
View File

@ -18,9 +18,9 @@
#include <bitset> #include <bitset>
#include <vector> #include <vector>
#include <aoc/Grid.hpp> #include <aoc/common/Grid.hpp>
#include <aoc/LinesSolver.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Point2.hpp> #include <aoc/framework/LinesSolver.hpp>
class GuardGallivant class GuardGallivant
: public LinesSolver : public LinesSolver

2
include/aoc/HistorianHysteria.hpp
View File

@ -17,7 +17,7 @@
#include <set> #include <set>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class HistorianHysteria class HistorianHysteria
: public Solver : public Solver

4
include/aoc/HoofIt.hpp
View File

@ -17,8 +17,8 @@
#include <vector> #include <vector>
#include <aoc/LinesSolver.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Point2.hpp> #include <aoc/framework/LinesSolver.hpp>
class HoofIt class HoofIt
: public LinesSolver : public LinesSolver

4
include/aoc/LanParty.hpp
View File

@ -15,8 +15,8 @@
#pragma once #pragma once
#include <aoc/Graph.hpp> #include <aoc/common/Graph.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class LanParty : public Solver class LanParty : public Solver
{ {

6
include/aoc/MullItOver.hpp
View File

@ -15,9 +15,9 @@
#pragma once #pragma once
#include <aoc/MullData.hpp> #include <aoc/extra/MullData.hpp>
#include <aoc/MullStates.hpp> #include <aoc/extra/MullStates.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class MullItOver class MullItOver
: public Solver : public Solver

2
include/aoc/PlutonianPebbles.hpp
View File

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

4
include/aoc/PrintQueue.hpp
View File

@ -17,8 +17,8 @@
#include <vector> #include <vector>
#include <aoc/Grid.hpp> #include <aoc/common/Grid.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class PrintQueue class PrintQueue
: public Solver : public Solver

6
include/aoc/RedNosedReports.hpp
View File

@ -15,9 +15,9 @@
#pragma once #pragma once
#include <aoc/RedNosedReportData.hpp> #include <aoc/common/Slope.hpp>
#include <aoc/Slope.hpp> #include <aoc/extra/RedNosedReportData.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class RedNosedReports class RedNosedReports
: public Solver : public Solver

8
include/aoc/ReindeerMaze.hpp
View File

@ -18,10 +18,10 @@
#include <list> #include <list>
#include <vector> #include <vector>
#include <aoc/LinesSolver.hpp> #include <aoc/common/WeightedEdgeGraph.hpp>
#include <aoc/ReindeerMazeCrossing.hpp> #include <aoc/extra/ReindeerMazeCrossing.hpp>
#include <aoc/ReindeerMazePathIncidence.hpp> #include <aoc/extra/ReindeerMazePathIncidence.hpp>
#include <aoc/WeightedEdgeGraph.hpp> #include <aoc/framework/LinesSolver.hpp>
class ReindeerMaze class ReindeerMaze
: public LinesSolver : public LinesSolver

6
include/aoc/ResonantCollinearity.hpp
View File

@ -18,9 +18,9 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <aoc/Grid.hpp> #include <aoc/common/Grid.hpp>
#include <aoc/LinesSolver.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Point2.hpp> #include <aoc/framework/LinesSolver.hpp>
class ResonantCollinearity class ResonantCollinearity
: public LinesSolver : public LinesSolver

4
include/aoc/RestroomRedoubt.hpp
View File

@ -18,8 +18,8 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class RestroomRedoubt class RestroomRedoubt
: public Solver : public Solver

8
include/aoc/WarehouseWoes.hpp
View File

@ -15,10 +15,10 @@
#pragma once #pragma once
#include <aoc/Lines.hpp> #include <aoc/common/Lines.hpp>
#include <aoc/LinesSolver.hpp> #include <aoc/extra/WarehouseBoxPusher.hpp>
#include <aoc/WarehouseBoxPusher.hpp> #include <aoc/extra/WarehouseWideBoxPusher.hpp>
#include <aoc/WarehouseWideBoxPusher.hpp> #include <aoc/framework/LinesSolver.hpp>
class WarehouseWoes class WarehouseWoes
: public LinesSolver : public LinesSolver

2
include/aoc/Graph.hpp → include/aoc/common/Graph.hpp
View File

@ -19,7 +19,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <aoc/Vertex.hpp> #include <aoc/common/Vertex.hpp>
class Graph class Graph
{ {

2
include/aoc/Grid.hpp → include/aoc/common/Grid.hpp
View File

@ -17,7 +17,7 @@
#include <memory> #include <memory>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
// Inspired by https://stackoverflow.com/a/32279494 // Inspired by https://stackoverflow.com/a/32279494
template <typename T> template <typename T>

0
include/aoc/Interval.hpp → include/aoc/common/Interval.hpp
View File

2
include/aoc/Lines.hpp → include/aoc/common/Lines.hpp
View File

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

0
include/aoc/Math.hpp → include/aoc/common/Math.hpp
View File

0
include/aoc/Point2.hpp → include/aoc/common/Point2.hpp
View File

0
include/aoc/Slope.hpp → include/aoc/common/Slope.hpp
View File

2
include/aoc/StringState.hpp → include/aoc/common/StringState.hpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <aoc/StringStateMachine.hpp> #include <aoc/common/StringStateMachine.hpp>
class StringStateMachine; class StringStateMachine;

2
include/aoc/StringStateMachine.hpp → include/aoc/common/StringStateMachine.hpp
View File

@ -17,7 +17,7 @@
#include <string> #include <string>
#include <aoc/StringState.hpp> #include <aoc/common/StringState.hpp>
class StringState; class StringState;

0
include/aoc/Vertex.hpp → include/aoc/common/Vertex.hpp
View File

0
include/aoc/VertexEdgeIncidence.hpp → include/aoc/common/VertexEdgeIncidence.hpp
View File

2
include/aoc/WeightedEdgeGraph.hpp → include/aoc/common/WeightedEdgeGraph.hpp
View File

@ -17,7 +17,7 @@
#include <vector> #include <vector>
#include <aoc/VertexEdgeIncidence.hpp> #include <aoc/common/VertexEdgeIncidence.hpp>
class WeightedEdgeGraph class WeightedEdgeGraph
{ {

2
include/aoc/MullCharState.hpp → include/aoc/extra/MullCharState.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/StringState.hpp> #include <aoc/common/StringState.hpp>
class MullCharState class MullCharState
: public StringState : public StringState

0
include/aoc/MullData.hpp → include/aoc/extra/MullData.hpp
View File

4
include/aoc/MullDataState.hpp → include/aoc/extra/MullDataState.hpp
View File

@ -15,8 +15,8 @@
#pragma once #pragma once
#include <aoc/MullData.hpp> #include <aoc/common/StringState.hpp>
#include <aoc/StringState.hpp> #include <aoc/extra/MullData.hpp>
class MullDataState class MullDataState
: public StringState : public StringState

2
include/aoc/MullDoOpenState.hpp → include/aoc/extra/MullDoOpenState.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/MullDataState.hpp> #include <aoc/extra/MullDataState.hpp>
class MullDoOpenState class MullDoOpenState
: public MullDataState : public MullDataState

2
include/aoc/MullEntryState.hpp → include/aoc/extra/MullEntryState.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/StringState.hpp> #include <aoc/common/StringState.hpp>
class MullEntryState class MullEntryState
: public StringState : public StringState

2
include/aoc/MullFactorState.hpp → include/aoc/extra/MullFactorState.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/MullDataState.hpp> #include <aoc/extra/MullDataState.hpp>
class MullFactorState class MullFactorState
: public MullDataState : public MullDataState

10
include/aoc/MullStates.hpp → include/aoc/extra/MullStates.hpp
View File

@ -15,11 +15,11 @@
#pragma once #pragma once
#include <aoc/MullCharState.hpp> #include <aoc/extra/MullCharState.hpp>
#include <aoc/MullDoOpenState.hpp> #include <aoc/extra/MullDoOpenState.hpp>
#include <aoc/MullEntryState.hpp> #include <aoc/extra/MullEntryState.hpp>
#include <aoc/MullFactorState.hpp> #include <aoc/extra/MullFactorState.hpp>
#include <aoc/MullToggleCloseState.hpp> #include <aoc/extra/MullToggleCloseState.hpp>
class MullStates class MullStates
{ {

2
include/aoc/MullToggleCloseState.hpp → include/aoc/extra/MullToggleCloseState.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/MullDataState.hpp> #include <aoc/extra/MullDataState.hpp>
class MullToggleCloseState class MullToggleCloseState
: public MullDataState : public MullDataState

2
include/aoc/RedNosedReportData.hpp → include/aoc/extra/RedNosedReportData.hpp
View File

@ -17,7 +17,7 @@
#include<vector> #include<vector>
#include <aoc/Slope.hpp> #include <aoc/common/Slope.hpp>
class RedNosedReportData class RedNosedReportData
{ {

4
include/aoc/ReindeerMazeCrossing.hpp → include/aoc/extra/ReindeerMazeCrossing.hpp
View File

@ -17,8 +17,8 @@
#include <vector> #include <vector>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/ReindeerMazePathIncidence.hpp> #include <aoc/extra/ReindeerMazePathIncidence.hpp>
class ReindeerMazeCrossing class ReindeerMazeCrossing
{ {

2
include/aoc/ReindeerMazePathIncidence.hpp → include/aoc/extra/ReindeerMazePathIncidence.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
class ReindeerMazePathIncidence class ReindeerMazePathIncidence
{ {

4
include/aoc/WarehouseBoxPusher.hpp → include/aoc/extra/WarehouseBoxPusher.hpp
View File

@ -18,8 +18,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <aoc/Lines.hpp> #include <aoc/common/Lines.hpp>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
class WarehouseBoxPusher class WarehouseBoxPusher
{ {

2
include/aoc/WarehouseWideBoxPusher.hpp → include/aoc/extra/WarehouseWideBoxPusher.hpp
View File

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <aoc/WarehouseBoxPusher.hpp> #include <aoc/extra/WarehouseBoxPusher.hpp>
class WarehouseWideBoxPusher class WarehouseWideBoxPusher
: public WarehouseBoxPusher : public WarehouseBoxPusher

6
include/aoc/LinesSolver.hpp → include/aoc/framework/LinesSolver.hpp
View File

@ -17,9 +17,9 @@
#include <vector> #include <vector>
#include <aoc/Lines.hpp> #include <aoc/common/Lines.hpp>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class LinesSolver class LinesSolver
: public Solver : public Solver

0
include/aoc/Solver.hpp → include/aoc/framework/Solver.hpp
View File

2
include/aoc/SolverEngine.hpp → include/aoc/framework/SolverEngine.hpp
View File

@ -20,7 +20,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class SolverEngine class SolverEngine
{ {

2
src/BridgeRepair.cpp
View File

@ -18,7 +18,7 @@
#include <cmath> #include <cmath>
#include <sstream> #include <sstream>
#include <aoc/Math.hpp> #include <aoc/common/Math.hpp>
const std::string BridgeRepair::getPuzzleName() const const std::string BridgeRepair::getPuzzleName() const
{ {

4
src/HoofIt.cpp
View File

@ -19,8 +19,8 @@
#include <queue> #include <queue>
#include <vector> #include <vector>
#include <aoc/Grid.hpp> #include <aoc/common/Grid.hpp>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
const std::string HoofIt::getPuzzleName() const const std::string HoofIt::getPuzzleName() const
{ {

2
src/MullItOver.cpp
View File

@ -15,7 +15,7 @@
#include <aoc/MullItOver.hpp> #include <aoc/MullItOver.hpp>
#include <aoc/StringStateMachine.hpp> #include <aoc/common/StringStateMachine.hpp>
MullItOver::MullItOver() MullItOver::MullItOver()
: Solver{}, data_{}, states_ { data_ } : Solver{}, data_{}, states_ { data_ }

2
src/Program.cpp
View File

@ -18,7 +18,7 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <aoc/SolverEngine.hpp> #include <aoc/framework/SolverEngine.hpp>
// Solver implementations in day order. // Solver implementations in day order.
#include <aoc/HistorianHysteria.hpp> #include <aoc/HistorianHysteria.hpp>

4
src/RestroomRedoubt.cpp
View File

@ -21,8 +21,8 @@
#include <numeric> #include <numeric>
#include <sstream> #include <sstream>
#include <aoc/Math.hpp> #include <aoc/common/Math.hpp>
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
RestroomRedoubt::RestroomRedoubt(const int width, const int height, const bool runPart2) RestroomRedoubt::RestroomRedoubt(const int width, const int height, const bool runPart2)
: width_{ width }, height_{ height }, halfWidth_{ width / 2 }, halfHeight_{ height / 2 }, runPart2_{ runPart2 } : width_{ width }, height_{ height }, halfWidth_{ width / 2 }, halfHeight_{ height / 2 }, runPart2_{ runPart2 }

2
src/Graph.cpp → src/common/Graph.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Graph.hpp> #include <aoc/common/Graph.hpp>
#include <memory> #include <memory>

2
src/Lines.cpp → src/common/Lines.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Lines.hpp> #include <aoc/common/Lines.hpp>
#include <algorithm> #include <algorithm>

2
src/Math.cpp → src/common/Math.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Math.hpp> #include <aoc/common/Math.hpp>
#include <array> #include <array>

2
src/Point2.cpp → src/common/Point2.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Point2.hpp> #include <aoc/common/Point2.hpp>
const Point2 Point2::left{ -1, 0 }; const Point2 Point2::left{ -1, 0 };
const Point2 Point2::right{ 1, 0 }; const Point2 Point2::right{ 1, 0 };

2
src/StringStateMachine.cpp → src/common/StringStateMachine.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/StringStateMachine.hpp> #include <aoc/common/StringStateMachine.hpp>
StringStateMachine::StringStateMachine(const std::string& line, StringState& entryState) StringStateMachine::StringStateMachine(const std::string& line, StringState& entryState)
{ {

2
src/Vertex.cpp → src/common/Vertex.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Vertex.hpp> #include <aoc/common/Vertex.hpp>
#include <memory> #include <memory>

2
src/WeightedEdgeGraph.cpp → src/common/WeightedEdgeGraph.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/WeightedEdgeGraph.hpp> #include <aoc/common/WeightedEdgeGraph.hpp>
#include <limits> #include <limits>
#include <queue> #include <queue>

2
src/MullCharState.cpp → src/extra/MullCharState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullCharState.hpp> #include <aoc/extra/MullCharState.hpp>
MullCharState::MullCharState(const char expected) MullCharState::MullCharState(const char expected)
: expected_{ expected }, successState_{}, failState_{} : expected_{ expected }, successState_{}, failState_{}

2
src/MullData.cpp → src/extra/MullData.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullData.hpp> #include <aoc/extra/MullData.hpp>
MullData::MullData() MullData::MullData()
: isEnabled_{ true }, factor1_{ 0 }, factor2_{ 0 }, part1_{ 0 }, part2_{ 0 } : isEnabled_{ true }, factor1_{ 0 }, factor2_{ 0 }, part1_{ 0 }, part2_{ 0 }

2
src/MullDataState.cpp → src/extra/MullDataState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullDataState.hpp> #include <aoc/extra/MullDataState.hpp>
void MullDataState::setData(MullData& data) void MullDataState::setData(MullData& data)
{ {

2
src/MullDoOpenState.cpp → src/extra/MullDoOpenState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullDoOpenState.hpp> #include <aoc/extra/MullDoOpenState.hpp>
void MullDoOpenState::next(StringStateMachine* stateMachine) void MullDoOpenState::next(StringStateMachine* stateMachine)
{ {

2
src/MullEntryState.cpp → src/extra/MullEntryState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullEntryState.hpp> #include <aoc/extra/MullEntryState.hpp>
void MullEntryState::enter(StringStateMachine* stateMachine) void MullEntryState::enter(StringStateMachine* stateMachine)
{ {

2
src/MullFactorState.cpp → src/extra/MullFactorState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullFactorState.hpp> #include <aoc/extra/MullFactorState.hpp>
MullFactorState::MullFactorState(const char expected, const int index) MullFactorState::MullFactorState(const char expected, const int index)
: expected_{ expected }, index_{ index }, successState_{}, failState_{} : expected_{ expected }, index_{ index }, successState_{}, failState_{}

2
src/MullStates.cpp → src/extra/MullStates.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullStates.hpp> #include <aoc/extra/MullStates.hpp>
MullStates::MullStates(MullData& data) MullStates::MullStates(MullData& data)
{ {

2
src/MullToggleCloseState.cpp → src/extra/MullToggleCloseState.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/MullToggleCloseState.hpp> #include <aoc/extra/MullToggleCloseState.hpp>
MullToggleCloseState::MullToggleCloseState(const bool isEnabler) MullToggleCloseState::MullToggleCloseState(const bool isEnabler)
: isEnabler_{ isEnabler }, successState_{} : isEnabler_{ isEnabler }, successState_{}

6
src/ReindeerMazeCrossing.cpp → src/extra/ReindeerMazeCrossing.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/ReindeerMazeCrossing.hpp> #include <aoc/extra/ReindeerMazeCrossing.hpp>
ReindeerMazeCrossing::ReindeerMazeCrossing(const Point2 position) ReindeerMazeCrossing::ReindeerMazeCrossing(const Point2 position)
: position_{ position }, incidences{} : position_{ position }, incidences{}
@ -27,6 +27,6 @@ Point2 ReindeerMazeCrossing::getPosition() const
bool ReindeerMazeCrossing::isFinished() const bool ReindeerMazeCrossing::isFinished() const
{ {
return std::find_if(incidences.begin(), incidences.end(), [](auto& x) { return x.getPathVertex() < 0; }) == return std::find_if(incidences.begin(), incidences.end(),
incidences.end(); [](auto& x) { return x.getPathVertex() < 0; }) == incidences.end();
} }

2
src/ReindeerMazePathIncidence.cpp → src/extra/ReindeerMazePathIncidence.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/ReindeerMazePathIncidence.hpp> #include <aoc/extra/ReindeerMazePathIncidence.hpp>
ReindeerMazePathIncidence::ReindeerMazePathIncidence(const Point2 direction) ReindeerMazePathIncidence::ReindeerMazePathIncidence(const Point2 direction)
: ReindeerMazePathIncidence(direction, -1) : ReindeerMazePathIncidence(direction, -1)

2
src/WarehouseBoxPusher.cpp → src/extra/WarehouseBoxPusher.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/WarehouseBoxPusher.hpp> #include <aoc/extra/WarehouseBoxPusher.hpp>
WarehouseBoxPusher::WarehouseBoxPusher(const char boxChar, const char wallChar, const char emptyChar) WarehouseBoxPusher::WarehouseBoxPusher(const char boxChar, const char wallChar, const char emptyChar)
: boxChar_{ boxChar }, wallChar_{ wallChar }, emptyChar_{ emptyChar } : boxChar_{ boxChar }, wallChar_{ wallChar }, emptyChar_{ emptyChar }

2
src/WarehouseWideBoxPusher.cpp → src/extra/WarehouseWideBoxPusher.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/WarehouseWideBoxPusher.hpp> #include <aoc/extra/WarehouseWideBoxPusher.hpp>
#include <stack> #include <stack>

2
src/LinesSolver.cpp → src/framework/LinesSolver.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/LinesSolver.hpp> #include <aoc/framework/LinesSolver.hpp>
LinesSolver::LinesSolver(const int inputFileNameSuffix) LinesSolver::LinesSolver(const int inputFileNameSuffix)
: Solver{ inputFileNameSuffix } : Solver{ inputFileNameSuffix }

2
src/Solver.cpp → src/framework/Solver.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
#include <sstream> #include <sstream>

2
src/SolverEngine.cpp → src/framework/SolverEngine.cpp
View File

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>. // this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/SolverEngine.hpp> #include <aoc/framework/SolverEngine.hpp>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>

2
tests/include/aocTests/TestContext.hpp
View File

@ -19,7 +19,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <aoc/Solver.hpp> #include <aoc/framework/Solver.hpp>
class TestContext class TestContext
{ {

2
tests/src/TestContext.cpp
View File

@ -17,7 +17,7 @@
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <aoc/SolverEngine.hpp> #include <aoc/framework/SolverEngine.hpp>
void TestContext::run(const std::unique_ptr<Solver>&& solver, const long long int expected1, void TestContext::run(const std::unique_ptr<Solver>&& solver, const long long int expected1,
const long long int expected2, const std::vector<std::string>& inputPaths) const long long int expected2, const std::vector<std::string>& inputPaths)