Leave query modification in tests to Prolog engine

18 files changed, 18 insertions, 54 deletions

diff --git a/prolog/problems/lists/conc_3/common.py b/prolog/problems/lists/conc_3/common.py
index a36d097..fd6fb9f 100644
--- a/prolog/problems/lists/conc_3/common.py
+++ b/prolog/problems/lists/conc_3/common.py
@@ -37,9 +37,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/count_3/common.py b/prolog/problems/lists/count_3/common.py
index e28ad5c..423bb1e 100644
--- a/prolog/problems/lists/count_3/common.py
+++ b/prolog/problems/lists/count_3/common.py
@@ -41,9 +41,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/del_3/common.py b/prolog/problems/lists/del_3/common.py
index 1b37475..cf458b1 100644
--- a/prolog/problems/lists/del_3/common.py
+++ b/prolog/problems/lists/del_3/common.py
@@ -35,9 +35,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/divide_3/common.py b/prolog/problems/lists/divide_3/common.py
index 8cc1073..83a8a9e 100644
--- a/prolog/problems/lists/divide_3/common.py
+++ b/prolog/problems/lists/divide_3/common.py
@@ -40,9 +40,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/dup_2/common.py b/prolog/problems/lists/dup_2/common.py
index 9758b64..cce5aef 100644
--- a/prolog/problems/lists/dup_2/common.py
+++ b/prolog/problems/lists/dup_2/common.py
@@ -37,9 +37,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py b/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py
index 4df2726..13d9bca 100644
--- a/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py
+++ b/prolog/problems/lists/evenlen_1_+_oddlen_1/common.py
@@ -43,9 +43,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/insert_3/common.py b/prolog/problems/lists/insert_3/common.py
index a4fe40c..fe1fbb6 100644
--- a/prolog/problems/lists/insert_3/common.py
+++ b/prolog/problems/lists/insert_3/common.py
@@ -37,9 +37,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/len_2/common.py b/prolog/problems/lists/len_2/common.py
index 61ea064..94a05c5 100644
--- a/prolog/problems/lists/len_2/common.py
+++ b/prolog/problems/lists/len_2/common.py
@@ -36,9 +36,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/max_2/common.py b/prolog/problems/lists/max_2/common.py
index d055ab2..1f8769a 100644
--- a/prolog/problems/lists/max_2/common.py
+++ b/prolog/problems/lists/max_2/common.py
@@ -40,9 +40,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/memb_2/common.py b/prolog/problems/lists/memb_2/common.py
index b9c0584..0704a50 100644
--- a/prolog/problems/lists/memb_2/common.py
+++ b/prolog/problems/lists/memb_2/common.py
@@ -33,9 +33,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/min_2/common.py b/prolog/problems/lists/min_2/common.py
index 632e473..fc505b7 100644
--- a/prolog/problems/lists/min_2/common.py
+++ b/prolog/problems/lists/min_2/common.py
@@ -40,9 +40,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/palindrome_1/common.py b/prolog/problems/lists/palindrome_1/common.py
index ae82c9b..044f7be 100644
--- a/prolog/problems/lists/palindrome_1/common.py
+++ b/prolog/problems/lists/palindrome_1/common.py
@@ -41,9 +41,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/permute_2/common.py b/prolog/problems/lists/permute_2/common.py
index 3662421..5ade0b5 100644
--- a/prolog/problems/lists/permute_2/common.py
+++ b/prolog/problems/lists/permute_2/common.py
@@ -39,9 +39,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/rev_2/common.py b/prolog/problems/lists/rev_2/common.py
index 117049a..2a16e27 100644
--- a/prolog/problems/lists/rev_2/common.py
+++ b/prolog/problems/lists/rev_2/common.py
@@ -39,9 +39,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/shiftleft_2/common.py b/prolog/problems/lists/shiftleft_2/common.py
index 4d68265..8de545b 100644
--- a/prolog/problems/lists/shiftleft_2/common.py
+++ b/prolog/problems/lists/shiftleft_2/common.py
@@ -37,9 +37,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/shiftright_2/common.py b/prolog/problems/lists/shiftright_2/common.py
index e9b7a7a..205daa9 100644
--- a/prolog/problems/lists/shiftright_2/common.py
+++ b/prolog/problems/lists/shiftright_2/common.py
@@ -37,9 +37,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/sublist_2/common.py b/prolog/problems/lists/sublist_2/common.py
index 9e8b987..bcf3315 100644
--- a/prolog/problems/lists/sublist_2/common.py
+++ b/prolog/problems/lists/sublist_2/common.py
@@ -40,9 +40,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id:
diff --git a/prolog/problems/lists/sum_2/common.py b/prolog/problems/lists/sum_2/common.py
index 2a17157..a849601 100644
--- a/prolog/problems/lists/sum_2/common.py
+++ b/prolog/problems/lists/sum_2/common.py
@@ -36,9 +36,7 @@ def test(program, solved_problems):
         if engine_id is not None and 'error' not in map(itemgetter(0), output):
             # Engine successfully created, and no syntax error in program.
             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):
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
                     n_correct += 1
     finally:
         if engine_id: