Vinicius garcia e venancio mota

dojorio · Mar 4, 2020 · 0ab26c3 · 0ab26c3
1 parent cc6275b
commit 0ab26c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/2020/20200304 - miojo - python/dojo.log b/2020/20200304 - miojo - python/dojo.log
@@ -7,3 +7,4 @@ Qua Mar 4 20:35:39 BRT 2020 - venancio mota e Otavio Cardoso
 Qua Mar 4 20:41:08 BRT 2020 - Vinicius garcia e venancio mota
 Qua Mar 4 20:47:15 BRT 2020 - Otavio Cardoso e Vinicius garcia
 Qua Mar 4 20:52:43 BRT 2020 - venancio mota e Otavio Cardoso
+Qua Mar 4 20:58:05 BRT 2020 - Vinicius garcia e venancio mota
diff --git a/2020/20200304 - miojo - python/problem.py b/2020/20200304 - miojo - python/problem.py
@@ -11,9 +11,15 @@ def miojo(temp_1, temp_2):
 	if temp_1 > temp_2:
 		return temp_1
 
+	if temp_1 < temp_2:
+		return temp_2	
+
 	if temp_1 == 6:
 		return 9
 
+	if temp_1 == 4:
+		return 7
+
 	if temp_1 == 5:
 		if temp_2 == 7:
 			return 10

diff --git a/2020/20200304 - miojo - python/test_problem.py b/2020/20200304 - miojo - python/test_problem.py
@@ -48,6 +48,10 @@ def test_5_8(self):
     def test_6_9(self):
         self.assertEqual(miojo(6,9), 9)
 
+    def test_4_7(self):
+        self.assertEqual(miojo(4,7), 7)
+
+
 if __name__ == "__main__":
     unittest.main()