diff --git a/include/aoc/BridgeRepair.hpp b/include/aoc/BridgeRepair.hpp index 53cb95c..f7cd9e8 100644 --- a/include/aoc/BridgeRepair.hpp +++ b/include/aoc/BridgeRepair.hpp @@ -20,7 +20,7 @@ #include class BridgeRepair - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; @@ -28,6 +28,6 @@ class BridgeRepair virtual void processDataLine(const std::string& line) override; virtual void finish() override; private: - bool testCalibration(const long long int testValue, const std::vector>& calibrationNumbers, - const size_t currentIndex, const bool allowConcatenation, const long long int accumulatedTestValue); + bool testCalibration(const int64_t testValue, const std::vector>& calibrationNumbers, + const size_t currentIndex, const bool allowConcatenation, const int64_t accumulatedTestValue); }; diff --git a/include/aoc/CeresSearch.hpp b/include/aoc/CeresSearch.hpp index 5a3f943..e03730a 100644 --- a/include/aoc/CeresSearch.hpp +++ b/include/aoc/CeresSearch.hpp @@ -20,7 +20,7 @@ #include class CeresSearch - : public LinesSolver + : public LinesSolver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/ChronospatialComputer.hpp b/include/aoc/ChronospatialComputer.hpp index 38ccaf4..ec462c5 100644 --- a/include/aoc/ChronospatialComputer.hpp +++ b/include/aoc/ChronospatialComputer.hpp @@ -24,7 +24,7 @@ #include class ChronospatialComputer - : public Solver + : public Solver { public: ChronospatialComputer(); @@ -37,5 +37,5 @@ class ChronospatialComputer std::array, 8> instructions_; std::vector program_; ChronospatialComputerState state_; - long long findQuineState(); + int64_t findQuineState(); }; diff --git a/include/aoc/ClawContraption.hpp b/include/aoc/ClawContraption.hpp index c50e6bd..ff386ea 100644 --- a/include/aoc/ClawContraption.hpp +++ b/include/aoc/ClawContraption.hpp @@ -19,7 +19,7 @@ #include class ClawContraption - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; @@ -32,7 +32,7 @@ class ClawContraption static constexpr int getNMaxButtonPushes(); static constexpr int getButtonACost(); static constexpr int getButtonBCost(); - static constexpr long long int getConversionCorrection(); - long long int calcTokenCost(const Point2& buttonA, const Point2& buttonB, const Point2& prize, - const long long int offset); + static constexpr int64_t getConversionCorrection(); + int64_t calcTokenCost(const Point2& buttonA, const Point2& buttonB, const Point2& prize, + const int64_t offset); }; diff --git a/include/aoc/DiskFragmenter.hpp b/include/aoc/DiskFragmenter.hpp index d78410e..7a16338 100644 --- a/include/aoc/DiskFragmenter.hpp +++ b/include/aoc/DiskFragmenter.hpp @@ -22,7 +22,7 @@ #include class DiskFragmenter - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; @@ -41,5 +41,5 @@ class DiskFragmenter void keepBackFile(const std::string& line, size_t& back, size_t& backIdNumber, const int nBackBlocks, size_t& position); unsigned int getDigit(const std::string& line, const size_t index) const; - long long int calcChecksumPart(const size_t idNumber, const int nBlocks, size_t& position) const; + int64_t calcChecksumPart(const size_t idNumber, const int nBlocks, size_t& position) const; }; diff --git a/include/aoc/GardenGroups.hpp b/include/aoc/GardenGroups.hpp index 728ceaf..e6a3992 100644 --- a/include/aoc/GardenGroups.hpp +++ b/include/aoc/GardenGroups.hpp @@ -22,7 +22,7 @@ #include class GardenGroups - : public LinesSolver + : public LinesSolver { public: GardenGroups(const int inputFileNameSuffix = 0); diff --git a/include/aoc/GuardGallivant.hpp b/include/aoc/GuardGallivant.hpp index 805faa3..86d3fbd 100644 --- a/include/aoc/GuardGallivant.hpp +++ b/include/aoc/GuardGallivant.hpp @@ -23,7 +23,7 @@ #include class GuardGallivant - : public LinesSolver + : public LinesSolver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/HistorianHysteria.hpp b/include/aoc/HistorianHysteria.hpp index 7b4e98a..e0fe465 100644 --- a/include/aoc/HistorianHysteria.hpp +++ b/include/aoc/HistorianHysteria.hpp @@ -20,7 +20,7 @@ #include class HistorianHysteria - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/HoofIt.hpp b/include/aoc/HoofIt.hpp index 412f0e5..156dab0 100644 --- a/include/aoc/HoofIt.hpp +++ b/include/aoc/HoofIt.hpp @@ -21,7 +21,7 @@ #include class HoofIt - : public LinesSolver + : public LinesSolver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/LanParty.hpp b/include/aoc/LanParty.hpp index a8c3a82..9819a79 100644 --- a/include/aoc/LanParty.hpp +++ b/include/aoc/LanParty.hpp @@ -19,7 +19,7 @@ #include class LanParty - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/MullItOver.hpp b/include/aoc/MullItOver.hpp index 3e4f366..9758036 100644 --- a/include/aoc/MullItOver.hpp +++ b/include/aoc/MullItOver.hpp @@ -20,7 +20,7 @@ #include class MullItOver - : public Solver + : public Solver { public: MullItOver(); diff --git a/include/aoc/PlutonianPebbles.hpp b/include/aoc/PlutonianPebbles.hpp index 25190bf..b024a01 100644 --- a/include/aoc/PlutonianPebbles.hpp +++ b/include/aoc/PlutonianPebbles.hpp @@ -21,7 +21,7 @@ #include class PlutonianPebbles - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; @@ -31,9 +31,8 @@ class PlutonianPebbles private: static constexpr int getNBlinksPart1(); static constexpr int getNBlinksPart2(); - std::map> blinkMap_{}; - void addPebble(std::map& pebbles, const long long int pebbleNumber, - long long int cardinality); - void addNextBlinkNumbers(const long long int pebbleNumber, std::vector& nextBlinkNumbers); - int getNNextBlinkNumbers(const long long int pebbleNumber) const; + std::map> blinkMap_{}; + void addPebble(std::map& pebbles, const int64_t pebbleNumber, int64_t cardinality); + void addNextBlinkNumbers(const int64_t pebbleNumber, std::vector& nextBlinkNumbers); + int getNNextBlinkNumbers(const int64_t pebbleNumber) const; }; diff --git a/include/aoc/PrintQueue.hpp b/include/aoc/PrintQueue.hpp index 9e93d86..bd25643 100644 --- a/include/aoc/PrintQueue.hpp +++ b/include/aoc/PrintQueue.hpp @@ -21,7 +21,7 @@ #include class PrintQueue - : public Solver + : public Solver { public: PrintQueue(); diff --git a/include/aoc/RedNosedReports.hpp b/include/aoc/RedNosedReports.hpp index 51c7282..7963e1f 100644 --- a/include/aoc/RedNosedReports.hpp +++ b/include/aoc/RedNosedReports.hpp @@ -20,7 +20,7 @@ #include class RedNosedReports - : public Solver + : public Solver { public: virtual const std::string getPuzzleName() const override; diff --git a/include/aoc/ReindeerMaze.hpp b/include/aoc/ReindeerMaze.hpp index f88c5a8..a55f3d1 100644 --- a/include/aoc/ReindeerMaze.hpp +++ b/include/aoc/ReindeerMaze.hpp @@ -26,7 +26,7 @@ #include class ReindeerMaze - : public LinesSolver + : public LinesSolver { public: ReindeerMaze(const int inputFileNameSuffix = 0); diff --git a/include/aoc/ResonantCollinearity.hpp b/include/aoc/ResonantCollinearity.hpp index a89b5df..77d6a51 100644 --- a/include/aoc/ResonantCollinearity.hpp +++ b/include/aoc/ResonantCollinearity.hpp @@ -23,7 +23,7 @@ #include class ResonantCollinearity - : public LinesSolver + : public LinesSolver { public: virtual const std::string getPuzzleName() const override; @@ -35,5 +35,5 @@ class ResonantCollinearity void addNewAntenna(Grid& antinodeGrid1, Grid& antinodeGrid2, Point2&& newPosition); void findNewAntinodes(Grid& antinodeGrid1, Grid& antinodeGrid2, Point2&& start, const Point2& increment); - void addNewAntinode(Grid& antinodeGrid, Point2& newPosition, long long int& part); + void addNewAntinode(Grid& antinodeGrid, Point2& newPosition, int64_t& part); }; diff --git a/include/aoc/RestroomRedoubt.hpp b/include/aoc/RestroomRedoubt.hpp index 3684a9b..bcd8376 100644 --- a/include/aoc/RestroomRedoubt.hpp +++ b/include/aoc/RestroomRedoubt.hpp @@ -22,7 +22,7 @@ #include class RestroomRedoubt - : public Solver + : public Solver { public: RestroomRedoubt(const int width = 101, const int height = 103, const bool runPart2 = true); diff --git a/include/aoc/WarehouseWoes.hpp b/include/aoc/WarehouseWoes.hpp index 4bbea13..5e9a833 100644 --- a/include/aoc/WarehouseWoes.hpp +++ b/include/aoc/WarehouseWoes.hpp @@ -21,7 +21,7 @@ #include class WarehouseWoes - : public LinesSolver + : public LinesSolver { public: WarehouseWoes(const int inputFileNameSuffix = 0); @@ -43,6 +43,6 @@ class WarehouseWoes static constexpr char getEmptyChar(); void checkStartingPosition(const std::string& line); void addWarehouseMap2Line(const std::string& line); - long long int calcAllGpsCoordinates(Lines& warehouseMap, const char boxChar); - long long int calcGpsCoordinate(const size_t x, const size_t y); + int64_t calcAllGpsCoordinates(Lines& warehouseMap, const char boxChar); + int64_t calcGpsCoordinate(const size_t x, const size_t y); }; diff --git a/include/aoc/extra/ChronospatialComputerInstruction.hpp b/include/aoc/extra/ChronospatialComputerInstruction.hpp index b6e0c16..595853d 100644 --- a/include/aoc/extra/ChronospatialComputerInstruction.hpp +++ b/include/aoc/extra/ChronospatialComputerInstruction.hpp @@ -30,7 +30,7 @@ class ChronospatialComputerInstruction protected: virtual void runValue(ChronospatialComputerState& state, const int operandValue) const = 0; private: - std::function&, const int)> operandFunctor_; + std::function&, const int)> operandFunctor_; }; #pragma region ChronospatialComputerDivisionInstruction diff --git a/include/aoc/extra/ChronospatialComputerState.hpp b/include/aoc/extra/ChronospatialComputerState.hpp index eb5b1bf..c62a719 100644 --- a/include/aoc/extra/ChronospatialComputerState.hpp +++ b/include/aoc/extra/ChronospatialComputerState.hpp @@ -22,6 +22,6 @@ class ChronospatialComputerState { public: size_t instructionPointer{ 0 }; - std::array registers{}; + std::array registers{}; std::ostringstream output{}; }; diff --git a/include/aoc/extra/MullData.hpp b/include/aoc/extra/MullData.hpp index 21beb28..071ffed 100644 --- a/include/aoc/extra/MullData.hpp +++ b/include/aoc/extra/MullData.hpp @@ -15,6 +15,8 @@ #pragma once +#include + class MullData { public: @@ -24,12 +26,12 @@ class MullData int getFactor(const int index) const; void setFactor(const int index, const int value); void updateResult(); - long long int getResultPart1() const; - long long int getResultPart2() const; + int64_t getResultPart1() const; + int64_t getResultPart2() const; private: bool isEnabled_; int factor1_; int factor2_; - long long int part1_; - long long int part2_; + int64_t part1_; + int64_t part2_; }; diff --git a/include/aoc/framework/LinesSolver-types.hpp b/include/aoc/framework/LinesSolver-types.hpp index bfe196d..2b28e21 100644 --- a/include/aoc/framework/LinesSolver-types.hpp +++ b/include/aoc/framework/LinesSolver-types.hpp @@ -15,4 +15,4 @@ #include -template class LinesSolver; +template class LinesSolver; diff --git a/include/aoc/framework/Solver-types.hpp b/include/aoc/framework/Solver-types.hpp index 1b499b4..0371a9a 100644 --- a/include/aoc/framework/Solver-types.hpp +++ b/include/aoc/framework/Solver-types.hpp @@ -17,6 +17,6 @@ #include -template class Solver; -template class Solver; +template class Solver; +template class Solver; template class Solver; diff --git a/src/BridgeRepair.cpp b/src/BridgeRepair.cpp index b8c8849..412d05d 100644 --- a/src/BridgeRepair.cpp +++ b/src/BridgeRepair.cpp @@ -34,7 +34,7 @@ void BridgeRepair::processDataLine(const std::string& line) { std::istringstream stream{ line }; - long long int testValue; + int64_t testValue; char colon; int calibrationNumber; // Calibration numbers are a pair of an actual calibration number and its precomputed smallest larger power of 10. @@ -68,14 +68,13 @@ void BridgeRepair::finish() { } -bool BridgeRepair::testCalibration(const long long int testValue, - const std::vector>& calibrationNumbers, const size_t currentIndex, - const bool allowConcatenation, const long long int accumulatedTestValue) +bool BridgeRepair::testCalibration(const int64_t testValue, const std::vector>& calibrationNumbers, + const size_t currentIndex, const bool allowConcatenation, const int64_t accumulatedTestValue) { if (testValue >= accumulatedTestValue && currentIndex < calibrationNumbers.size()) { size_t nextIndex{ currentIndex + 1 }; - long long int nextCalibrationNumber{ calibrationNumbers[currentIndex].first }; + int64_t nextCalibrationNumber{ calibrationNumbers[currentIndex].first }; // Recursively tries the ||, *, and + operators. if ((allowConcatenation && testCalibration(testValue, calibrationNumbers, nextIndex, allowConcatenation, accumulatedTestValue * calibrationNumbers[currentIndex].second + calibrationNumbers[currentIndex].first)) || diff --git a/src/ChronospatialComputer.cpp b/src/ChronospatialComputer.cpp index d0e1fe3..bd1de90 100644 --- a/src/ChronospatialComputer.cpp +++ b/src/ChronospatialComputer.cpp @@ -85,7 +85,7 @@ void ChronospatialComputer::runProgram(const std::vector& program, Chronosp } } -long long ChronospatialComputer::findQuineState() +int64_t ChronospatialComputer::findQuineState() { // The following masks and output patterns are specific to a single program and have been precalculated manually. // The given Chronospatial Computer program essentially does the following calculations. @@ -126,7 +126,7 @@ long long ChronospatialComputer::findQuineState() { { 2, 0b001 }, { 3, 0b00 }, { 4, 0b11100 }, { 5, 0b1100 }, { 6, 0b1010000 }, { 7, 0b100000 } } } }; - long long result{ 0 }; + int64_t result{ 0 }; size_t i{ program_.size() }; int lastAppend{ -1 }; diff --git a/src/ClawContraption.cpp b/src/ClawContraption.cpp index 3241b5c..99690f2 100644 --- a/src/ClawContraption.cpp +++ b/src/ClawContraption.cpp @@ -85,23 +85,23 @@ constexpr int ClawContraption::getButtonBCost() return 1; } -constexpr long long int ClawContraption::getConversionCorrection() +constexpr int64_t ClawContraption::getConversionCorrection() { return 10000000000000; } -long long int ClawContraption::calcTokenCost(const Point2& buttonA, const Point2& buttonB, const Point2& prize, - const long long int offset) +int64_t ClawContraption::calcTokenCost(const Point2& buttonA, const Point2& buttonB, const Point2& prize, + const int64_t offset) { - long long int p{ (prize.y + offset) * buttonB.x - (prize.x + offset) * buttonB.y }; - long long int q{ buttonA.y * buttonB.x - buttonA.x * buttonB.y }; - long long int a{ p / q }; + int64_t p{ (prize.y + offset) * buttonB.x - (prize.x + offset) * buttonB.y }; + int64_t q{ buttonA.y * buttonB.x - buttonA.x * buttonB.y }; + int64_t a{ p / q }; if (a * q != p || (offset == 0 && a > getNMaxButtonPushes())) { return 0; } - long long int r{ prize.x + offset - a * buttonA.x }; - long long int b{ r / buttonB.x }; + int64_t r{ prize.x + offset - a * buttonA.x }; + int64_t b{ r / buttonB.x }; if (b * buttonB.x != r || (offset == 0 && b > getNMaxButtonPushes())) { return 0; diff --git a/src/DiskFragmenter.cpp b/src/DiskFragmenter.cpp index 058649e..1cbaca7 100644 --- a/src/DiskFragmenter.cpp +++ b/src/DiskFragmenter.cpp @@ -196,10 +196,9 @@ unsigned int DiskFragmenter::getDigit(const std::string& line, const size_t inde return line[index] - '0'; } -long long int DiskFragmenter::calcChecksumPart(const size_t idNumber, const int nBlocks, size_t& position) const +int64_t DiskFragmenter::calcChecksumPart(const size_t idNumber, const int nBlocks, size_t& position) const { position += nBlocks; // Casting the parameters is required to allow negative block count, resulting in a negative return value. - return static_cast(idNumber) * - ((nBlocks * (2 * static_cast(position) - nBlocks - 1)) / 2); + return static_cast(idNumber) * ((nBlocks * (2 * static_cast(position) - nBlocks - 1)) / 2); } diff --git a/src/GardenGroups.cpp b/src/GardenGroups.cpp index b3d3cdd..c0b254e 100644 --- a/src/GardenGroups.cpp +++ b/src/GardenGroups.cpp @@ -51,9 +51,9 @@ void GardenGroups::finish() void GardenGroups::traverseRegion(Grid& isVisited, std::stack& otherRegionsStack, const Point2& start) { const char plantType{ getCharAt(start) }; - long long int area{ 0 }; - long long int perimeter{ 0 }; - long long int nCorners{ 0 }; + int64_t area{ 0 }; + int64_t perimeter{ 0 }; + int64_t nCorners{ 0 }; std::stack regionStack{}; regionStack.push(start); diff --git a/src/PlutonianPebbles.cpp b/src/PlutonianPebbles.cpp index 1fd64b3..f0f3eea 100644 --- a/src/PlutonianPebbles.cpp +++ b/src/PlutonianPebbles.cpp @@ -31,13 +31,13 @@ const int PlutonianPebbles::getPuzzleDay() const void PlutonianPebbles::processDataLine(const std::string& line) { // Maps pebble numbers before the blink to their cardinality. - auto currentPebbles = std::make_shared>(); + auto currentPebbles = std::make_shared>(); // Maps pebble numbers after the blink to their cardinality. - std::shared_ptr> nextBlinkPebbles; + std::shared_ptr> nextBlinkPebbles; // Adds initial pebbles numbers. std::istringstream stream{ line }; - long long int pebbleNumber; + int64_t pebbleNumber; while (stream >> pebbleNumber) { addPebble(*currentPebbles, pebbleNumber, 1); @@ -47,7 +47,7 @@ void PlutonianPebbles::processDataLine(const std::string& line) for (int i = getNBlinksPart2(); i > 1; i--) { // Maps pebble numbers after the blink to their cardinality. - nextBlinkPebbles = std::make_shared>(); + nextBlinkPebbles = std::make_shared>(); for (const auto& pebble : *currentPebbles) { @@ -107,8 +107,7 @@ constexpr int PlutonianPebbles::getNBlinksPart2() return 75; } -void PlutonianPebbles::addPebble(std::map& pebbles, const long long int pebbleNumber, - long long int cardinality) +void PlutonianPebbles::addPebble(std::map& pebbles, const int64_t pebbleNumber, int64_t cardinality) { auto hit = pebbles.find(pebbleNumber); if (hit == pebbles.end()) @@ -121,8 +120,7 @@ void PlutonianPebbles::addPebble(std::map& pebbles } } -void PlutonianPebbles::addNextBlinkNumbers(const long long int pebbleNumber, - std::vector& nextBlinkNumbers) +void PlutonianPebbles::addNextBlinkNumbers(const int64_t pebbleNumber, std::vector& nextBlinkNumbers) { if (pebbleNumber == 0) { @@ -144,7 +142,7 @@ void PlutonianPebbles::addNextBlinkNumbers(const long long int pebbleNumber, } } -int PlutonianPebbles::getNNextBlinkNumbers(const long long int pebbleNumber) const +int PlutonianPebbles::getNNextBlinkNumbers(const int64_t pebbleNumber) const { auto s = std::to_string(pebbleNumber); if (s.size() % 2 == 0) diff --git a/src/ResonantCollinearity.cpp b/src/ResonantCollinearity.cpp index e32f0e5..7143eeb 100644 --- a/src/ResonantCollinearity.cpp +++ b/src/ResonantCollinearity.cpp @@ -91,7 +91,7 @@ void ResonantCollinearity::findNewAntinodes(Grid& antinodeGrid1, Grid& antinodeGrid, Point2& newPosition, long long int& count) +void ResonantCollinearity::addNewAntinode(Grid& antinodeGrid, Point2& newPosition, int64_t& count) { if (!antinodeGrid[newPosition.y][newPosition.x]) { diff --git a/src/WarehouseWoes.cpp b/src/WarehouseWoes.cpp index 7cb9c3a..ee1b4a0 100644 --- a/src/WarehouseWoes.cpp +++ b/src/WarehouseWoes.cpp @@ -125,9 +125,9 @@ void WarehouseWoes::addWarehouseMap2Line(const std::string& line) lines2_.push_back(stream.str()); } -long long int WarehouseWoes::calcAllGpsCoordinates(Lines& warehouseMap, const char boxChar) +int64_t WarehouseWoes::calcAllGpsCoordinates(Lines& warehouseMap, const char boxChar) { - long long int result{ 0 }; + int64_t result{ 0 }; for (size_t j = 0; j < warehouseMap.size(); j++) { for (size_t i = 0; i < warehouseMap[j].size(); i++) @@ -141,7 +141,7 @@ long long int WarehouseWoes::calcAllGpsCoordinates(Lines& warehouseMap, const ch return result; } -long long int WarehouseWoes::calcGpsCoordinate(const size_t x, const size_t y) +int64_t WarehouseWoes::calcGpsCoordinate(const size_t x, const size_t y) { return x + 100 * y; } diff --git a/src/extra/ChronospatialComputerInstruction.cpp b/src/extra/ChronospatialComputerInstruction.cpp index 693bd63..f806409 100644 --- a/src/extra/ChronospatialComputerInstruction.cpp +++ b/src/extra/ChronospatialComputerInstruction.cpp @@ -22,10 +22,10 @@ ChronospatialComputerInstruction::ChronospatialComputerInstruction(const Chronos switch (type) { case ChronospatialComputerOperandType::Literal : - operandFunctor_ = [](const std::array& registers, const int operand) { return operand; }; + operandFunctor_ = [](const std::array& registers, const int operand) { return operand; }; break; case ChronospatialComputerOperandType::Combo : - operandFunctor_ = [](const std::array& registers, const int operand) + operandFunctor_ = [](const std::array& registers, const int operand) { return operand < 4 ? operand : registers[static_cast(operand - 4)]; }; break; } diff --git a/src/extra/MullData.cpp b/src/extra/MullData.cpp index 1702927..c7fe5cb 100644 --- a/src/extra/MullData.cpp +++ b/src/extra/MullData.cpp @@ -57,12 +57,12 @@ void MullData::updateResult() } } -long long int MullData::getResultPart1() const +int64_t MullData::getResultPart1() const { return part1_; } -long long int MullData::getResultPart2() const +int64_t MullData::getResultPart2() const { return part2_; } diff --git a/tests/include/aocTests/TestContext.hpp b/tests/include/aocTests/TestContext.hpp index 9f86ca9..a391f06 100644 --- a/tests/include/aocTests/TestContext.hpp +++ b/tests/include/aocTests/TestContext.hpp @@ -27,17 +27,17 @@ class TestContext { public: - void run(std::unique_ptr>&& solver, const long long& expected1, - const long long& expected2, const std::vector& inputPaths); - void run(std::unique_ptr>&& solver, const long long& expected1, + void run(std::unique_ptr>&& solver, const int64_t expected1, const int64_t expected2, + const std::vector& inputPaths); + void run(std::unique_ptr>&& solver, const int64_t expected1, const std::string& expected2, const std::vector& inputPaths); - void run(std::unique_ptr>&& solver, const std::string& expected1, - const long long& expected2, const std::vector& inputPaths); - void runPart1(std::unique_ptr>&& solver, const long long& expected, + void run(std::unique_ptr>&& solver, const std::string& expected1, + const int64_t expected2, const std::vector& inputPaths); + void runPart1(std::unique_ptr>&& solver, const int64_t expected, const std::vector& inputPaths); - void runPart1(std::unique_ptr>&& solver, const std::string& expected, + void runPart1(std::unique_ptr>&& solver, const std::string& expected, const std::vector& inputPaths); - void runPart2(std::unique_ptr>&& solver, const long long& expected, + void runPart2(std::unique_ptr>&& solver, const int64_t expected, const std::vector& inputPaths); std::vector getInputPaths() const; std::vector getExampleInputPaths() const; diff --git a/tests/src/TestContext.cpp b/tests/src/TestContext.cpp index 078c536..b4e45f1 100644 --- a/tests/src/TestContext.cpp +++ b/tests/src/TestContext.cpp @@ -15,37 +15,37 @@ #include -void TestContext::run(std::unique_ptr>&& solver, const long long& expected1, - const long long& expected2, const std::vector& inputPaths) +void TestContext::run(std::unique_ptr>&& solver, const int64_t expected1, + const int64_t expected2, const std::vector& inputPaths) { runGeneric(std::move(solver), expected1, expected2, inputPaths); } -void TestContext::run(std::unique_ptr>&& solver, const long long& expected1, +void TestContext::run(std::unique_ptr>&& solver, const int64_t expected1, const std::string& expected2, const std::vector& inputPaths) { runGeneric(std::move(solver), expected1, expected2, inputPaths); } -void TestContext::run(std::unique_ptr>&& solver, const std::string& expected1, - const long long& expected2, const std::vector& inputPaths) +void TestContext::run(std::unique_ptr>&& solver, const std::string& expected1, + const int64_t expected2, const std::vector& inputPaths) { runGeneric(std::move(solver), expected1, expected2, inputPaths); } -void TestContext::runPart1(std::unique_ptr>&& solver, const long long& expected, +void TestContext::runPart1(std::unique_ptr>&& solver, const int64_t expected, const std::vector& inputPaths) { runPart1Generic(std::move(solver), expected, inputPaths); } -void TestContext::runPart1(std::unique_ptr>&& solver, const std::string& expected, +void TestContext::runPart1(std::unique_ptr>&& solver, const std::string& expected, const std::vector& inputPaths) { runPart1Generic(std::move(solver), expected, inputPaths); } -void TestContext::runPart2(std::unique_ptr>&& solver, const long long& expected, +void TestContext::runPart2(std::unique_ptr>&& solver, const int64_t expected, const std::vector& inputPaths) { runPart2Generic(std::move(solver), expected, inputPaths);