3 files changed, 2004 insertions, 206 deletions
diff --git a/day1/__init__.py b/day1/__init__.py
index cf48f78..bc44089 100644
--- a/day1/__init__.py
+++ b/day1/__init__.py
@@ -8,29 +8,23 @@ class Assignment(BaseAssignment):
        return int(item)
    def read_input(self, example = False) -> List[int]:
-        return sorted(super().read_input(example))
+        return list(super().read_input(example))
 class AssignmentOne(Assignment):
    def run(self, input: List) -> int:
-        front_position = 0
+        result = 0
-        end_position = -1
-        while True:
+        for i in range(1, len(input)):
-            sum = input[front_position] + input[end_position]
+            result += 1 if input[i - 1] < input[i] else 0
-            if sum > 2020:
+        return result
-                end_position -= 1
-            elif sum < 2020:
-                front_position += 1
-            else:
-                break
-        return input[front_position] * input[end_position]
 class AssignmentTwo(Assignment):
    def run(self, input: List) -> int:
-        for a in input:
+        new_input = [
-            for b in input:
+            input[i - 2] + input[i - 1] + input[i]
-                for c in input:
+            for i in range(2, len(input))
-                    if a + b + c == 2020:
+        ]
-                        return a * b * c
-\ No newline at end of file
+        return AssignmentOne(path='').run(new_input)
diff --git a/day1/example.txt b/day1/example.txt
index 0bb977d..59dad67 100644
--- a/day1/example.txt
+++ b/day1/example.txt
@@ -1,6 +1,10 @@
-1721
+199
-979
+200
-366
+208
-299
+210
-675
+200
-1456
-\ No newline at end of file
+207
+240
+269
+260
+263
+\ No newline at end of file
diff --git a/day1/input.txt b/day1/input.txt
index 0546883..523d802 100644
--- a/day1/input.txt
+++ b/day1/input.txt
@@ -1,200 +1,2000 @@
-1511
+171
-1344
+173
-1925
+174
-1970
+163
-1864
+161
-1951
+157
-1557
+156
-1984
+154
-1743
+152
-1526
+156
-1972
+151
-1945
+153
-1969
+132
-1760
+135
-2008
+151
-1592
+143
-736
+141
-1963
+149
-1994
+145
-2009
+147
-1777
+142
-1856
+143
-1899
+139
-1926
+141
-1850
+144
+147
+137
+144
+147
+153
+151
+153
+157
+185
+186
+185
+181
+161
+177
+179
+177
+178
+173
+175
+183
+181
+191
+189
+186
+189
+192
+191
+189
+199
+208
+218
+216
+210
+209
+208
+215
+207
+198
+202
+204
+205
+204
+203
+205
+207
+208
+209
+218
+234
+231
+245
+244
+243
+265
+264
+279
+282
+283
+274
+276
+279
+281
+279
+258
+256
+289
+297
+300
+304
+308
+298
+302
+317
+316
+315
+314
+296
+298
+301
+298
+293
+300
+293
+290
+286
+282
+278
+280
+283
+292
+297
+315
+323
+324
+321
+324
+332
+334
+366
+375
+382
+388
+395
+400
+410
+405
+407
+408
+405
+403
+426
+425
+423
+440
+444
+469
+471
+472
+498
+501
+498
+499
+500
+502
+514
+515
+516
+518
+517
+516
+507
+514
+521
+523
+521
+513
+518
+531
+543
+546
+540
+528
+529
+520
+530
+533
+534
+532
+535
+538
+545
+550
+548
+534
+552
+555
+570
+571
+589
+595

diff --git a/day1/__init__.py b/day1/__init__.py index cf48f78..bc44089 100644 --- a/day1/__init__.py +++ b/day1/__init__.py
@@ -8,29 +8,23 @@ class Assignment(BaseAssignment):
8	return int(item)	8	return int(item)
9		9
10	def read_input(self, example = False) -> List[int]:	10	def read_input(self, example = False) -> List[int]:
11	return sorted(super().read_input(example))	11	return list(super().read_input(example))
12		12
13	class AssignmentOne(Assignment):	13	class AssignmentOne(Assignment):
14	def run(self, input: List) -> int:	14	def run(self, input: List) -> int:
15	front_position = 0	15	result = 0
16	end_position = -1
17		16
18	while True:	17	for i in range(1, len(input)):
19	sum = input[front_position] + input[end_position]	18	result += 1 if input[i - 1] < input[i] else 0
20		19
21	if sum > 2020:	20	return result
22	end_position -= 1
23	elif sum < 2020:
24	front_position += 1
25	else:
26	break
27		21
28	return input[front_position] * input[end_position]
29		22
30	class AssignmentTwo(Assignment):	23	class AssignmentTwo(Assignment):
31	def run(self, input: List) -> int:	24	def run(self, input: List) -> int:
32	for a in input:	25	new_input = [
33	for b in input:	26	input[i - 2] + input[i - 1] + input[i]
34	for c in input:	27	for i in range(2, len(input))
35	if a + b + c == 2020:	28	]
36	return a * b * c \ No newline at end of file	29
		30	return AssignmentOne(path='').run(new_input)


diff --git a/day1/example.txt b/day1/example.txt index 0bb977d..59dad67 100644 --- a/day1/example.txt +++ b/day1/example.txt
@@ -1,6 +1,10 @@
1	1721	1	199
2	979	2	200
3	366	3	208
4	299	4	210
5	675	5	200
6	1456 \ No newline at end of file	6	207
		7	240
		8	269
		9	260
		10	263 \ No newline at end of file


diff --git a/day1/input.txt b/day1/input.txt index 0546883..523d802 100644 --- a/day1/input.txt +++ b/day1/input.txt
@@ -1,200 +1,2000 @@
1	1511	1	171
2	1344	2	173
3	1925	3	174
4	1970	4	163
5	1864	5	161
6	1951	6	157
7	1557	7	156
8	1984	8	154
9	1743	9	152
10	1526	10	156
11	1972	11	151
12	1945	12	153
13	1969	13	132
14	1760	14	135
15	2008	15	151
16	1592	16	143
17	736	17	141
18	1963	18	149
19	1994	19	145
20	2009	20	147
21	1777	21	142
22	1856	22	143
23	1899	23	139
24	1926	24	141
25	1850	25	144
		26	147
		27	137
		28	144
		29	147
		30	153
		31	151
		32	153
		33	157
		34	185
		35	186
		36	185
		37	181
		38	161
		39	177
		40	179
		41	177
		42	178
		43	173
		44	175
		45	183
		46	181
		47	191
		48	189
		49	186
		50	189
		51	192
		52	191
		53	189
		54	199
		55	208
		56	218
		57	216
		58	210
		59	209
		60	208
		61	215
		62	207
		63	198
		64	202
		65	204
		66	205
		67	204
		68	203
		69	205
		70	207
		71	208
		72	209
		73	218
		74	234
		75	231
		76	245
		77	244
		78	243
		79	265
		80	264
		81	279
		82	282
		83	283
		84	274
		85	276
		86	279
		87	281
		88	279
		89	258
		90	256
		91	289
		92	297
		93	300
		94	304
		95	308
		96	298
		97	302
		98	317
		99	316
		100	315
		101	314
		102	296
		103	298
		104	301
		105	298
		106	293
		107	300
		108	293
		109	290
		110	286
		111	282
		112	278
		113	280
		114	283
		115	292
		116	297
		117	315
		118	323
		119	324
		120	321
		121	324
		122	332
		123	334
		124	366
		125	375
		126	382
		127	388
		128	395
		129	400
		130	410
		131	405
		132	407
		133	408
		134	405
		135	403
		136	426
		137	425
		138	423
		139	440
		140	444
		141	469
		142	471
		143	472
		144	498
		145	501
		146	498
		147	499
		148	500
		149	502
		150	514
		151	515
		152	516
		153	518
		154	517
		155	516
		156	507
		157	514
		158	521
		159	523
		160	521
		161	513
		162	518
		163	531
		164	543
		165	546
		166	540
		167	528
		168	529
		169	520
		170	530
		171	533
		172	534
		173	532
		174	535
		175	538
		176	545
		177	550
		178	548
		179	534
		180	552
		181	555
		182	570
		183	571
		184	589
		185	595