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

Change Solver into template class to allow for non-integer results

Browse Source
This commit is contained in:
Stefan Müller
2025-05-16 23:54:59 +02:00
parent 26dfb379a2
commit 7ad1b01879
28 changed files with 164 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/framework/LinesSolver.cpp
View File

@@ -1,41 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024-2025 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/framework/LinesSolver.hpp>
LinesSolver::LinesSolver(const int inputFileNameSuffix)
: Solver{ inputFileNameSuffix }
{
}
void LinesSolver::processDataLine(const std::string& line)
{
lines.push_back(line);
}
bool LinesSolver::isInBounds(const Point2& point) const
{
return lines.isInBounds(point);
}
char LinesSolver::getCharAt(const Point2& point) const
{
return lines.getCharAt(point);
}
void LinesSolver::setCharAt(const Point2& point, const char value)
{
lines.setCharAt(point, value);
}

56
src/framework/Solver.cpp
View File

@@ -1,56 +0,0 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
// Foundation, either version 3 of the License, or (at your option) any later
// version.
//
// This program is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License along with
// this program. If not, see <http://www.gnu.org/licenses/>.
#include <aoc/framework/Solver.hpp>
#include <sstream>
Solver::Solver(const int inputFileNameSuffix)
: inputFileNameSuffix_{ inputFileNameSuffix }, part1{ 0 }, part2{ 0 }
{
}
const std::string Solver::getInputFileName() const
{
std::ostringstream stream;
stream << clean(getPuzzleName());
if (inputFileNameSuffix_ > 0)
{
stream << "_" << inputFileNameSuffix_;
}
stream << ".txt";
return stream.str();
}
long long int Solver::getResultPart1() const
{
return part1;
}
long long int Solver::getResultPart2() const
{
return part2;
}
std::string Solver::clean(const std::string& original) const
{
std::string cleaned{ original };
size_t start_pos = 0;
while ((start_pos = cleaned.find(" ", start_pos)) != std::string::npos)
{
cleaned.replace(start_pos, 1, "_");
}
return cleaned;
}

26
src/framework/SolverEngine.cpp
View File

@@ -1,5 +1,5 @@
// Solutions to the Advent Of Code 2024.
// Copyright (C) 2024 Stefan Müller
// Copyright (C) 2024-2025 Stefan Müller
//
// This program is free software: you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free Software
@@ -15,35 +15,11 @@
#include <aoc/framework/SolverEngine.hpp>
#include <fstream>
#include <iostream>
SolverEngine::SolverEngine(const std::vector<std::string>& inputPaths)
: inputPaths_{ inputPaths }
{
}
void SolverEngine::run(Solver& solver)
{
std::cout << "\n--- Day " << solver.getPuzzleDay() << ": " << solver.getPuzzleName() << " ---\n";
auto fullFilePath = tryGetValidFullInputFilePath(solver.getInputFileName());
if (fullFilePath != "")
{
std::string line;
std::ifstream inputFile{ fullFilePath };
while (std::getline(inputFile, line))
{
solver.processDataLine(line);
}
inputFile.close();
solver.finish();
std::cout << "Part 1: " << solver.getResultPart1() << "\nPart 2: " << solver.getResultPart2() << std::endl;
}
}
std::filesystem::path SolverEngine::tryGetValidFullInputFilePath(const std::string& inputFileName)
{
for (const auto& path : inputPaths_)