From e36a8a2feca7552d236c0f6e89ac73e7e690e7b1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 12 Jan 2016 13:14:49 +0100 Subject: Return number of passed/total tests from Prolog test functions --- prolog/problems/clp_fd/gcd_3/common.py | 3 +-- prolog/problems/clp_fd/magic_1/common.py | 3 +-- prolog/problems/clp_fd/puzzle_abc_3/common.py | 3 +-- prolog/problems/clp_fd/puzzle_beth_1/common.py | 3 +-- prolog/problems/clp_fd/puzzle_momson_2/common.py | 3 +-- prolog/problems/clp_fd/puzzle_ratio_2/common.py | 3 +-- prolog/problems/clp_fd/tobase_3/common.py | 3 +-- prolog/problems/family_relations/ancestor_2/common.py | 3 +-- prolog/problems/family_relations/aunt_2/common.py | 3 +-- prolog/problems/family_relations/brother_2/common.py | 3 +-- prolog/problems/family_relations/connected_3/common.py | 3 +-- prolog/problems/family_relations/cousin_2/common.py | 3 +-- prolog/problems/family_relations/descendant_2/common.py | 3 +-- prolog/problems/family_relations/father_2/common.py | 3 +-- prolog/problems/family_relations/grandparent_2/common.py | 3 +-- prolog/problems/family_relations/mother_2/common.py | 3 +-- prolog/problems/family_relations/sister_2/common.py | 3 +-- prolog/problems/license_plates/checklicenseplate_3/common.py | 3 +-- prolog/problems/license_plates/firstminus_2/common.py | 3 +-- prolog/problems/license_plates/genexp_2/common.py | 3 +-- prolog/problems/license_plates/getdigits_2/common.py | 3 +-- prolog/problems/license_plates/joindigits_2/common.py | 3 +-- prolog/problems/lists/conc_3/common.py | 3 +-- prolog/problems/lists/count_3/common.py | 3 +-- prolog/problems/lists/del_3/common.py | 3 +-- prolog/problems/lists/divide_3/common.py | 3 +-- prolog/problems/lists/dup_2/common.py | 3 +-- prolog/problems/lists/evenlen_1_+_oddlen_1/common.py | 3 +-- prolog/problems/lists/insert_3/common.py | 3 +-- prolog/problems/lists/len_2/common.py | 3 +-- prolog/problems/lists/max_2/common.py | 3 +-- prolog/problems/lists/memb_2/common.py | 3 +-- prolog/problems/lists/min_2/common.py | 3 +-- prolog/problems/lists/palindrome_1/common.py | 3 +-- prolog/problems/lists/permute_2/common.py | 3 +-- prolog/problems/lists/rev_2/common.py | 3 +-- prolog/problems/lists/shiftleft_2/common.py | 3 +-- prolog/problems/lists/shiftright_2/common.py | 3 +-- prolog/problems/lists/sublist_2/common.py | 3 +-- prolog/problems/lists/sum_2/common.py | 3 +-- prolog/problems/sets/diff_3/common.py | 3 +-- prolog/problems/sets/intersect_3/common.py | 3 +-- prolog/problems/sets/is_subset_2/common.py | 3 +-- prolog/problems/sets/is_superset_2/common.py | 3 +-- prolog/problems/sets/powerset_2/common.py | 3 +-- prolog/problems/sets/subset_2/common.py | 3 +-- prolog/problems/sets/union_3/common.py | 3 +-- prolog/problems/sorting/is_sorted_1/common.py | 3 +-- prolog/problems/sorting/isort_2/common.py | 3 +-- prolog/problems/sorting/pivoting_4/common.py | 3 +-- prolog/problems/sorting/quick_sort_2/common.py | 3 +-- prolog/problems/sorting/sins_3/common.py | 3 +-- prolog/problems/sorting/slowest_sort_ever_2/common.py | 3 +-- 53 files changed, 53 insertions(+), 106 deletions(-) (limited to 'prolog/problems') diff --git a/prolog/problems/clp_fd/gcd_3/common.py b/prolog/problems/clp_fd/gcd_3/common.py index 5be46be..234b126 100644 --- a/prolog/problems/clp_fd/gcd_3/common.py +++ b/prolog/problems/clp_fd/gcd_3/common.py @@ -49,9 +49,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/magic_1/common.py b/prolog/problems/clp_fd/magic_1/common.py index e69d5ea..07adf7a 100644 --- a/prolog/problems/clp_fd/magic_1/common.py +++ b/prolog/problems/clp_fd/magic_1/common.py @@ -47,9 +47,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/puzzle_abc_3/common.py b/prolog/problems/clp_fd/puzzle_abc_3/common.py index 6373d6a..9ad6d1b 100644 --- a/prolog/problems/clp_fd/puzzle_abc_3/common.py +++ b/prolog/problems/clp_fd/puzzle_abc_3/common.py @@ -39,9 +39,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/puzzle_beth_1/common.py b/prolog/problems/clp_fd/puzzle_beth_1/common.py index 9bc1066..99f0445 100644 --- a/prolog/problems/clp_fd/puzzle_beth_1/common.py +++ b/prolog/problems/clp_fd/puzzle_beth_1/common.py @@ -34,9 +34,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/puzzle_momson_2/common.py b/prolog/problems/clp_fd/puzzle_momson_2/common.py index c77e41d..3074d44 100644 --- a/prolog/problems/clp_fd/puzzle_momson_2/common.py +++ b/prolog/problems/clp_fd/puzzle_momson_2/common.py @@ -41,9 +41,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/puzzle_ratio_2/common.py b/prolog/problems/clp_fd/puzzle_ratio_2/common.py index 6a7e676..fc2d678 100644 --- a/prolog/problems/clp_fd/puzzle_ratio_2/common.py +++ b/prolog/problems/clp_fd/puzzle_ratio_2/common.py @@ -42,9 +42,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/clp_fd/tobase_3/common.py b/prolog/problems/clp_fd/tobase_3/common.py index 99ccda5..ce137a4 100644 --- a/prolog/problems/clp_fd/tobase_3/common.py +++ b/prolog/problems/clp_fd/tobase_3/common.py @@ -50,9 +50,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/family_relations/ancestor_2/common.py b/prolog/problems/family_relations/ancestor_2/common.py index 1a79f80..1ad1d4f 100644 --- a/prolog/problems/family_relations/ancestor_2/common.py +++ b/prolog/problems/family_relations/ancestor_2/common.py @@ -54,9 +54,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/aunt_2/common.py b/prolog/problems/family_relations/aunt_2/common.py index 058f6f7..6ad8b05 100644 --- a/prolog/problems/family_relations/aunt_2/common.py +++ b/prolog/problems/family_relations/aunt_2/common.py @@ -58,9 +58,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/brother_2/common.py b/prolog/problems/family_relations/brother_2/common.py index 876e3bc..c8ceb75 100644 --- a/prolog/problems/family_relations/brother_2/common.py +++ b/prolog/problems/family_relations/brother_2/common.py @@ -52,9 +52,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/connected_3/common.py b/prolog/problems/family_relations/connected_3/common.py index 31d0d12..eee1df5 100644 --- a/prolog/problems/family_relations/connected_3/common.py +++ b/prolog/problems/family_relations/connected_3/common.py @@ -43,6 +43,5 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints diff --git a/prolog/problems/family_relations/cousin_2/common.py b/prolog/problems/family_relations/cousin_2/common.py index eb75ca4..e53ef99 100644 --- a/prolog/problems/family_relations/cousin_2/common.py +++ b/prolog/problems/family_relations/cousin_2/common.py @@ -65,9 +65,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/descendant_2/common.py b/prolog/problems/family_relations/descendant_2/common.py index 3c2af16..eae7c42 100644 --- a/prolog/problems/family_relations/descendant_2/common.py +++ b/prolog/problems/family_relations/descendant_2/common.py @@ -54,9 +54,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/father_2/common.py b/prolog/problems/family_relations/father_2/common.py index 40a0f1a..363eaa2 100644 --- a/prolog/problems/family_relations/father_2/common.py +++ b/prolog/problems/family_relations/father_2/common.py @@ -55,9 +55,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/grandparent_2/common.py b/prolog/problems/family_relations/grandparent_2/common.py index eaae7a5..3d187d9 100644 --- a/prolog/problems/family_relations/grandparent_2/common.py +++ b/prolog/problems/family_relations/grandparent_2/common.py @@ -56,9 +56,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/mother_2/common.py b/prolog/problems/family_relations/mother_2/common.py index 95fd36a..cb8ddee 100644 --- a/prolog/problems/family_relations/mother_2/common.py +++ b/prolog/problems/family_relations/mother_2/common.py @@ -56,9 +56,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): tokens = prolog.util.tokenize(code) diff --git a/prolog/problems/family_relations/sister_2/common.py b/prolog/problems/family_relations/sister_2/common.py index a6dff43..0466a3d 100644 --- a/prolog/problems/family_relations/sister_2/common.py +++ b/prolog/problems/family_relations/sister_2/common.py @@ -53,9 +53,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # how do I know which general hints were already shown? diff --git a/prolog/problems/license_plates/checklicenseplate_3/common.py b/prolog/problems/license_plates/checklicenseplate_3/common.py index 12ac133..06ce47c 100644 --- a/prolog/problems/license_plates/checklicenseplate_3/common.py +++ b/prolog/problems/license_plates/checklicenseplate_3/common.py @@ -85,9 +85,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/license_plates/firstminus_2/common.py b/prolog/problems/license_plates/firstminus_2/common.py index d8664a3..2e3d69d 100644 --- a/prolog/problems/license_plates/firstminus_2/common.py +++ b/prolog/problems/license_plates/firstminus_2/common.py @@ -36,9 +36,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/license_plates/genexp_2/common.py b/prolog/problems/license_plates/genexp_2/common.py index 25795b4..acee0ff 100644 --- a/prolog/problems/license_plates/genexp_2/common.py +++ b/prolog/problems/license_plates/genexp_2/common.py @@ -57,9 +57,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/license_plates/getdigits_2/common.py b/prolog/problems/license_plates/getdigits_2/common.py index 17b3556..ef9e83d 100644 --- a/prolog/problems/license_plates/getdigits_2/common.py +++ b/prolog/problems/license_plates/getdigits_2/common.py @@ -41,9 +41,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/license_plates/joindigits_2/common.py b/prolog/problems/license_plates/joindigits_2/common.py index b2429ef..6ff57bf 100644 --- a/prolog/problems/license_plates/joindigits_2/common.py +++ b/prolog/problems/license_plates/joindigits_2/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/conc_3/common.py b/prolog/problems/lists/conc_3/common.py index 81b9915..7ee44b5 100644 --- a/prolog/problems/lists/conc_3/common.py +++ b/prolog/problems/lists/conc_3/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/count_3/common.py b/prolog/problems/lists/count_3/common.py index 2177e25..d260b05 100644 --- a/prolog/problems/lists/count_3/common.py +++ b/prolog/problems/lists/count_3/common.py @@ -44,9 +44,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/del_3/common.py b/prolog/problems/lists/del_3/common.py index 0bce133..5be6599 100644 --- a/prolog/problems/lists/del_3/common.py +++ b/prolog/problems/lists/del_3/common.py @@ -38,9 +38,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/divide_3/common.py b/prolog/problems/lists/divide_3/common.py index 10873cc..b522254 100644 --- a/prolog/problems/lists/divide_3/common.py +++ b/prolog/problems/lists/divide_3/common.py @@ -43,9 +43,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/dup_2/common.py b/prolog/problems/lists/dup_2/common.py index fb97531..36e31f8 100644 --- a/prolog/problems/lists/dup_2/common.py +++ b/prolog/problems/lists/dup_2/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py b/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py index 9f64c62..ea86b40 100644 --- a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py +++ b/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py @@ -46,9 +46,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/insert_3/common.py b/prolog/problems/lists/insert_3/common.py index a380280..ac8437b 100644 --- a/prolog/problems/lists/insert_3/common.py +++ b/prolog/problems/lists/insert_3/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/len_2/common.py b/prolog/problems/lists/len_2/common.py index 5ef52d1..2c4fea8 100644 --- a/prolog/problems/lists/len_2/common.py +++ b/prolog/problems/lists/len_2/common.py @@ -39,9 +39,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/max_2/common.py b/prolog/problems/lists/max_2/common.py index e06558b..1f6969b 100644 --- a/prolog/problems/lists/max_2/common.py +++ b/prolog/problems/lists/max_2/common.py @@ -43,9 +43,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/memb_2/common.py b/prolog/problems/lists/memb_2/common.py index aa3ed32..fea670b 100644 --- a/prolog/problems/lists/memb_2/common.py +++ b/prolog/problems/lists/memb_2/common.py @@ -36,9 +36,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/min_2/common.py b/prolog/problems/lists/min_2/common.py index 6c9a72c..4ab3e65 100644 --- a/prolog/problems/lists/min_2/common.py +++ b/prolog/problems/lists/min_2/common.py @@ -43,9 +43,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/palindrome_1/common.py b/prolog/problems/lists/palindrome_1/common.py index c9097a7..cf1a15b 100644 --- a/prolog/problems/lists/palindrome_1/common.py +++ b/prolog/problems/lists/palindrome_1/common.py @@ -44,9 +44,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/permute_2/common.py b/prolog/problems/lists/permute_2/common.py index 1102cd8..1c16bd9 100644 --- a/prolog/problems/lists/permute_2/common.py +++ b/prolog/problems/lists/permute_2/common.py @@ -42,9 +42,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/rev_2/common.py b/prolog/problems/lists/rev_2/common.py index acb4342..b8dbbe3 100644 --- a/prolog/problems/lists/rev_2/common.py +++ b/prolog/problems/lists/rev_2/common.py @@ -42,9 +42,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/shiftleft_2/common.py b/prolog/problems/lists/shiftleft_2/common.py index 0fbc0b3..9973e52 100644 --- a/prolog/problems/lists/shiftleft_2/common.py +++ b/prolog/problems/lists/shiftleft_2/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/shiftright_2/common.py b/prolog/problems/lists/shiftright_2/common.py index a9170ff..09c4067 100644 --- a/prolog/problems/lists/shiftright_2/common.py +++ b/prolog/problems/lists/shiftright_2/common.py @@ -40,9 +40,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/sublist_2/common.py b/prolog/problems/lists/sublist_2/common.py index 7b6ea64..b5f6b89 100644 --- a/prolog/problems/lists/sublist_2/common.py +++ b/prolog/problems/lists/sublist_2/common.py @@ -43,9 +43,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/lists/sum_2/common.py b/prolog/problems/lists/sum_2/common.py index 3f5ff8c..026533f 100644 --- a/prolog/problems/lists/sum_2/common.py +++ b/prolog/problems/lists/sum_2/common.py @@ -39,9 +39,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/diff_3/common.py b/prolog/problems/sets/diff_3/common.py index 20b03a5..dbb80b4 100644 --- a/prolog/problems/sets/diff_3/common.py +++ b/prolog/problems/sets/diff_3/common.py @@ -52,9 +52,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/intersect_3/common.py b/prolog/problems/sets/intersect_3/common.py index fa3ca0e..4bb9069 100644 --- a/prolog/problems/sets/intersect_3/common.py +++ b/prolog/problems/sets/intersect_3/common.py @@ -51,9 +51,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/is_subset_2/common.py b/prolog/problems/sets/is_subset_2/common.py index f66f3fa..9e21584 100644 --- a/prolog/problems/sets/is_subset_2/common.py +++ b/prolog/problems/sets/is_subset_2/common.py @@ -45,9 +45,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/is_superset_2/common.py b/prolog/problems/sets/is_superset_2/common.py index 4b292a1..48c64a4 100644 --- a/prolog/problems/sets/is_superset_2/common.py +++ b/prolog/problems/sets/is_superset_2/common.py @@ -45,9 +45,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/powerset_2/common.py b/prolog/problems/sets/powerset_2/common.py index 02e8a3c..6208c0f 100644 --- a/prolog/problems/sets/powerset_2/common.py +++ b/prolog/problems/sets/powerset_2/common.py @@ -43,9 +43,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/subset_2/common.py b/prolog/problems/sets/subset_2/common.py index 51070dc..6f2fafb 100644 --- a/prolog/problems/sets/subset_2/common.py +++ b/prolog/problems/sets/subset_2/common.py @@ -56,9 +56,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sets/union_3/common.py b/prolog/problems/sets/union_3/common.py index f8410a2..8df6b53 100644 --- a/prolog/problems/sets/union_3/common.py +++ b/prolog/problems/sets/union_3/common.py @@ -48,9 +48,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/is_sorted_1/common.py b/prolog/problems/sorting/is_sorted_1/common.py index 7f4dc54..b4ae92d 100644 --- a/prolog/problems/sorting/is_sorted_1/common.py +++ b/prolog/problems/sorting/is_sorted_1/common.py @@ -48,9 +48,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/isort_2/common.py b/prolog/problems/sorting/isort_2/common.py index 9e77d8b..5acd971 100644 --- a/prolog/problems/sorting/isort_2/common.py +++ b/prolog/problems/sorting/isort_2/common.py @@ -47,9 +47,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/pivoting_4/common.py b/prolog/problems/sorting/pivoting_4/common.py index 995f759..92403c3 100644 --- a/prolog/problems/sorting/pivoting_4/common.py +++ b/prolog/problems/sorting/pivoting_4/common.py @@ -44,9 +44,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/quick_sort_2/common.py b/prolog/problems/sorting/quick_sort_2/common.py index e2ba63d..94677de 100644 --- a/prolog/problems/sorting/quick_sort_2/common.py +++ b/prolog/problems/sorting/quick_sort_2/common.py @@ -53,9 +53,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/sins_3/common.py b/prolog/problems/sorting/sins_3/common.py index 87e8c5d..b466743 100644 --- a/prolog/problems/sorting/sins_3/common.py +++ b/prolog/problems/sorting/sins_3/common.py @@ -45,9 +45,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO diff --git a/prolog/problems/sorting/slowest_sort_ever_2/common.py b/prolog/problems/sorting/slowest_sort_ever_2/common.py index b291a26..93367bb 100644 --- a/prolog/problems/sorting/slowest_sort_ever_2/common.py +++ b/prolog/problems/sorting/slowest_sort_ever_2/common.py @@ -54,9 +54,8 @@ def test(code, aux_code): if engine_id: prolog.engine.destroy(engine_id) - passed = n_correct == len(test_cases) hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}] - return passed, hints + return n_correct, len(test_cases), hints def hint(code, aux_code): # TODO -- cgit v1.2.1