diff --git a/src/days/01/Day01.cpp b/src/days/01/Day01.cpp index 04b1336..c2ffd9b 100644 --- a/src/days/01/Day01.cpp +++ b/src/days/01/Day01.cpp @@ -2,7 +2,7 @@ Result Day01::Task1() { subSums.push_back(0); - for (const std::string& line : input){ + for (const string &line: input) { if (line.empty()) subSums.push_back(0); else @@ -15,7 +15,7 @@ Result Day01::Task2() { std::sort(subSums.begin(), subSums.end()); int sum = 0; - for (int i = 0; i < 3; i++){ + for (int i = 0; i < 3; i++) { sum += subSums.back(); subSums.pop_back(); } diff --git a/src/days/01/Day01.h b/src/days/01/Day01.h index 36a85a3..836d4a9 100644 --- a/src/days/01/Day01.h +++ b/src/days/01/Day01.h @@ -4,9 +4,9 @@ class Day01 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; std::vector subSums; }; \ No newline at end of file diff --git a/src/days/02/Day02.cpp b/src/days/02/Day02.cpp index 4f2b918..c183a86 100644 --- a/src/days/02/Day02.cpp +++ b/src/days/02/Day02.cpp @@ -1,46 +1,46 @@ #include "Day02.h" int Day02::getScore(char opponent, char me) { - int outcome; - if (opponent == me) - outcome = 3; - else if (opponent == me + 1 || opponent == me - 2) - outcome = 0; - else - outcome = 6; - return outcome + me - 64; + int outcome; + if (opponent == me) + outcome = 3; + else if (opponent == me + 1 || opponent == me - 2) + outcome = 0; + else + outcome = 6; + return outcome + me - 64; } Result Day02::Task1() { - int score = 0; - for (string line : input){ - char predict = line.at(0); - char answer = char(line.at(2) - 23); - score += getScore(predict, answer); - } - return to_string(score); + int score = 0; + for (string line: input) { + char predict = line.at(0); + char answer = char(line.at(2) - 23); + score += getScore(predict, answer); + } + return to_string(score); } Result Day02::Task2() { - int score = 0; - for (string line : input){ - char predict = line.at(0); - char outcome = line.at(2); + int score = 0; + for (string line: input) { + char predict = line.at(0); + char outcome = line.at(2); - char answer; - if (outcome == 'X'){ - if (predict > 'A') answer = char(predict - 1); - else answer = 'C'; - } - if (outcome == 'Y'){ - answer = predict; - } - if (outcome == 'Z'){ - if (predict < 'C') answer = char(predict + 1); - else answer = 'A'; - } + char answer; + if (outcome == 'X') { + if (predict > 'A') answer = char(predict - 1); + else answer = 'C'; + } + if (outcome == 'Y') { + answer = predict; + } + if (outcome == 'Z') { + if (predict < 'C') answer = char(predict + 1); + else answer = 'A'; + } - score += getScore(predict, answer); - } - return to_string(score); + score += getScore(predict, answer); + } + return to_string(score); } \ No newline at end of file diff --git a/src/days/02/Day02.h b/src/days/02/Day02.h index 28e4aae..36ab3d1 100644 --- a/src/days/02/Day02.h +++ b/src/days/02/Day02.h @@ -4,10 +4,11 @@ class Day02 : public Day { protected: - Result Task1() override; + Result Task1() override; + + Result Task2() override; - Result Task2() override; private: - // chars A, B, C - static int getScore(char, char); + // chars A, B, C + static int getScore(char, char); }; \ No newline at end of file diff --git a/src/days/03/Day03.cpp b/src/days/03/Day03.cpp index dad3568..c392912 100644 --- a/src/days/03/Day03.cpp +++ b/src/days/03/Day03.cpp @@ -1,9 +1,9 @@ #include "Day03.h" Result Day03::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day03::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/03/Day03.h b/src/days/03/Day03.h index 0ff555a..4be91a5 100644 --- a/src/days/03/Day03.h +++ b/src/days/03/Day03.h @@ -4,7 +4,7 @@ class Day03 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/04/Day04.cpp b/src/days/04/Day04.cpp index 72beed7..4943015 100644 --- a/src/days/04/Day04.cpp +++ b/src/days/04/Day04.cpp @@ -1,9 +1,9 @@ #include "Day04.h" Result Day04::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day04::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/04/Day04.h b/src/days/04/Day04.h index 8084bcf..8c26982 100644 --- a/src/days/04/Day04.h +++ b/src/days/04/Day04.h @@ -4,7 +4,7 @@ class Day04 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/05/Day05.cpp b/src/days/05/Day05.cpp index 34bffac..c928c21 100644 --- a/src/days/05/Day05.cpp +++ b/src/days/05/Day05.cpp @@ -1,9 +1,9 @@ #include "Day05.h" Result Day05::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day05::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/05/Day05.h b/src/days/05/Day05.h index 128dacd..bf73364 100644 --- a/src/days/05/Day05.h +++ b/src/days/05/Day05.h @@ -4,7 +4,7 @@ class Day05 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/06/Day06.cpp b/src/days/06/Day06.cpp index 256bfb5..7b48c8f 100644 --- a/src/days/06/Day06.cpp +++ b/src/days/06/Day06.cpp @@ -1,9 +1,9 @@ #include "Day06.h" Result Day06::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day06::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/06/Day06.h b/src/days/06/Day06.h index 829fca9..785fc5d 100644 --- a/src/days/06/Day06.h +++ b/src/days/06/Day06.h @@ -4,7 +4,7 @@ class Day06 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/07/Day07.cpp b/src/days/07/Day07.cpp index 339ae0f..d89165a 100644 --- a/src/days/07/Day07.cpp +++ b/src/days/07/Day07.cpp @@ -1,9 +1,9 @@ #include "Day07.h" Result Day07::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day07::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/07/Day07.h b/src/days/07/Day07.h index 4cbc911..39f98fe 100644 --- a/src/days/07/Day07.h +++ b/src/days/07/Day07.h @@ -4,7 +4,7 @@ class Day07 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/08/Day08.cpp b/src/days/08/Day08.cpp index 2cef7b6..047f516 100644 --- a/src/days/08/Day08.cpp +++ b/src/days/08/Day08.cpp @@ -1,9 +1,9 @@ #include "Day08.h" Result Day08::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day08::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/08/Day08.h b/src/days/08/Day08.h index f4712e7..d0933bd 100644 --- a/src/days/08/Day08.h +++ b/src/days/08/Day08.h @@ -4,7 +4,7 @@ class Day08 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/09/Day09.cpp b/src/days/09/Day09.cpp index 4eb2146..5e1968d 100644 --- a/src/days/09/Day09.cpp +++ b/src/days/09/Day09.cpp @@ -1,9 +1,9 @@ #include "Day09.h" Result Day09::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day09::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/09/Day09.h b/src/days/09/Day09.h index c73088e..0747edd 100644 --- a/src/days/09/Day09.h +++ b/src/days/09/Day09.h @@ -4,7 +4,7 @@ class Day09 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/10/Day10.cpp b/src/days/10/Day10.cpp index cae811b..8801a58 100644 --- a/src/days/10/Day10.cpp +++ b/src/days/10/Day10.cpp @@ -1,9 +1,9 @@ #include "Day10.h" Result Day10::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day10::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/10/Day10.h b/src/days/10/Day10.h index e263a56..a4713aa 100644 --- a/src/days/10/Day10.h +++ b/src/days/10/Day10.h @@ -4,7 +4,7 @@ class Day10 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/11/Day11.cpp b/src/days/11/Day11.cpp index 6cb34b6..8376f31 100644 --- a/src/days/11/Day11.cpp +++ b/src/days/11/Day11.cpp @@ -1,9 +1,9 @@ #include "Day11.h" Result Day11::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day11::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/11/Day11.h b/src/days/11/Day11.h index 2883f1a..29ebeba 100644 --- a/src/days/11/Day11.h +++ b/src/days/11/Day11.h @@ -4,7 +4,7 @@ class Day11 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/12/Day12.cpp b/src/days/12/Day12.cpp index e3cc2c4..fd9f16d 100644 --- a/src/days/12/Day12.cpp +++ b/src/days/12/Day12.cpp @@ -1,9 +1,9 @@ #include "Day12.h" Result Day12::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day12::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/12/Day12.h b/src/days/12/Day12.h index b713fc4..1d4054d 100644 --- a/src/days/12/Day12.h +++ b/src/days/12/Day12.h @@ -4,7 +4,7 @@ class Day12 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/13/Day13.cpp b/src/days/13/Day13.cpp index 619e886..6fd9442 100644 --- a/src/days/13/Day13.cpp +++ b/src/days/13/Day13.cpp @@ -1,9 +1,9 @@ #include "Day13.h" Result Day13::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day13::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/13/Day13.h b/src/days/13/Day13.h index eac7676..141861d 100644 --- a/src/days/13/Day13.h +++ b/src/days/13/Day13.h @@ -4,7 +4,7 @@ class Day13 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/14/Day14.cpp b/src/days/14/Day14.cpp index 4b2001d..89e4558 100644 --- a/src/days/14/Day14.cpp +++ b/src/days/14/Day14.cpp @@ -1,9 +1,9 @@ #include "Day14.h" Result Day14::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day14::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/14/Day14.h b/src/days/14/Day14.h index e7af034..cc9cd29 100644 --- a/src/days/14/Day14.h +++ b/src/days/14/Day14.h @@ -4,7 +4,7 @@ class Day14 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/15/Day15.cpp b/src/days/15/Day15.cpp index b94014d..fa0c5f5 100644 --- a/src/days/15/Day15.cpp +++ b/src/days/15/Day15.cpp @@ -1,9 +1,9 @@ #include "Day15.h" Result Day15::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day15::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/15/Day15.h b/src/days/15/Day15.h index e526cb1..e2b8133 100644 --- a/src/days/15/Day15.h +++ b/src/days/15/Day15.h @@ -4,7 +4,7 @@ class Day15 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/16/Day16.cpp b/src/days/16/Day16.cpp index ac4e8a2..0b4b34a 100644 --- a/src/days/16/Day16.cpp +++ b/src/days/16/Day16.cpp @@ -1,9 +1,9 @@ #include "Day16.h" Result Day16::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day16::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/16/Day16.h b/src/days/16/Day16.h index 7d47781..3282764 100644 --- a/src/days/16/Day16.h +++ b/src/days/16/Day16.h @@ -4,7 +4,7 @@ class Day16 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/17/Day17.cpp b/src/days/17/Day17.cpp index d97c359..478a2a8 100644 --- a/src/days/17/Day17.cpp +++ b/src/days/17/Day17.cpp @@ -1,9 +1,9 @@ #include "Day17.h" Result Day17::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day17::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/17/Day17.h b/src/days/17/Day17.h index 984c4ba..7ac6939 100644 --- a/src/days/17/Day17.h +++ b/src/days/17/Day17.h @@ -4,7 +4,7 @@ class Day17 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/18/Day18.cpp b/src/days/18/Day18.cpp index 0a70982..14ab116 100644 --- a/src/days/18/Day18.cpp +++ b/src/days/18/Day18.cpp @@ -1,9 +1,9 @@ #include "Day18.h" Result Day18::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day18::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/18/Day18.h b/src/days/18/Day18.h index 0a7c622..53f39b6 100644 --- a/src/days/18/Day18.h +++ b/src/days/18/Day18.h @@ -4,7 +4,7 @@ class Day18 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/19/Day19.cpp b/src/days/19/Day19.cpp index 2130551..6dad2c9 100644 --- a/src/days/19/Day19.cpp +++ b/src/days/19/Day19.cpp @@ -1,9 +1,9 @@ #include "Day19.h" Result Day19::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day19::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/19/Day19.h b/src/days/19/Day19.h index 8bd9d57..89b6d86 100644 --- a/src/days/19/Day19.h +++ b/src/days/19/Day19.h @@ -4,7 +4,7 @@ class Day19 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/20/Day20.cpp b/src/days/20/Day20.cpp index 61da045..6d087d2 100644 --- a/src/days/20/Day20.cpp +++ b/src/days/20/Day20.cpp @@ -1,9 +1,9 @@ #include "Day20.h" Result Day20::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day20::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/20/Day20.h b/src/days/20/Day20.h index 3b1d87f..8ba0e98 100644 --- a/src/days/20/Day20.h +++ b/src/days/20/Day20.h @@ -4,7 +4,7 @@ class Day20 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/21/Day21.cpp b/src/days/21/Day21.cpp index 2a70ddb..8ab87ec 100644 --- a/src/days/21/Day21.cpp +++ b/src/days/21/Day21.cpp @@ -1,9 +1,9 @@ #include "Day21.h" Result Day21::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day21::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/21/Day21.h b/src/days/21/Day21.h index 0635da0..7ea7f3d 100644 --- a/src/days/21/Day21.h +++ b/src/days/21/Day21.h @@ -4,7 +4,7 @@ class Day21 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/22/Day22.cpp b/src/days/22/Day22.cpp index 6e9b249..d191bef 100644 --- a/src/days/22/Day22.cpp +++ b/src/days/22/Day22.cpp @@ -1,9 +1,9 @@ #include "Day22.h" Result Day22::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day22::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/22/Day22.h b/src/days/22/Day22.h index d7e2b87..86e1434 100644 --- a/src/days/22/Day22.h +++ b/src/days/22/Day22.h @@ -4,7 +4,7 @@ class Day22 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/23/Day23.cpp b/src/days/23/Day23.cpp index 7e048b0..722d2f3 100644 --- a/src/days/23/Day23.cpp +++ b/src/days/23/Day23.cpp @@ -1,9 +1,9 @@ #include "Day23.h" Result Day23::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day23::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/23/Day23.h b/src/days/23/Day23.h index 06c4bf8..356382f 100644 --- a/src/days/23/Day23.h +++ b/src/days/23/Day23.h @@ -4,7 +4,7 @@ class Day23 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/24/Day24.cpp b/src/days/24/Day24.cpp index fbf2778..b1b74a7 100644 --- a/src/days/24/Day24.cpp +++ b/src/days/24/Day24.cpp @@ -1,9 +1,9 @@ #include "Day24.h" Result Day24::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day24::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/24/Day24.h b/src/days/24/Day24.h index be8afb7..3bde5d1 100644 --- a/src/days/24/Day24.h +++ b/src/days/24/Day24.h @@ -4,7 +4,7 @@ class Day24 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file diff --git a/src/days/25/Day25.cpp b/src/days/25/Day25.cpp index b461fa5..b83f3d7 100644 --- a/src/days/25/Day25.cpp +++ b/src/days/25/Day25.cpp @@ -1,9 +1,9 @@ #include "Day25.h" Result Day25::Task1() { - return Day::Task1(); + return Day::Task1(); } Result Day25::Task2() { - return Day::Task2(); + return Day::Task2(); } \ No newline at end of file diff --git a/src/days/25/Day25.h b/src/days/25/Day25.h index f4277d0..eed9c82 100644 --- a/src/days/25/Day25.h +++ b/src/days/25/Day25.h @@ -4,7 +4,7 @@ class Day25 : public Day { protected: - Result Task1() override; + Result Task1() override; - Result Task2() override; + Result Task2() override; }; \ No newline at end of file