triangle, iteration

amosio · amosio · commit 6360ee390969 · 2020-08-11T19:47:52.000+02:00
diff --git a/python3/koans/about_iteration.py b/python3/koans/about_iteration.py
@@ -13,20 +13,20 @@ def test_iterators_are_a_type(self):
         for num in it:
             total += num
 
-        self.assertEqual(__ , total)
+        self.assertEqual(15 , total)
 
     def test_iterating_with_next(self):
         stages = iter(['alpha','beta','gamma'])
 
         try:
-            self.assertEqual(__, next(stages))
+            self.assertEqual('alpha', next(stages))
             next(stages)
-            self.assertEqual(__, next(stages))
+            self.assertEqual('gamma', next(stages))
             next(stages)
         except StopIteration as ex:
             err_msg = 'Ran out of iterations'
 
-        self.assertRegex(err_msg, __)
+        self.assertRegex(err_msg, "Ran out of iterations")
 
     # ------------------------------------------------------------------
 
@@ -40,14 +40,14 @@ def test_map_transforms_elements_of_a_list(self):
         mapping = map(self.add_ten, seq)
 
         self.assertNotEqual(list, mapping.__class__)
-        self.assertEqual(__, mapping.__class__)
+        self.assertEqual(map, mapping.__class__)
         # In Python 3 built in iterator funcs return iterable view objects
         # instead of lists
 
         for item in mapping:
             mapped_seq.append(item)
 
-        self.assertEqual(__, mapped_seq)
+        self.assertEqual([11,12,13], mapped_seq)
 
         # Note, iterator methods actually return objects of iter type in
         # python 3. In python 2 map() would give you a list.
@@ -62,7 +62,7 @@ def is_even(item):
         for item in filter(is_even, seq):
             even_numbers.append(item)
 
-        self.assertEqual(__, even_numbers)
+        self.assertEqual([2,4,6], even_numbers)
 
     def test_just_return_first_item_found(self):
         def is_big_name(item):
@@ -77,7 +77,7 @@ def is_big_name(item):
         except StopIteration:
             msg = 'Ran out of big names'
 
-        self.assertEqual(__, name)
+        self.assertEqual('Clarence', name)
 
 
     # ------------------------------------------------------------------
@@ -94,13 +94,13 @@ def test_reduce_will_blow_your_mind(self):
         # to the functools module.
 
         result = functools.reduce(self.add, [2, 3, 4])
-        self.assertEqual(__, result.__class__)
+        self.assertEqual(int, result.__class__)
         # Reduce() syntax is same as Python 2
 
-        self.assertEqual(__, result)
+        self.assertEqual(9, result)
 
         result2 = functools.reduce(self.multiply, [2, 3, 4], 1)
-        self.assertEqual(__, result2)
+        self.assertEqual(24, result2)
 
         # Extra Credit:
         # Describe in your own words what reduce does.
@@ -111,14 +111,14 @@ def test_use_pass_for_iterations_with_no_body(self):
         for num in range(1,5):
             pass
 
-        self.assertEqual(__, num)
+        self.assertEqual(4, num)
 
     # ------------------------------------------------------------------
 
     def test_all_iteration_methods_work_on_any_sequence_not_just_lists(self):
         # Ranges are an iterable sequence
         result = map(self.add_ten, range(1,4))
-        self.assertEqual(__, list(result))
+        self.assertEqual([11,12,13], list(result))
 
         try:
             file = open("example_file.txt")
@@ -127,7 +127,7 @@ def test_all_iteration_methods_work_on_any_sequence_not_just_lists(self):
                 def make_upcase(line):
                     return line.strip().upper()
                 upcase_lines = map(make_upcase, file.readlines())
-                self.assertEqual(__, list(upcase_lines))
+                self.assertEqual(['THIS', 'IS', 'A', 'TEST'], list(upcase_lines))
             finally:
                 # Arg, this is ugly.
                 # We will figure out how to fix this later.
diff --git a/python3/koans/triangle.py b/python3/koans/triangle.py
@@ -21,11 +21,17 @@ def is_positive(a):
         return False
     return True
 
+def is_triangle_possible(a,b,c):
+    if (a >= b + c) or (b >= a + c) or (c >= a + b):
+       	return False
+    return True
+
 
 def triangle(a, b, c):
-    # DELETE 'PASS' AND WRITE THIS CODE
     if (not is_positive(a) or not is_positive(b) or not is_positive(c)):
         raise TriangleError
+    if not is_triangle_possible(a, b, c):
+        raise TriangleError
     # if not is_positive(a):
     #     raise TriangleError
     # if not is_positive(b):
