diff options
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/cpp_stdio_evaluator.py | 3 | ||||
| -rw-r--r-- | yaksh/java_stdio_evaluator.py | 2 | ||||
| -rw-r--r-- | yaksh/stdio_evaluator.py | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/yaksh/cpp_stdio_evaluator.py b/yaksh/cpp_stdio_evaluator.py index 28b0a0b..db49adf 100644 --- a/yaksh/cpp_stdio_evaluator.py +++ b/yaksh/cpp_stdio_evaluator.py @@ -22,7 +22,6 @@ class CppStdioEvaluator(CodeEvaluator): def set_file_paths(self): user_output_path = os.getcwd() + '/output' ref_output_path = os.getcwd() + '/executable' - return user_output_path, ref_output_path def get_commands(self, user_output_path, ref_output_path): @@ -30,7 +29,6 @@ class CppStdioEvaluator(CodeEvaluator): user_output_path) compile_main = 'g++ {0} -o {1}'.format(user_output_path, ref_output_path) - return compile_command, compile_main def compile_code(self, user_answer, expected_input, expected_output): @@ -101,5 +99,4 @@ class CppStdioEvaluator(CodeEvaluator): err = err + "\n" + e except: err = err + "\n" + stdnt_stderr - return success, err diff --git a/yaksh/java_stdio_evaluator.py b/yaksh/java_stdio_evaluator.py index 2f6ef40..2ab2981 100644 --- a/yaksh/java_stdio_evaluator.py +++ b/yaksh/java_stdio_evaluator.py @@ -25,7 +25,6 @@ class JavaStdioEvaluator(CodeEvaluator): def get_commands(self): compile_command = 'javac {0}'.format(self.submit_code_path) - return compile_command def compile_code(self, user_answer, expected_input, expected_output): @@ -73,5 +72,4 @@ class JavaStdioEvaluator(CodeEvaluator): err = err + "\n" + e except: err = err + "\n" + stdnt_stderr - return success, err diff --git a/yaksh/stdio_evaluator.py b/yaksh/stdio_evaluator.py index 236c0ab..86b124c 100644 --- a/yaksh/stdio_evaluator.py +++ b/yaksh/stdio_evaluator.py @@ -1,6 +1,6 @@ class Evaluator(object): + def evaluate(self, user_answer, proc, expected_input, expected_output): - success = False ip = expected_input.replace(",", " ") user_output, output_err = proc.communicate(input='{0}\n'.format(ip)) |