2021/day5/5.py

@@ -15,21 +15,25 @@ for l in lines:
 	yDir = 0
 	if l[0][0] > l[1][0]:
 		xDir = -1
-	elif l[0][0] < l[1][0]:
+	if l[0][0] < l[1][0]:
 		xDir = 1
 	if l[0][1] > l[1][1]:
 		yDir = -1
-	elif l[0][1] < l[1][1]:
+	if l[0][1] < l[1][1]:
 		yDir = 1
+	if xDir == 0:
+		for i in range(l[0][1],l[1][1]+yDir,yDir):
+			grid[l[0][0]][i] += 1
+			if grid[l[0][0]][i] == 2:
+				overlaps += 1
+	if yDir == 0:
+		for i in range(l[0][0],l[1][0]+xDir,xDir):
+			grid[i][l[0][1]] += 1
+			if grid[i][l[0][1]] == 2:
+				overlaps += 1
 	for i in range(0, max([abs(l[1][0]-l[0][0]),abs(l[1][1]-l[0][1])])+1):
-		x = l[0][0]+i*xDir
+		gridAll[l[0][0]+i*xDir][l[0][1]+i*yDir] += 1
-		y = l[0][1]+i*yDir
+		if gridAll[l[0][0]+i*xDir][l[0][1]+i*yDir] == 2:
-		if xDir == 0 or yDir == 0:
-			grid[x][y] +=1
-			if grid[x][y] == 2:
-				overlaps +=1
-		gridAll[x][y] += 1
-		if gridAll[x][y] == 2:
 			overlapsAll += 1
 	
 	

2021/day6/6.py

@@ -1,29 +0,0 @@
-fish = [int(i) for i in open("input.txt", 'r').read().split(",")]
-fishies = {}
-newFishies = {}
-
-for i in range(9):
-	fishies[i] = 0
-	newFishies[i] = 0
-
-for f in fish:
-	fishies[f] += 1
-
-for i in range(int(input("days: "))):
-	tempFish = fishies.copy()
-	fishies[6] = fishies[0]+newFishies[0]
-	for j in range(6):
-		fishies[j] = tempFish[j+1]
-	foo = tempFish[0]
-	tempFish = newFishies.copy()
-	newFishies[8] = foo + newFishies[0]
-	for j in range(8):
-		newFishies[j] = tempFish[j+1]
-
-summa = 0
-for x in fishies:
-	summa += fishies[x]
-for x in newFishies:
-	summa += newFishies[x]
-
-print(summa)

2021/day6/input.txt

@@ -1 +0,0 @@
-4,1,1,4,1,2,1,4,1,3,4,4,1,5,5,1,3,1,1,1,4,4,3,1,5,3,1,2,5,1,1,5,1,1,4,1,1,1,1,2,1,5,3,4,4,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,5,1,1,1,4,1,2,3,5,1,2,2,4,1,4,4,4,1,2,5,1,2,1,1,1,1,1,1,4,1,1,4,3,4,2,1,3,1,1,1,3,5,5,4,3,4,1,5,1,1,1,2,2,1,3,1,2,4,1,1,3,3,1,3,3,1,1,3,1,5,1,1,3,1,1,1,5,4,1,1,1,1,4,1,1,3,5,4,3,1,1,5,4,1,1,2,5,4,2,1,4,1,1,1,1,3,1,1,1,1,4,1,1,1,1,2,4,1,1,1,1,3,1,1,5,1,1,1,1,1,1,4,2,1,3,1,1,1,2,4,2,3,1,4,1,2,1,4,2,1,4,4,1,5,1,1,4,4,1,2,2,1,1,1,1,1,1,1,1,1,1,1,4,5,4,1,3,1,3,1,1,1,5,3,5,5,2,2,1,4,1,4,2,1,4,1,2,1,1,2,1,1,5,4,2,1,1,1,2,4,1,1,1,1,2,1,1,5,1,1,2,2,5,1,1,1,1,1,2,4,2,3,1,2,1,5,4,5,1,4

2021/day6/input.txt.sample

@@ -1 +0,0 @@
-3,4,3,1,2