Merge pull request devcordde#2 from devcordde/master

Updating fork

Author: Th3Ph4nt0m

Day-01/c/JohnnyJayJay/Day01.c

@@ -1,5 +1,4 @@
-/* compile from project root using 
- cc -Wall -g shared/JohnnyJayJay/aoc.c Day-01/c/JohnnyJayJay/Day01.c -o day01 */
+// Read my README in shared/JohnnyJayJay
 
 #include <stdio.h>
 #include <stdlib.h>

Day-01/java/MCqwertz/Day1.java

@@ -1,30 +1,26 @@
 //created by MCqwertz
 
-
-package com.github.mcqwertz.year2020.days;
-
-import com.github.mcqwertz.util.TextFileUtils;
-
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Scanner;
 import java.util.function.IntPredicate;
 import java.util.function.Supplier;
 import java.util.stream.IntStream;
 
 
 public class Day1 {
 public static void main(String[] args) throws FileNotFoundException {
-Day1 day = new Day1();
-Supplier<IntStream> supplier = TextFileUtils.getNumbers(1);
-System.out.println("Task 1: " + day.getFirstPart(supplier));
-System.out.println("Task 2: " + day.getSecondPart(supplier));
+Supplier<IntStream> supplier = getInput();
+System.out.println("Task 1: " + getFirstPart(supplier));
+System.out.println("Task 2: " + getSecondPart(supplier));
 }
 
 /**
  * @param supplier supplier of the stream with all given numbers
  * @return the solution of the first problem
  */
-private int getFirstPart(Supplier<IntStream> supplier) {
-IntPredicate isSearched = arg -> this.isContaining(supplier.get(), 2020 - arg);
+private static int getFirstPart(Supplier<IntStream> supplier) {
+IntPredicate isSearched = arg -> isContaining(supplier.get(), 2020 - arg);
 int result = 1;
 //check for each int whether there is suitable second int
 for (int i : supplier.get().filter(isSearched).toArray()) {
@@ -36,7 +32,7 @@ private int getFirstPart(Supplier<IntStream> supplier) {
  * @param supplier supplier of the stream with all given numbers
  * @return the solution of the second problem
  */
-private int getSecondPart(Supplier<IntStream> supplier) {
+private static int getSecondPart(Supplier<IntStream> supplier) {
 int[] array = supplier.get().toArray();
 //combine each number with every other number
 for (int i : array) {
@@ -50,12 +46,22 @@ private int getSecondPart(Supplier<IntStream> supplier) {
 return -1;
 }
 
-private boolean isContaining(IntStream stream, int x) {
+private static boolean isContaining(IntStream stream, int x) {
 for (int i : stream.toArray()) {
 if(i == x) {
 return true;
 }
 }
 return false;
 }
+
+public static Supplier<IntStream> getInput() throws FileNotFoundException {
+Scanner scanner = TextFileUtils.getScanner(1);
+ArrayList<String> arrayList = new ArrayList<>();
+while(scanner.hasNextLine()) {
+arrayList.add(scanner.nextLine());
+}
+scanner.close();
+return () -> arrayList.stream().mapToInt(Integer::parseInt);
+}
 }

Day-01/python/justentrix/solution.py

@@ -0,0 +1,46 @@
+from file_reader import read_numbers
+
+numbers = read_numbers('day01.txt')
+
+def get_first_numbers():
+ max_index = len(numbers) - 1
+
+ for i in range(max_index):
+ curr = numbers[i]
+
+ for j in range(i + 1, max_index):
+ next = numbers[j]
+ if (curr + next) == 2020:
+ return curr, next
+
+def get_second_numbers():
+ max_index = len(numbers) - 2
+
+ for i in range(max_index):
+ first = numbers[i]
+
+ for j in range(i + 1, max_index):
+ second = numbers[j]
+
+ for k in range(i + 2, max_index):
+ third = numbers[k]
+
+ if (first + second + third) == 2020:
+ return first, second, third
+
+# Part one
+nums = get_first_numbers()
+first = nums[0]
+second = nums[1]
+
+print(f'{first} + {second} = {first + second}')
+print(f'{first} x {second} = {first * second}')
+
+# Part two
+nums = get_second_numbers()
+first = nums[0]
+second = nums[1]
+third = nums[2]
+
+print(f'{first} + {second} + {third} = {first + second + third}')
+print(f'{first} x {second} x {third} = {first * second * third}')

Day-02/c/JohnnyJayJay/Day02.c

@@ -1,41 +1,40 @@
-/* compile from project root using 
- cc -Wall -g shared/JohnnyJayJay/aoc.c Day-02/c/JohnnyJayJay/Day02.c -o day02 */
+// Read my README in shared/JohnnyJayJay
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "../../../shared/JohnnyJayJay/aoc.h"
 
-struct db_entry {
+typedef struct {
  int min;
  int max;
  char c;
  char* password;
-};
+} db_entry;
 
 
 int main(int argc, char** argv) {
  FILE* file = fopen(argv[1], "r");
  int lines = count_lines(file);
 
- struct db_entry entries[lines];
+ db_entry entries[lines];
  for (int i = 0; i < lines; i++) {
  int min, max;
  char c;
- char* password = malloc(chars_until(file, '\n') + 1);
+ char* password = malloc(chars_until(file, '\n', 1) + 1);
  fscanf(file, "%d-%d %c: %s", &min, &max, &c, password);
- struct db_entry entry = {.min = min, .max = max, .c = c, .password = password};
+ db_entry entry = {.min = min, .max = max, .c = c, .password = password};
  entries[i] = entry;
  }
 
  int valid_passwords1 = 0;
  int valid_passwords2 = 0;
  for (int i = 0; i < lines; i++) {
- struct db_entry entry = entries[i];
- char* pw = entry.password;
- char c = entry.c;
- int min = entry.min;
- int max = entry.max;
+ db_entry* entry = &entries[i];
+ char* pw = entry->password;
+ char c = entry->c;
+ int min = entry->min;
+ int max = entry->max;
  int count = charcount(pw, c, 0, strlen(pw));
  if (count >= min && count <= max) {
  valid_passwords1++;

Day-02/java/MCqwertz/Day2.java

@@ -0,0 +1,59 @@
+//created by MCqwertz
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Scanner;
+import java.util.function.IntPredicate;
+
+public class Day2 {
+public static void main(String[] args) throws FileNotFoundException {
+String[][] input = getInput();
+System.out.println("Part 1: " + getFirstPart(input));
+System.out.println("Part 2: " + getSecondPart(input));
+}
+
+private static int getFirstPart(String[][] input) {
+int i = 0;
+for (String[] strings : input) {
+IntPredicate isSearched = arg -> arg == strings[2].charAt(0);
+int int0 = Integer.parseInt(strings[0]);
+int int1 = Integer.parseInt(strings[1]);
+int appearances = strings[3].chars().filter(isSearched).toArray().length;
+if(appearances <= int1 && appearances >= int0) {
+i++;
+}
+}
+return i;
+}
+
+private static int getSecondPart(String[][] input) {
+int i = 0;
+for (String[] strings : input) {
+int int0 = Integer.parseInt(strings[0]) - 1;
+int int1 = Integer.parseInt(strings[1]) - 1;
+char c = strings[2].charAt(0);
+if ((strings[3].charAt(int0) == c && strings[3].charAt(int1) != c) ||
+(strings[3].charAt(int0) != c && strings[3].charAt(int1) == c)) {
+i++;
+}
+}
+return i;
+}
+
+public static String[][] getInput() throws FileNotFoundException {
+Scanner scanner = TextFileUtils.getScanner(2);
+ArrayList<String> arrayList = new ArrayList<>();
+while(scanner.hasNextLine()) {
+arrayList.add(scanner.nextLine());
+}
+String[][] input = new String[arrayList.size()][4];
+for (int i = 0; i < arrayList.size(); i++) {
+String [] strings = arrayList.get(i).split("-")[1].replace(":", " ").split(" ");
+input[i] = new String[]{arrayList.get(i).split("-")[0], strings[0], strings[1], strings[3]};
+}
+scanner.close();
+return input;
+}
+
+}
+

Day-02/python/justentrix/solution.py

@@ -0,0 +1,56 @@
+from file_reader import read_lines
+import re
+
+class Password:
+ def __init__(self, letter, first_number, second_number, plain):
+ self.letter = letter
+ self.first_number = first_number
+ self.second_number = second_number
+ self.plain = plain
+
+def read_password_from_string(line):
+ split = line.split(' ')
+ amount = split[0].split('-')
+
+ first_number = int(amount[0])
+ second_number = int(amount[1])
+
+ letter = split[1][0]
+ password = split[2]
+
+ return Password(letter, first_number, second_number, password)
+
+# Part one
+def is_password_valid(password):
+ letters = re.sub(f'[^{password.letter}]', '', password.plain)
+ length = len(letters)
+ return length >= password.first_number and length <= password.second_number
+
+available_passwords = []
+for line in read_lines('day02.txt'):
+ password = read_password_from_string(line)
+ available_passwords.append(password)
+
+valid_passwords = []
+
+for password in available_passwords:
+ if is_password_valid(password):
+ valid_passwords.append(password)
+
+print(len(valid_passwords))
+
+# Part two
+def is_password_valid(password):
+ first_letter = password.plain[password.first_number - 1]
+ second_letter = password.plain[password.second_number - 1]
+
+ return (first_letter == password.letter and not second_letter == password.letter
+ or not first_letter == password.letter and second_letter == password.letter)
+
+valid_passwords = []
+
+for password in available_passwords:
+ if is_password_valid(password):
+ valid_passwords.append(password)
+ 
+print(len(valid_passwords))

Day-02/python/paul2708/solution.py

@@ -23,6 +23,7 @@
  valid_passwords += 1
 
 aoc_print(f"{valid_passwords} passwords are valid. (old interpretation)")
+assert_equals(424, valid_passwords)
 
 # Part two
 valid_passwords = 0
@@ -42,3 +43,4 @@
  valid_passwords += 1
 
 aoc_print(f"{valid_passwords} passwords are valid. (new interpretation)")
+assert_equals(747, valid_passwords)

Day-03/c/JohnnyJayJay/Day03.c

@@ -20,11 +20,11 @@ int traverse(u_int32_t* levels, int lines, int width, int x_step, int y_step) {
 int main(int argc, char** argv) {
  FILE* file = fopen(argv[1], "r");
  int lines = count_lines(file);
- int width = chars_until(file, '\n');
+ int width = chars_until(file, '\n', 1);
  u_int32_t* levels = malloc(sizeof(u_int32_t) * lines);
  for (int i = 0; i < lines; i++) {
  u_int32_t level = 0;
- char spot;
+ int spot;
  while ((spot = fgetc(file)) != '\n' && spot != EOF) {
  level <<= 1;
  level |= spot == '#';

Day-03/java/MCqwertz/Day3.java

@@ -0,0 +1,50 @@
+//created by MCqwertz
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class Day3 {
+public static void main(String[] args) throws FileNotFoundException {
+char[][] grid = getInput();
+System.out.println("Part 1: " + getTrees(grid, 3, 1));
+System.out.println("Part 2: " + getSecondResult(grid));
+}
+
+
+private static long getSecondResult(char[][] grid) {
+return getTrees(grid, 1, 1) * getTrees(grid, 3, 1) * getTrees(grid, 5, 1) *
+getTrees(grid, 7, 1) * getTrees(grid, 1, 2);
+}
+
+private static long getTrees(char[][] grid, int right, int down) {
+long trees = 0;
+int coulomb = 0;
+for (int i = down; i < grid.length; i += down) {
+coulomb = coulomb + right;
+if (grid[i][coulomb % grid[i].length] == '#') {
+trees++;
+}
+}
+return trees;
+}
+
+public static char[][] getInput() throws FileNotFoundException {
+Scanner scanner = TextFileUtils.getScanner(3);
+ArrayList<String> arrayList = new ArrayList<>();
+while(scanner.hasNextLine()) {
+arrayList.add(scanner.nextLine());
+}
+int coulombs = arrayList.get(0).toCharArray().length;
+char[][] grid = new char[arrayList.size()][coulombs];
+int j = 0;
+for (int i = 0; i < arrayList.size(); i++){
+for (char c : arrayList.get(i).toCharArray()) {
+grid[i][j++] = c;
+}
+j = 0;
+}
+scanner.close();
+return grid;
+}
+}