Otavio Cardoso e Vinicius garcia

dojorio · Mar 4, 2020 · 0565a6f · 0565a6f
1 parent 2d80634
commit 0565a6f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/2020/20200304 - miojo - python/dojo.log b/2020/20200304 - miojo - python/dojo.log
@@ -2,3 +2,4 @@ Qua Mar 4 20:06:49 BRT 2020 - Vinicius Garcia e venancio mota
 Qua Mar 4 20:12:07 BRT 2020 - Otavio Cardoso e Vinicius Garcia
 Qua Mar 4 20:17:37 BRT 2020 - venancio mota e Otavio Cardoso
 Qua Mar 4 20:24:37 BRT 2020 - Vinicius garcia e venancio mota
+Qua Mar 4 20:29:56 BRT 2020 - Otavio Cardoso e Vinicius garcia
diff --git a/2020/20200304 - miojo - python/problem.py b/2020/20200304 - miojo - python/problem.py
@@ -5,14 +5,17 @@ def miojo(temp_1, temp_2):
 
 	if temp_1 % 2 == 0 and temp_2 % 2 == 0:
 		return 'ampulhetas inválidas'
-
+	if temp_1 == 5:
+		return 5
 	if temp_1 == 2:
 		if temp_2 == 5:
 			return 5
 		if temp_2 == 7:
 			return 7
 		if temp_2 == 9:
 			return 9
+		if temp_2 == 11:
+			return 11	
 		return 5
 
 

diff --git a/2020/20200304 - miojo - python/test_problem.py b/2020/20200304 - miojo - python/test_problem.py
@@ -27,8 +27,12 @@ def test_2_6(self):
     def test_6_4(self):
         self.assertEqual(miojo(6,4), 'ampulhetas inválidas')
 
-    def test_8_10(self):
-        self.assertEqual(miojo(8,10), 'ampulhetas inválidas')    
+    def test_5_2(self):
+        self.assertEqual(miojo(5,2), 5)
+
+    def test_2_11(self):
+        self.assertEqual(miojo(2,11), 11)            
+
 
 if __name__ == "__main__":
     unittest.main()