Merge pull request #163 from ankitjavalkar/code-server-refactor2016-form

Code Evaluator refactoring

1 files changed, 26 insertions, 21 deletions

diff --git a/yaksh/python_stdio_evaluator.py b/yaksh/python_stdio_evaluator.py
index 1506685..da0c954 100644
--- a/yaksh/python_stdio_evaluator.py
+++ b/yaksh/python_stdio_evaluator.py
@@ -14,8 +14,8 @@ except ImportError:
     from io import StringIO
 
 # Local imports
-from .code_evaluator import CodeEvaluator
 from .file_utils import copy_files, delete_files
+from .base_evaluator import BaseEvaluator
 
 
 @contextmanager
@@ -28,27 +28,33 @@ def redirect_stdout():
         sys.stdout = old_target  # restore to the previous value
 
 
-class PythonStdioEvaluator(CodeEvaluator):
+class PythonStdIOEvaluator(BaseEvaluator):
     """Tests the Python code obtained from Code Server"""
-
-    def setup(self):
-        super(PythonStdioEvaluator, self).setup()
+    def __init__(self, metadata, test_case_data):
         self.files = []
 
+        # Set metadata values
+        self.user_answer = metadata.get('user_answer')
+        self.file_paths = metadata.get('file_paths')
+        self.partial_grading = metadata.get('partial_grading')
+
+        # Set test case data values
+        self.expected_input = test_case_data.get('expected_input')
+        self.expected_output = test_case_data.get('expected_output')
+        self.weight = test_case_data.get('weight')        
+
     def teardown(self):
         # Delete the created file.
         if self.files:
             delete_files(self.files)
-        super(PythonStdioEvaluator, self).teardown()
-
 
-    def compile_code(self, user_answer, file_paths, expected_input, expected_output, weight):
-        if file_paths:
-            self.files = copy_files(file_paths)
-        submitted = compile(user_answer, '<string>', mode='exec')
-        if expected_input:
+    def compile_code(self):
+        if self.file_paths:
+            self.files = copy_files(self.file_paths)
+        submitted = compile(self.user_answer, '<string>', mode='exec')
+        if self.expected_input:
             input_buffer = StringIO()
-            input_buffer.write(expected_input)
+            input_buffer.write(self.expected_input)
             input_buffer.seek(0)
             sys.stdin = input_buffer
         with redirect_stdout() as output_buffer:
@@ -57,16 +63,15 @@ class PythonStdioEvaluator(CodeEvaluator):
         self.output_value = output_buffer.getvalue().rstrip("\n")
         return self.output_value
 
-    def check_code(self, user_answer, file_paths, partial_grading, expected_input,
-         expected_output, weight):
+    def check_code(self):
         success = False
-        test_case_weight = 0.0
+        mark_fraction = 0.0
 
         tb = None
-        if self.output_value == expected_output:
+        if self.output_value == self.expected_output:
             success = True
             err = "Correct answer"
-            test_case_weight = weight
+            mark_fraction = self.weight
         else:
             success = False
             err = dedent("""
@@ -74,10 +79,10 @@ class PythonStdioEvaluator(CodeEvaluator):
                 Given input - {0}
                 Expected output - {1}
                 Your output - {2}
-                """.format(expected_input,
-                     expected_output,
+                """.format(self.expected_input,
+                     self.expected_output,
                      self.output_value
                     )
                 )
         del tb
-        return success, err, test_case_weight
+        return success, err, mark_fraction