changes variable and dict key names along with other minor changes in answerpaper.

1 files changed, 34 insertions, 36 deletions

diff --git a/yaksh/compare_stdio.py b/yaksh/compare_stdio.py
index c9c631f..c4076de 100644
--- a/yaksh/compare_stdio.py
+++ b/yaksh/compare_stdio.py
@@ -3,43 +3,41 @@ try:
 except ImportError:
     from itertools import izip_longest as zip_longest
 
-class CompareOutputs(object):
     
-    def _incorrect_user_lines(self, exp_lines, user_lines):
-        err_line_no = []
-        for i, (expected_line, user_line) in \
-         enumerate(zip_longest(exp_lines, user_lines)):
-            if not user_line or not expected_line:
-                err_line_no.append(i)
-            else:
-                if user_line.strip() != expected_line.strip():
-                    err_line_no.append(i)
-        return err_line_no
+def _get_incorrect_user_lines(exp_lines, user_lines):
+    err_line_numbers = []
+    for line_no, (expected_line, user_line) in \
+     enumerate(zip_longest(exp_lines, user_lines)):
+        if not user_line or not expected_line or \
+         user_line.strip() != expected_line.strip():
+            err_line_numbers.append(line_no)
+    return err_line_numbers
     
-    def compare_outputs(self, expected_output, user_output,given_input=None):
-        given_lines = user_output.splitlines()
-        exp_lines = expected_output.splitlines()
-        msg = {"given_input":given_input,
-               "expected_output": exp_lines,
-               "user_output":given_lines
-                }
-        ng = len(given_lines)
-        ne = len(exp_lines)
-        if ng != ne:
-            err_line_no = self._incorrect_user_lines(exp_lines, given_lines)
-            msg["error_no"] = err_line_no
-            msg["error"] = "Incorrect Answer: \
-                           We had expected {0} number of lines. \
-                           We got {1} number of lines. ".format(ne, ng)
+def compare_outputs(expected_output, user_output, given_input=None):
+    given_lines = user_output.splitlines()
+    exp_lines = expected_output.splitlines()
+    msg = {"given_input":given_input,
+           "expected_output": exp_lines,
+           "user_output":given_lines
+            }
+    ng = len(given_lines)
+    ne = len(exp_lines)
+    err_line_numbers = _get_incorrect_user_lines(exp_lines, given_lines)
+    msg["error_line_numbers"] = err_line_numbers
+    if ng != ne:
+        msg["error_msg"] = ("Incorrect Answer: "
+                            + "We had expected {} number of lines. ".format(ne)
+                            + "We got {} number of lines.".format(ng)
+                            )
+        return False, msg
+    else:
+        if err_line_numbers:
+            msg["error_msg"] = ("Incorrect Answer: "
+                             + "Line number(s) {0} did not match."
+                                .format(", ".join(map(
+                                  str,[x+1 for x in err_line_numbers]
+                                ))))
             return False, msg
         else:
-            err_line_no = self._incorrect_user_lines(exp_lines, given_lines)
-            if err_line_no:
-                msg["error_no"] = err_line_no
-                msg["error"] = "Incorrect Answer: "\
-                               "Line number(s) {0} did not match."\
-                            .format(", ".join(map(str,[x+1 for x in err_line_no])))
-                return False, msg
-            else:
-                msg["error"] = "Correct answer"
-                return True, msg
+            msg["error_msg"] = "Correct Answer"
+            return True, msg