Add top level structure (#11)

* Move current solution into 2020 folder. * Add top level readme.
jp7677 · Aug 25, 2021 · 5303bb3 · 5303bb3
1 parent 69fe026
commit 5303bb3
Show file tree

Hide file tree

Showing 72 changed files with 261 additions and 37 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-inc/* linguist-vendored
+2020/inc/* linguist-vendored
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,8 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE
       - uses: actions/checkout@v2
-      - name: Compile and run
+      - name: Compile and run AoC2020
         run: |
+          cd 2020
           ./build/make.sh
           time ./cmake-build-release/adventofcode
diff --git a/2020/.gitignore b/2020/.gitignore
@@ -0,0 +1 @@
+cmake-build-*
diff --git a/2020/.idea/.gitignore b/2020/.idea/.gitignore
diff --git a/2020/.idea/adventofcode.iml b/2020/.idea/adventofcode.iml
diff --git a/2020/.idea/misc.xml b/2020/.idea/misc.xml
diff --git a/2020/.idea/modules.xml b/2020/.idea/modules.xml
diff --git a/2020/.idea/vcs.xml b/2020/.idea/vcs.xml
diff --git a/2020/.vscode/c_cpp_properties.json b/2020/.vscode/c_cpp_properties.json
@@ -0,0 +1,15 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/g++",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "${default}"
+        }
+    ],
+    "version": 4
+}
diff --git a/2020/.vscode/launch.json b/2020/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Build and debug",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/cmake-build-debug/adventofcode",
+      "cwd": "${workspaceFolder}",
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ],
+      "preLaunchTask": "Build (Debug)",
+      "miDebuggerPath": "/usr/bin/gdb"
+    }
+  ]
+}
diff --git a/2020/.vscode/settings.json b/2020/.vscode/settings.json
@@ -0,0 +1,59 @@
+{
+  "files.exclude": {
+    ".vscode/**": true,
+    ".idea/**": true,
+    ".github/**": true,
+    ".gitignore": true,
+    ".gitattributes": true,
+    "cmake-build-*/**": true
+  },
+  "C_Cpp.errorSquiggles": "Enabled",
+  "files.associations": {
+    "iostream": "cpp",
+    "algorithm": "cpp",
+    "sstream": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "deque": "cpp",
+    "unordered_map": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "initializer_list": "cpp",
+    "iosfwd": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "new": "cpp",
+    "ostream": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "typeinfo": "cpp",
+    "future": "cpp",
+    "stop_token": "cpp"
+  }
+}
diff --git a/2020/.vscode/tasks.json b/2020/.vscode/tasks.json
@@ -0,0 +1,82 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "shell",
+      "label": "Configure (Debug)",
+      "command": "/usr/bin/cmake",
+      "args": [
+        "-DCMAKE_BUILD_TYPE=Debug",
+        "-B./cmake-build-debug"
+      ],
+      "problemMatcher": [],
+      "group": "build",
+      "presentation": {
+        "clear": true,
+        "showReuseMessage": false
+      }
+    },
+    {
+      "type": "shell",
+      "label": "Build (Debug)",
+      "command": "/usr/bin/cmake",
+      "args": [
+        "--build",
+        "./cmake-build-debug",
+        "--target",
+        "all",
+        "--",
+        "-j",
+        "9"
+      ],
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "clear": true,
+        "showReuseMessage": false
+      }
+    },
+    {
+      "type": "shell",
+      "label": "Configure (Release)",
+      "command": "/usr/bin/cmake",
+      "args": [
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-B./cmake-build-release"
+      ],
+      "problemMatcher": [],
+      "group": "build",
+      "presentation": {
+        "clear": true,
+        "showReuseMessage": false
+      }
+    },
+    {
+      "type": "shell",
+      "label": "Build (Release)",
+      "command": "/usr/bin/cmake",
+      "args": [
+        "--build",
+        "./cmake-build-release",
+        "--target",
+        "all",
+        "--",
+        "-j",
+        "9"
+      ],
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "group": "build",
+      "presentation": {
+        "clear": true,
+        "showReuseMessage": false
+      }
+    }
+  ]
+}
diff --git a/CMakeLists.txt → 2020/CMakeLists.txt b/CMakeLists.txt → 2020/CMakeLists.txt
diff --git a/2020/README.md b/2020/README.md
@@ -0,0 +1,39 @@
+# Advent of Code 2020 C++
+
+From <https://adventofcode.com/2020>. Better late than never ;)
+
+## System requirements
+
+- build-essentials (gcc)
+- cmake
+
+Only Linux/gcc has been tested. Other platforms might just work though.
+
+## Compile & run (Release)
+
+```bash
+./build/make.sh
+./cmake-build-release/adventofcode
+```
+
+The command line arguments from <https://github.com/catchorg/Catch2/blob/devel/docs/command-line.md#specifying-which-tests-to-run> apply to the executable, e.g. use `./cmake-build-release/adventofcode --success "Day 01 - Part 1*"` to run a single test only including showing verbose test results.
+
+## Recompile & run (Debug)
+
+```bash
+./build/run.sh
+```
+
+The command line arguments for the test runner (see above) are passed by the `run.sh` script to the executable.
+
+## Results
+
+Enjoying all the stars...
+
+![Final AoC map](https://github.com/jp7677/adventofcode/raw/main/map.png)
+
+## Other cool solutions
+
+- <https://github.com/Dricus/adventofcode>
+- <https://github.com/StefRave/advent-of-code-2020>
+- <https://github.com/ErikSchierboom/advent-of-code>
diff --git a/build/make.sh → 2020/build/make.sh b/build/make.sh → 2020/build/make.sh
diff --git a/build/run.sh → 2020/build/run.sh b/build/run.sh → 2020/build/run.sh
diff --git a/data/day01-input.txt → 2020/data/day01-input.txt b/data/day01-input.txt → 2020/data/day01-input.txt
diff --git a/data/day02-input.txt → 2020/data/day02-input.txt b/data/day02-input.txt → 2020/data/day02-input.txt
diff --git a/data/day03-input.txt → 2020/data/day03-input.txt b/data/day03-input.txt → 2020/data/day03-input.txt
diff --git a/data/day04-input.txt → 2020/data/day04-input.txt b/data/day04-input.txt → 2020/data/day04-input.txt
diff --git a/data/day05-input.txt → 2020/data/day05-input.txt b/data/day05-input.txt → 2020/data/day05-input.txt
diff --git a/data/day06-input.txt → 2020/data/day06-input.txt b/data/day06-input.txt → 2020/data/day06-input.txt
diff --git a/data/day07-input.txt → 2020/data/day07-input.txt b/data/day07-input.txt → 2020/data/day07-input.txt
diff --git a/data/day08-input.txt → 2020/data/day08-input.txt b/data/day08-input.txt → 2020/data/day08-input.txt
diff --git a/data/day09-input.txt → 2020/data/day09-input.txt b/data/day09-input.txt → 2020/data/day09-input.txt
diff --git a/data/day10-input.txt → 2020/data/day10-input.txt b/data/day10-input.txt → 2020/data/day10-input.txt
diff --git a/data/day11-input.txt → 2020/data/day11-input.txt b/data/day11-input.txt → 2020/data/day11-input.txt
diff --git a/data/day12-input.txt → 2020/data/day12-input.txt b/data/day12-input.txt → 2020/data/day12-input.txt
diff --git a/data/day13-input.txt → 2020/data/day13-input.txt b/data/day13-input.txt → 2020/data/day13-input.txt
diff --git a/data/day14-input.txt → 2020/data/day14-input.txt b/data/day14-input.txt → 2020/data/day14-input.txt
diff --git a/data/day15-input.txt → 2020/data/day15-input.txt b/data/day15-input.txt → 2020/data/day15-input.txt
diff --git a/data/day16-input.txt → 2020/data/day16-input.txt b/data/day16-input.txt → 2020/data/day16-input.txt
diff --git a/data/day17-input.txt → 2020/data/day17-input.txt b/data/day17-input.txt → 2020/data/day17-input.txt
diff --git a/data/day18-input.txt → 2020/data/day18-input.txt b/data/day18-input.txt → 2020/data/day18-input.txt
diff --git a/data/day19-input.txt → 2020/data/day19-input.txt b/data/day19-input.txt → 2020/data/day19-input.txt
diff --git a/data/day20-input.txt → 2020/data/day20-input.txt b/data/day20-input.txt → 2020/data/day20-input.txt
diff --git a/data/day21-input.txt → 2020/data/day21-input.txt b/data/day21-input.txt → 2020/data/day21-input.txt
diff --git a/data/day22-input.txt → 2020/data/day22-input.txt b/data/day22-input.txt → 2020/data/day22-input.txt
diff --git a/data/day23-input.txt → 2020/data/day23-input.txt b/data/day23-input.txt → 2020/data/day23-input.txt
diff --git a/data/day24-input.txt → 2020/data/day24-input.txt b/data/day24-input.txt → 2020/data/day24-input.txt
diff --git a/data/day25-input.txt → 2020/data/day25-input.txt b/data/day25-input.txt → 2020/data/day25-input.txt
diff --git a/inc/catch.hpp → 2020/inc/catch.hpp b/inc/catch.hpp → 2020/inc/catch.hpp
diff --git a/map.png → 2020/map.png b/map.png → 2020/map.png
diff --git a/src/day01.cpp → 2020/src/day01.cpp b/src/day01.cpp → 2020/src/day01.cpp
diff --git a/src/day02.cpp → 2020/src/day02.cpp b/src/day02.cpp → 2020/src/day02.cpp
diff --git a/src/day03.cpp → 2020/src/day03.cpp b/src/day03.cpp → 2020/src/day03.cpp
diff --git a/src/day04.cpp → 2020/src/day04.cpp b/src/day04.cpp → 2020/src/day04.cpp
diff --git a/src/day05.cpp → 2020/src/day05.cpp b/src/day05.cpp → 2020/src/day05.cpp
diff --git a/src/day06.cpp → 2020/src/day06.cpp b/src/day06.cpp → 2020/src/day06.cpp
diff --git a/src/day07.cpp → 2020/src/day07.cpp b/src/day07.cpp → 2020/src/day07.cpp
diff --git a/src/day08.cpp → 2020/src/day08.cpp b/src/day08.cpp → 2020/src/day08.cpp
diff --git a/src/day09.cpp → 2020/src/day09.cpp b/src/day09.cpp → 2020/src/day09.cpp
diff --git a/src/day10.cpp → 2020/src/day10.cpp b/src/day10.cpp → 2020/src/day10.cpp
diff --git a/src/day11.cpp → 2020/src/day11.cpp b/src/day11.cpp → 2020/src/day11.cpp
diff --git a/src/day12.cpp → 2020/src/day12.cpp b/src/day12.cpp → 2020/src/day12.cpp
diff --git a/src/day13.cpp → 2020/src/day13.cpp b/src/day13.cpp → 2020/src/day13.cpp
diff --git a/src/day14.cpp → 2020/src/day14.cpp b/src/day14.cpp → 2020/src/day14.cpp
diff --git a/src/day15.cpp → 2020/src/day15.cpp b/src/day15.cpp → 2020/src/day15.cpp
diff --git a/src/day16.cpp → 2020/src/day16.cpp b/src/day16.cpp → 2020/src/day16.cpp
diff --git a/src/day17.cpp → 2020/src/day17.cpp b/src/day17.cpp → 2020/src/day17.cpp
diff --git a/src/day18.cpp → 2020/src/day18.cpp b/src/day18.cpp → 2020/src/day18.cpp
diff --git a/src/day19.cpp → 2020/src/day19.cpp b/src/day19.cpp → 2020/src/day19.cpp
diff --git a/src/day20.cpp → 2020/src/day20.cpp b/src/day20.cpp → 2020/src/day20.cpp
diff --git a/src/day21.cpp → 2020/src/day21.cpp b/src/day21.cpp → 2020/src/day21.cpp
diff --git a/src/day22.cpp → 2020/src/day22.cpp b/src/day22.cpp → 2020/src/day22.cpp
diff --git a/src/day23.cpp → 2020/src/day23.cpp b/src/day23.cpp → 2020/src/day23.cpp
diff --git a/src/day24.cpp → 2020/src/day24.cpp b/src/day24.cpp → 2020/src/day24.cpp
diff --git a/src/day25.cpp → 2020/src/day25.cpp b/src/day25.cpp → 2020/src/day25.cpp
diff --git a/src/days_private.h → 2020/src/days_private.h b/src/days_private.h → 2020/src/days_private.h
diff --git a/src/main.cpp → 2020/src/main.cpp b/src/main.cpp → 2020/src/main.cpp
diff --git a/src/util.h → 2020/src/util.h b/src/util.h → 2020/src/util.h
diff --git a/README.md b/README.md
@@ -1,39 +1,9 @@
-# Advent of Code 2020 C++
+# Advent of Code
 
-From <https://adventofcode.com/2020>. Better late than never ;)
+From <https://adventofcode.com/>. Better late than never ;)
 
-## System requirements
+## The years
 
-- build-essentials (gcc)
-- cmake
+- Advent of Code 2020 C++ <https://github.com/jp7677/adventofcode/tree/main/2020>
 
-Only Linux/gcc has been tested. Other platforms might just work though.
-
-## Compile & run (Release)
-
-```bash
-./build/make.sh
-./cmake-build-release/adventofcode
-```
-
-The command line arguments from <https://github.com/catchorg/Catch2/blob/devel/docs/command-line.md#specifying-which-tests-to-run> apply to the executable, e.g. use `./cmake-build-release/adventofcode --success "Day 01 - Part 1*"` to run a single test only including showing verbose test results.
-
-## Recompile & run (Debug)
-
-```bash
-./build/run.sh
-```
-
-The command line arguments for the test runner (see above) are passed by the `run.sh` script to the executable.
-
-## Results
-
-Enjoying all the stars...
-
-![Final AoC map](https://github.com/jp7677/adventofcode/raw/main/map.png)
-
-## Other cool solutions
-
-- <https://github.com/Dricus/adventofcode>
-- <https://github.com/StefRave/advent-of-code-2020>
-- <https://github.com/ErikSchierboom/advent-of-code>
+Enjoy the stars...
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		inc/* linguist-vendored
		2020/inc/* linguist-vendored