diff options
Diffstat (limited to 'testapp/exam/scilab_code_evaluator.py')
| -rw-r--r-- | testapp/exam/scilab_code_evaluator.py | 55 |
1 files changed, 9 insertions, 46 deletions
diff --git a/testapp/exam/scilab_code_evaluator.py b/testapp/exam/scilab_code_evaluator.py index 073fbcb..a4628a2 100644 --- a/testapp/exam/scilab_code_evaluator.py +++ b/testapp/exam/scilab_code_evaluator.py @@ -8,37 +8,36 @@ import importlib # local imports from code_evaluator import CodeEvaluator -# from language_registry import registry class ScilabCodeEvaluator(CodeEvaluator): """Tests the Scilab code obtained from Code Server""" - def __init__(self, test_case_data, language, user_answer, + def __init__(self, test_case_data, test, language, user_answer, ref_code_path=None, in_dir=None): - super(ScilabCodeEvaluator, self).__init__(test_case_data, language, user_answer, + super(ScilabCodeEvaluator, self).__init__(test_case_data, test, language, user_answer, ref_code_path, in_dir) self.submit_path = self.create_submit_code_file('function.sci') - self.test_case_args = self.setup_code_evaluator() + self.test_case_args = self._setup() # Private Protocol ########## - def setup_code_evaluator(self): - super(ScilabCodeEvaluator, self).setup_code_evaluator() + def _setup(self): + super(ScilabCodeEvaluator, self)._setup() ref_path, test_case_path = self.set_test_code_file_path(self.ref_code_path) return ref_path, # Return as a tuple - def teardown_code_evaluator(self): + def _teardown(self): # Delete the created file. - super(ScilabCodeEvaluator, self).teardown_code_evaluator() + super(ScilabCodeEvaluator, self)._teardown() os.remove(self.submit_path) - def check_code(self, ref_path): + def _check_code(self, ref_path): success = False cmd = 'printf "lines(0)\nexec(\'{0}\',2);\nquit();"'.format(ref_path) cmd += ' | timeout 8 scilab-cli -nb' - ret = self.run_command(cmd, + ret = self._run_command(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -58,38 +57,6 @@ class ScilabCodeEvaluator(CodeEvaluator): return success, err - # # Public Protocol ########## - # def evaluate_code(self): - # submit_path = self.create_submit_code_file('function.sci') - # ref_path, test_case_path = self.set_test_code_file_path() - # success = False - - # cmd = 'printf "lines(0)\nexec(\'{0}\',2);\nquit();"'.format(ref_path) - # cmd += ' | timeout 8 scilab-cli -nb' - # ret = self.run_command(cmd, - # shell=True, - # stdout=subprocess.PIPE, - # stderr=subprocess.PIPE) - # proc, stdout, stderr = ret - - # # Get only the error. - # stderr = self._get_error(stdout) - # if stderr is None: - # # Clean output - # stdout = self._strip_output(stdout) - # if proc.returncode == 5: - # success, err = True, "Correct answer" - # else: - # err = add_err + stdout - # else: - # err = add_err + stderr - - # # Delete the created file. - # os.remove(submit_path) - - # return success, err - - # Private Protocol ########## def _remove_scilab_exit(self, string): """ Removes exit, quit and abort from the scilab code @@ -105,7 +72,6 @@ class ScilabCodeEvaluator(CodeEvaluator): new_string = new_string + '\n' + new_line return new_string, i - # Private Protocol ########## def _get_error(self, string): """ Fetches only the error from the string. @@ -116,7 +82,6 @@ class ScilabCodeEvaluator(CodeEvaluator): return obj.group() return None - # Private Protocol ########## def _strip_output(self, out): """ Cleans whitespace from the output @@ -127,5 +92,3 @@ class ScilabCodeEvaluator(CodeEvaluator): strip_out = strip_out+"\n"+l.strip() return strip_out - -# registry.register('scilab', EvaluateScilabCode) |