diff options
| author | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
|---|---|---|
| committer | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
| commit | 0a88716110994f789f764704a96791fdfb5fa288 (patch) | |
| tree | 788c16ab578cf76eda358abc1d0587503d413a87 /python/problems/while_and_if/minimax | |
| parent | 1a7678b37a25a76aeaef7ebb225f85406b19f928 (diff) | |
| parent | 5a01c2bb184152c6ccc3c536e9b857d247bc55ad (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems
Conflicts:
robot/problems/introduction/forward/en.py
robot/problems/introduction/forward/sl.py
Diffstat (limited to 'python/problems/while_and_if/minimax')
| -rw-r--r-- | python/problems/while_and_if/minimax/common.py | 3 | ||||
| -rw-r--r-- | python/problems/while_and_if/minimax/en.py | 1 | ||||
| -rw-r--r-- | python/problems/while_and_if/minimax/sl.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/python/problems/while_and_if/minimax/common.py b/python/problems/while_and_if/minimax/common.py index 71632b7..d853058 100644 --- a/python/problems/while_and_if/minimax/common.py +++ b/python/problems/while_and_if/minimax/common.py @@ -5,7 +5,6 @@ from python.util import has_token_sequence, string_almost_equal, \ from server.hints import Hint id = 199 -group = 'while_and_if' number = 4 visible = True @@ -60,7 +59,7 @@ def test(python, code): n_correct = 0 tin = None for i, (output, correct) in enumerate(zip(outputs, test_out)): - if all(string_almost_equal(output, correct[i]) for i in range(4)): + if all(string_almost_equal(output, correct[i], prec=2) for i in range(4)): n_correct += 1 else: tin = test_in[i][1] diff --git a/python/problems/while_and_if/minimax/en.py b/python/problems/while_and_if/minimax/en.py index 10689ec..2aee417 100644 --- a/python/problems/while_and_if/minimax/en.py +++ b/python/problems/while_and_if/minimax/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 200 name = 'Minimax' slug = 'Minimax' diff --git a/python/problems/while_and_if/minimax/sl.py b/python/problems/while_and_if/minimax/sl.py index a76bd2e..0d934b8 100644 --- a/python/problems/while_and_if/minimax/sl.py +++ b/python/problems/while_and_if/minimax/sl.py @@ -2,7 +2,6 @@ import server mod = server.problems.load_language('python', 'sl') -id = 199 name = 'Blagajna "minimax"' slug = 'Blagajna "minimax"' @@ -22,7 +21,7 @@ Najvišja cena: 4 ''' main_plan = ['''\ -<p><b>Plan:</b></p> +<p>Plan:</p> <pre> 1. Ponavljaj dokler je cena večja od 0: 2. Preberi ceno. |