diff options
6 files changed, 131 insertions, 110 deletions
diff --git a/prolog/problems/family_relations/brother_2/common.py b/prolog/problems/family_relations/brother_2/common.py index 48bc519..e725682 100644 --- a/prolog/problems/family_relations/brother_2/common.py +++ b/prolog/problems/family_relations/brother_2/common.py @@ -1,5 +1,6 @@ # coding=utf-8 +from operator import itemgetter import socket import prolog.engine import prolog.util @@ -28,15 +29,15 @@ hint_typs = { 'x_y_must_be_different': Hint('x_y_must_be_different'), } -def test(program, solved_problems): - # TODO: change queries and answers (these are for sister/2) - # Test queries and expected answers (values of X). - queries = [ - ('sister(melanie, X)', set(['andrew'])), - ('sister(X, andrew)', set(['melanie'])), - ('sister(X, _)', set(['michelle', 'daniela', 'patricia', 'luana', 'sally', 'melanie', 'nevia', 'vanessa', 'anna'])), - ] +test_cases = [ + ('brother(X, _)', + [{'X': 'alessandro'}, {'X': 'andrew'}, {'X': 'jeffrey'}, + {'X': 'kramer'}, {'X': 'michael'}, {'X': 'william'}]), + ('brother(andrew, X)', + [{'X': 'melanie'}]), +] +def test(program, solved_problems): code = (program + '\n' + server.problems.solutions_for_problems('prolog', solved_problems) + '\n' + server.problems.load_facts('prolog', facts).facts) @@ -44,21 +45,21 @@ def test(program, solved_problems): engine_id = None try: engine_id, output = prolog.engine.create(code=code, timeout=1.0) - if not engine_id: - return 0, len(queries) + if not engine_id or 'error' in map(itemgetter(0), output): + # Engine creation failed, or syntax error in code. + return 0, len(test_cases) n_correct = 0 - for query, solution in queries: - answers, error = prolog.engine.ask_all(engine_id, query=query, timeout=1.0) - if answers and answers[-1] != 'timed out': - values_x = set([ans.get('X') for ans, constraints in answers]) - if values_x == solution: - n_correct += 1 + for query, answers in test_cases: + # Limit inferences for each solution to curb unbounded recursion. + limited = 'call_with_inference_limit(({}), 100000, _)'.format(query) + if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0): + n_correct += 1 finally: if engine_id: prolog.engine.destroy(engine_id) - return n_correct, len(queries) + return n_correct, len(test_cases) def hint(program, solved_problems): # tokens = prolog.util.tokenize(program) diff --git a/prolog/problems/family_relations/father_2/common.py b/prolog/problems/family_relations/father_2/common.py index dd799e7..1816d56 100644 --- a/prolog/problems/family_relations/father_2/common.py +++ b/prolog/problems/family_relations/father_2/common.py @@ -1,5 +1,6 @@ # coding=utf-8 +from operator import itemgetter import socket import prolog.engine import prolog.util @@ -27,15 +28,11 @@ hint_type = { 'y_need_not_be_parent': Hint('y_need_not_be_parent'), } -def test(program, solved_problems): - # TODO: change queries and answers (these are for sister/2) - # Test queries and expected answers (values of X). - queries = [ - ('sister(melanie, X)', set(['andrew'])), - ('sister(X, andrew)', set(['melanie'])), - ('sister(X, _)', set(['michelle', 'daniela', 'patricia', 'luana', 'sally', 'melanie', 'nevia', 'vanessa', 'anna'])), - ] +test_cases = [ + # TODO +] +def test(program, solved_problems): code = (program + '\n' + server.problems.solutions_for_problems('prolog', solved_problems) + '\n' + server.problems.load_facts('prolog', facts).facts) @@ -43,21 +40,21 @@ def test(program, solved_problems): engine_id = None try: engine_id, output = prolog.engine.create(code=code, timeout=1.0) - if not engine_id: - return 0, len(queries) + if not engine_id or 'error' in map(itemgetter(0), output): + # Engine creation failed, or syntax error in code. + return 0, len(test_cases) n_correct = 0 - for query, solution in queries: - answers, error = prolog.engine.ask_all(engine_id, query=query, timeout=1.0) - if answers and answers[-1] != 'timed out': - values_x = set([ans.get('X') for ans, constraints in answers]) - if values_x == solution: - n_correct += 1 + for query, answers in test_cases: + # Limit inferences for each solution to curb unbounded recursion. + limited = 'call_with_inference_limit(({}), 100000, _)'.format(query) + if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0): + n_correct += 1 finally: if engine_id: prolog.engine.destroy(engine_id) - return n_correct, len(queries) + return n_correct, len(test_cases) def hint(program, solved_problems): tokens = prolog.util.tokenize(program) diff --git a/prolog/problems/family_relations/mother_2/common.py b/prolog/problems/family_relations/mother_2/common.py index 2b74f08..3a7e196 100644 --- a/prolog/problems/family_relations/mother_2/common.py +++ b/prolog/problems/family_relations/mother_2/common.py @@ -1,5 +1,6 @@ # coding=utf-8 +from operator import itemgetter import socket import prolog.engine import prolog.util @@ -27,15 +28,22 @@ hint_type = { 'y_need_not_be_parent': Hint('y_need_not_be_parent'), } -def test(program, solved_problems): - # TODO: change queries and answers (these are for sister/2) - # Test queries and expected answers (values of X). - queries = [ - ('sister(melanie, X)', set(['andrew'])), - ('sister(X, andrew)', set(['melanie'])), - ('sister(X, _)', set(['michelle', 'daniela', 'patricia', 'luana', 'sally', 'melanie', 'nevia', 'vanessa', 'anna'])), - ] +test_cases = [ + ('mother(X, _)', + [{'X': 'ana'}, {'X': 'elaine'}, {'X': 'estelle'}, {'X': 'helen'}, + {'X': 'jill'}, {'X': 'joanne'}, {'X': 'margaret'}, {'X': 'nevia'}, + {'X': 'patricia'}, {'X': 'sally'}, {'X': 'tina'}, {'X': 'vanessa'}]), + ('mother(_, X)', + [{'X': 'aleksander'}, {'X': 'alessandro'}, {'X': 'andrew'}, + {'X': 'anna'}, {'X': 'daniela'}, {'X': 'george'}, {'X': 'jerry'}, + {'X': 'joanne'}, {'X': 'john'}, {'X': 'kramer'}, {'X': 'luana'}, + {'X': 'melanie'}, {'X': 'nevia'}, {'X': 'steve'}, {'X': 'susan'}, + {'X': 'william'}]), + ('mother(joanne, X)', + [{'X': 'steve'}]), +] +def test(program, solved_problems): code = (program + '\n' + server.problems.solutions_for_problems('prolog', solved_problems) + '\n' + server.problems.load_facts('prolog', facts).facts) @@ -43,21 +51,21 @@ def test(program, solved_problems): engine_id = None try: engine_id, output = prolog.engine.create(code=code, timeout=1.0) - if not engine_id: - return 0, len(queries) + if not engine_id or 'error' in map(itemgetter(0), output): + # Engine creation failed, or syntax error in code. + return 0, len(test_cases) n_correct = 0 - for query, solution in queries: - answers, error = prolog.engine.ask_all(engine_id, query=query, timeout=1.0) - if answers and answers[-1] != 'timed out': - values_x = set([ans.get('X') for ans, constraints in answers]) - if values_x == solution: - n_correct += 1 + for query, answers in test_cases: + # Limit inferences for each solution to curb unbounded recursion. + limited = 'call_with_inference_limit(({}), 100000, _)'.format(query) + if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0): + n_correct += 1 finally: if engine_id: prolog.engine.destroy(engine_id) - return n_correct, len(queries) + return n_correct, len(test_cases) def hint(program, solved_problems): tokens = prolog.util.tokenize(program) diff --git a/prolog/problems/family_relations/sister_2/common.py b/prolog/problems/family_relations/sister_2/common.py index 9c63b18..a1375f2 100644 --- a/prolog/problems/family_relations/sister_2/common.py +++ b/prolog/problems/family_relations/sister_2/common.py @@ -1,5 +1,6 @@ # coding=utf-8 +from operator import itemgetter import socket import prolog.engine import prolog.util @@ -28,14 +29,18 @@ hint_type = { 'x_y_must_be_different': Hint('x_y_must_be_different'), } -def test(program, solved_problems): - # Test queries and expected answers (values of X). - queries = [ - ('sister(melanie, X)', set(['andrew'])), - ('sister(X, andrew)', set(['melanie'])), - ('sister(X, _)', set(['michelle', 'daniela', 'patricia', 'luana', 'sally', 'melanie', 'nevia', 'vanessa', 'anna'])), - ] +test_cases = [ + ('sister(X, _)', + [{'X': 'anna'}, {'X': 'daniela'}, {'X': 'luana'}, {'X': 'melanie'}, + {'X': 'michelle'}, {'X': 'nevia'}, {'X': 'patricia'}, {'X': 'sally'}, + {'X': 'vanessa'}]), + ('sister(melanie, X)', + [{'X': 'andrew'}]), + ('sister(X, andrew)', + [{'X': 'melanie'}]), +] +def test(program, solved_problems): code = (program + '\n' + server.problems.solutions_for_problems('prolog', solved_problems) + '\n' + server.problems.load_facts('prolog', facts).facts) @@ -43,21 +48,21 @@ def test(program, solved_problems): engine_id = None try: engine_id, output = prolog.engine.create(code=code, timeout=1.0) - if not engine_id: - return 0, len(queries) + if not engine_id or 'error' in map(itemgetter(0), output): + # Engine creation failed, or syntax error in code. + return 0, len(test_cases) n_correct = 0 - for query, solution in queries: - answers, error = prolog.engine.ask_all(engine_id, query=query, timeout=1.0) - if answers and answers[-1] != 'timed out': - values_x = set([ans.get('X') for ans, constraints in answers]) - if values_x == solution: - n_correct += 1 + for query, answers in test_cases: + # Limit inferences for each solution to curb unbounded recursion. + limited = 'call_with_inference_limit(({}), 100000, _)'.format(query) + if prolog.engine.check_answers(engine_id, query=limited, answers=answers, timeout=1.0): + n_correct += 1 finally: if engine_id: prolog.engine.destroy(engine_id) - return n_correct, len(queries) + return n_correct, len(test_cases) def hint(program, solved_problems): # how do I know which general hints were already shown? diff --git a/python/problems/introduction/fahrenheit_to_celsius/common.py b/python/problems/introduction/fahrenheit_to_celsius/common.py index 0bb6468..1ba0e15 100644 --- a/python/problems/introduction/fahrenheit_to_celsius/common.py +++ b/python/problems/introduction/fahrenheit_to_celsius/common.py @@ -19,9 +19,9 @@ hint_type = { 'no_input_call': Hint('no_input_call'), 'expressions_python': Hint('expressions_python'), 'printing': Hint('printing'), - 'name_error': HintSequence('name_error', 4), - 'unsupported_operand': HintSequence('unsupported_operand', 4), - 'not_callable': HintSequence('not_callable', 4), + 'name_error': Hint('name_error'), + 'unsupported_operand': Hint('unsupported_operand'), + 'not_callable': Hint('not_callable'), } def test(python, code): diff --git a/python/problems/introduction/fahrenheit_to_celsius/sl.py b/python/problems/introduction/fahrenheit_to_celsius/sl.py index 5cce6dc..d040adb 100644 --- a/python/problems/introduction/fahrenheit_to_celsius/sl.py +++ b/python/problems/introduction/fahrenheit_to_celsius/sl.py @@ -14,23 +14,22 @@ general_exception = { <p>Napaka:</p> <pre> [%=message%] -</pre> -''', +</pre>''', - 'general': ''' - <p>Pri razumevanju napake sta pomembni dve vrstici. V predzadnji vrstici je napisana lokacija - napake (line ...), v zadnji vrstici pa izvemo za kakšno napako gre.</p> - ''', + 'general': '''\ +<p>Pri razumevanju napake sta pomembni dve vrstici. V predzadnji vrstici je +napisana lokacija napake (line ...), v zadnji vrstici pa izvemo za kakšno +napako gre.</p>''', - 'name_error' : ''' - <p>Napaka <code>NameError</code> pomeni, da uporabljate nedefinirano vrednost: - ali vrednost spremenljivke ni določena ali uporabljate funkcijo, ki ni uvožena.</p> - ''', + 'name_error' : '''\ +<p>Napaka <code>NameError</code> pomeni, da uporabljate nedefinirano vrednost: +ali vrednost spremenljivke ni določena ali uporabljate funkcijo, ki ni +uvožena.</p>''', - 'type_error': ''' - <p>TypeError napaka pomeni, da želite izvesti operacijo na nedovoljenih tipih. - Npr., če želite sešteti niz in število ali klicati funkcijo, čeprav tisto ni funkcija, itd. .</p> - ''', + 'type_error': '''\ +<p>TypeError napaka pomeni, da želite izvesti operacijo na nedovoljenih tipih. +Npr., če želite sešteti niz in število ali klicati funkcijo, čeprav tisto ni +funkcija, itd.</p>''', } hint = { @@ -54,38 +53,46 @@ ime = input("Kako ti je ime?") <p>pokliče funkcijo <code>input</code>, ki povpraša uporabnika po imenu in si shrani uporabnikov odgovor v spremenljivko <code>ime</code>.</p>''', - - 'expressions_python': ''' -<p>Računanje: če v Pythonu napišemo izraz, se bo ta izračunal. Npr., če napišemo</p> + 'expressions_python': '''\ +<p>Računanje: če v Pythonu napišemo izraz, se bo ta izračunal. Npr., če +napišemo</p> <pre> 3 + 6 -<pre> -bo Python seštel vrednosti 3 in 6 in ... rezultat pozabil. Kadar pa želimo -rezultat shraniti, za to uporabimo <em>prireditveni stavek</em>, kjer na levo +</pre> +<p>bo Python seštel vrednosti 3 in 6 in ... rezultat pozabil. Kadar pa želimo +rezultat shraniti, za to uporabimo <em>prireditveni stavek</em>, kjer na levo napišemo ime spremenljivke, na desno pa izraz:</p> <pre> c = 2 * a * (3 + b) </pre> -<p>Kot vidite, izraz lahko uporablja tudi spremenljivke. </p>''', +<p>Kot vidite, izraz lahko uporablja tudi spremenljivke.</p>''', - 'printing': ''' -<p> V Pythonu izpisujemo s funkcijo <code>print</code>. Če želimo izpisati več elementov, -jih ločimo z vejico. Recimo, da imamo spremenljivko <code>ime</code>, -ki vsebuje naše ime, potem lahko napišemo: + 'printing': '''\ +<p>V Pythonu izpisujemo s funkcijo <code>print</code>. Če želimo izpisati več +elementov, jih ločimo z vejico. Recimo, da imamo spremenljivko +<code>ime</code>, ki vsebuje naše ime, potem lahko napišemo: <pre> print("Ime mi je", ime, ".") </pre>''', - 'name_error' : [general_exception['error_head'], general_exception['general'], - general_exception['name_error'], ''' - <p>Verjetno uporabljate spremenljivko, ki nima vrednosti. Ali v izrazu za izračun - uporabljate napačno spremenljivko? Ali pri izpisu morda poskušate - izpisati napačno spremenljivko?</p>'''], + 'name_error' : [ + general_exception['error_head'], + general_exception['general'], + general_exception['name_error'], + '''\ +<p>Verjetno uporabljate spremenljivko, ki nima vrednosti. Ali v izrazu za +izračun uporabljate napačno spremenljivko? Ali pri izpisu morda poskušate +izpisati napačno spremenljivko?</p>''' + ], - 'unsupported_operand' : [general_exception['error_head'], general_exception['general'], - general_exception['type_error'], ''' -<p>Verjetni razlog: funkcija <code>input</code> vrača vrednost tipa niz, -ki jo moramo najprej pretvoriti v tip <code>float</code>, če želimo z njo računati:</p> + 'unsupported_operand' : [ + general_exception['error_head'], + general_exception['general'], + general_exception['type_error'], + '''\ +<p>Verjetni razlog: funkcija <code>input</code> vrača vrednost tipa niz, ki jo +moramo najprej pretvoriti v tip <code>float</code>, če želimo z njo +računati:</p> <pre> v = float(input(" ... </pre> @@ -100,11 +107,14 @@ f = float(fniz) f = float(input("Temperatura [F]: ")) </pre> <p>Funkcijo <code>float</code> lahko kličemo le, če je v nizu zapisano število, -npr. "10". Če imamo v nizu tudi kakšno črko, bo Python javil napako.</p>'''], - +npr. "10". Če imamo v nizu tudi kakšno črko, bo Python javil napako.</p>''' + ], - 'not_callable' : [general_exception['error_head'], general_exception['general'], - general_exception['type_error'], ''' + 'not_callable' : [ + general_exception['error_head'], + general_exception['general'], + general_exception['type_error'], + '''\ <p>V programu poskušate uporabiti število kot funkcijo, a to ne gre. Verjetni razlog: Ali ste v izrazu pozabili na znak *. Pri pretvorbi temperatur bi namesto:</p> <pre> @@ -114,6 +124,6 @@ C = 5/9(F – 32) <pre> C = 5/9 * (F – 32). </pre> -<p> Python ne zna izpuščati znaka za množenje, kot to delamo pri matematiki.</p> '''], - +<p>Python ne zna izpuščati znaka za množenje, kot to delamo pri matematiki.</p>''' + ], } |