Update 2015 solutions

2015/d2.py

@@ -1,19 +1,17 @@
-from lib import *
+from lib import get_data, ints
 
-data = open(0).readlines()
-
-part_1 = True
-if part_1:
-    a = 0
-    for line in data:
-        l, w, h = list(map(int, line.split("x")))
-        slack = min([l * w, w * h, h * l])
-        a +=  (2*l*w + 2*w*h + 2*h*l + slack)
-else: 
-    a = 0
-    for line in data:
-        l, w, h = list(map(int, line.split("x")))
-        sd = min([2 * (l + w), 2 * (w + h), 2 * (h + l)])
-        a +=  sd + (l * w * h)
+data = get_data(__file__)
 
+a = 0
+for line in data.splitlines():
+    l, w, h = ints(line)
+    slack = min([l * w, w * h, h * l])
+    a += 2 * l * w + 2 * w * h + 2 * h * l + slack
+print(a)
+
+a = 0
+for line in data.splitlines():
+    l, w, h = ints(line)
+    sd = min([2 * (l + w), 2 * (w + h), 2 * (h + l)])
+    a += sd + (l * w * h)
 print(a)