summaryrefslogtreecommitdiff
path: root/yaksh
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh')
-rw-r--r--yaksh/bash_code_evaluator.py20
-rw-r--r--yaksh/bash_stdio_evaluator.py10
-rw-r--r--yaksh/cpp_code_evaluator.py11
-rw-r--r--yaksh/cpp_stdio_evaluator.py13
-rw-r--r--yaksh/java_code_evaluator.py11
-rw-r--r--yaksh/java_stdio_evaluator.py11
-rw-r--r--yaksh/scilab_code_evaluator.py9
7 files changed, 54 insertions, 31 deletions
diff --git a/yaksh/bash_code_evaluator.py b/yaksh/bash_code_evaluator.py
index e4b961c..7dc0f0f 100644
--- a/yaksh/bash_code_evaluator.py
+++ b/yaksh/bash_code_evaluator.py
@@ -17,6 +17,7 @@ class BashCodeEvaluator(CodeEvaluator):
# Private Protocol ##########
def setup(self):
super(BashCodeEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('submit.sh')
self._set_file_as_executable(self.submit_code_path)
@@ -27,7 +28,7 @@ class BashCodeEvaluator(CodeEvaluator):
delete_files(self.files)
super(BashCodeEvaluator, self).teardown()
- def check_code(self, user_answer, file_paths, test_case):
+ def check_code(self, file_paths, partial_grading, test_case, marks):
""" Function validates student script using instructor script as
reference. Test cases can optionally be provided. The first argument
ref_path, is the path to instructor script, it is assumed to
@@ -57,7 +58,6 @@ class BashCodeEvaluator(CodeEvaluator):
clean_ref_code_path, clean_test_case_path = \
self._set_test_code_file_path(get_ref_path, get_test_case_path)
- self.files = []
if file_paths:
self.files = copy_files(file_paths)
if not isfile(clean_ref_code_path):
@@ -74,6 +74,8 @@ class BashCodeEvaluator(CodeEvaluator):
return False, msg
success = False
+ test_case_marks = 0.0
+
user_answer = user_answer.replace("\r", "")
self.write_to_submit_code_file(self.submit_code_path, user_answer)
@@ -91,19 +93,20 @@ class BashCodeEvaluator(CodeEvaluator):
)
proc, stdnt_stdout, stdnt_stderr = ret
if inst_stdout == stdnt_stdout:
- return True, "Correct answer"
+ test_case_marks = float(marks) if partial_grading else 0.0
+ return True, "Correct answer", test_case_marks
else:
err = "Error: expected %s, got %s" % (inst_stderr,
stdnt_stderr
)
- return False, err
+ return False, err, test_case_marks
else:
if not isfile(clean_test_case_path):
msg = "No test case at %s" % clean_test_case_path
- return False, msg
+ return False, msg, test_case_marks
if not os.access(clean_ref_code_path, os.R_OK):
msg = "Test script %s, not readable" % clean_test_case_path
- return False, msg
+ return False, msg, test_case_marks
# valid_answer is True, so that we can stop once a test case fails
valid_answer = True
# loop_count has to be greater than or equal to one.
@@ -133,10 +136,11 @@ class BashCodeEvaluator(CodeEvaluator):
proc, stdnt_stdout, stdnt_stderr = ret
valid_answer = inst_stdout == stdnt_stdout
if valid_answer and (num_lines == loop_count):
- return True, "Correct answer"
+ test_case_marks = float(marks) if partial_grading else 0.0
+ return True, "Correct answer", test_case_marks
else:
err = ("Error:expected"
" {0}, got {1}").format(inst_stdout+inst_stderr,
stdnt_stdout+stdnt_stderr
)
- return False, err
+ return False, err, test_case_marks
diff --git a/yaksh/bash_stdio_evaluator.py b/yaksh/bash_stdio_evaluator.py
index a7ea1a4..0bab0f0 100644
--- a/yaksh/bash_stdio_evaluator.py
+++ b/yaksh/bash_stdio_evaluator.py
@@ -14,6 +14,7 @@ class BashStdioEvaluator(StdIOEvaluator):
def setup(self):
super(BashStdioEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('Test.sh')
def teardown(self):
@@ -22,8 +23,7 @@ class BashStdioEvaluator(StdIOEvaluator):
delete_files(self.files)
super(BashStdioEvaluator, self).teardown()
- def compile_code(self, user_answer, file_paths, expected_input, expected_output):
- self.files = []
+ def compile_code(self, user_answer, file_paths, expected_input, expected_output, marks):
if file_paths:
self.files = copy_files(file_paths)
if not isfile(self.submit_code_path):
@@ -33,8 +33,11 @@ class BashStdioEvaluator(StdIOEvaluator):
user_answer = user_answer.replace("\r", "")
self.write_to_submit_code_file(self.submit_code_path, user_answer)
- def check_code(self, user_answer, file_paths, expected_input, expected_output):
+ def check_code(self, user_answer, file_paths, partial_grading,
+ expected_input, expected_output, marks):
success = False
+ test_case_marks = 0.0
+
expected_input = str(expected_input).replace('\r', '')
proc = subprocess.Popen("bash ./Test.sh",
shell=True,
@@ -46,4 +49,5 @@ class BashStdioEvaluator(StdIOEvaluator):
expected_input,
expected_output
)
+ test_case_marks = float(marks) if partial_grading and success else 0.0
return success, err
diff --git a/yaksh/cpp_code_evaluator.py b/yaksh/cpp_code_evaluator.py
index 5380dea..d6c72d6 100644
--- a/yaksh/cpp_code_evaluator.py
+++ b/yaksh/cpp_code_evaluator.py
@@ -16,6 +16,7 @@ class CppCodeEvaluator(CodeEvaluator):
"""Tests the C code obtained from Code Server"""
def setup(self):
super(CppCodeEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('submit.c')
self.compiled_user_answer = None
self.compiled_test_code = None
@@ -49,8 +50,7 @@ class CppCodeEvaluator(CodeEvaluator):
ref_output_path)
return compile_command, compile_main
- def compile_code(self, user_answer, file_paths, test_case):
- self.files = []
+ def compile_code(self, user_answer, file_paths, test_case, marks):
if self.compiled_user_answer and self.compiled_test_code:
return None
else:
@@ -89,7 +89,7 @@ class CppCodeEvaluator(CodeEvaluator):
return self.compiled_user_answer, self.compiled_test_code
- def check_code(self, user_answer, file_paths, test_case):
+ def check_code(self, user_answer, file_paths, partial_grading, test_case, marks):
""" Function validates student code using instructor code as
reference.The first argument ref_code_path, is the path to
instructor code, it is assumed to have executable permission.
@@ -109,6 +109,8 @@ class CppCodeEvaluator(CodeEvaluator):
if the required permissions are not given to the file(s).
"""
success = False
+ test_case_marks = 0.0
+
proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
stdnt_stderr = self._remove_null_substitute_char(stdnt_stderr)
@@ -127,6 +129,7 @@ class CppCodeEvaluator(CodeEvaluator):
proc, stdout, stderr = ret
if proc.returncode == 0:
success, err = True, "Correct answer"
+ test_case_marks = float(marks) if partial_grading else 0.0
else:
err = "{0} \n {1}".format(stdout, stderr)
else:
@@ -152,4 +155,4 @@ class CppCodeEvaluator(CodeEvaluator):
except:
err = "{0} \n {1}".format(err, stdnt_stderr)
- return success, err
+ return success, err, test_case_marks
diff --git a/yaksh/cpp_stdio_evaluator.py b/yaksh/cpp_stdio_evaluator.py
index 9d2b969..9e2fd2e 100644
--- a/yaksh/cpp_stdio_evaluator.py
+++ b/yaksh/cpp_stdio_evaluator.py
@@ -14,6 +14,7 @@ class CppStdioEvaluator(StdIOEvaluator):
def setup(self):
super(CppStdioEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('main.c')
def teardown(self):
@@ -34,9 +35,7 @@ class CppStdioEvaluator(StdIOEvaluator):
ref_output_path)
return compile_command, compile_main
- def compile_code(self, user_answer, file_paths, expected_input, expected_output):
-
- self.files = []
+ def compile_code(self, user_answer, file_paths, expected_input, expected_output, marks):
if file_paths:
self.files = copy_files(file_paths)
if not isfile(self.submit_code_path):
@@ -62,8 +61,11 @@ class CppStdioEvaluator(StdIOEvaluator):
)
return self.compiled_user_answer, self.compiled_test_code
- def check_code(self, user_answer, file_paths, expected_input, expected_output):
+ def check_code(self, user_answer, file_paths, partial_grading,
+ expected_input, expected_output, marks):
success = False
+ test_case_marks = 0.0
+
proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
stdnt_stderr = self._remove_null_substitute_char(stdnt_stderr)
if stdnt_stderr == '':
@@ -104,4 +106,5 @@ class CppStdioEvaluator(StdIOEvaluator):
err = err + "\n" + e
except:
err = err + "\n" + stdnt_stderr
- return success, err
+ test_case_marks = float(marks) if partial_grading and success else 0.0
+ return success, err, test_case_marks
diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py
index 1ce1c0e..c945a38 100644
--- a/yaksh/java_code_evaluator.py
+++ b/yaksh/java_code_evaluator.py
@@ -16,6 +16,7 @@ class JavaCodeEvaluator(CodeEvaluator):
"""Tests the Java code obtained from Code Server"""
def setup(self):
super(JavaCodeEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('Test.java')
self.compiled_user_answer = None
self.compiled_test_code = None
@@ -46,8 +47,7 @@ class JavaCodeEvaluator(CodeEvaluator):
output_path = "{0}{1}.class".format(directory, file_name)
return output_path
- def compile_code(self, user_answer, file_paths, test_case):
- self.files = []
+ def compile_code(self, user_answer, file_paths, test_case, marks):
if self.compiled_user_answer and self.compiled_test_code:
return None
else:
@@ -96,7 +96,7 @@ class JavaCodeEvaluator(CodeEvaluator):
return self.compiled_user_answer, self.compiled_test_code
- def check_code(self, user_answer, file_paths, test_case):
+ def check_code(self, user_answer, file_paths, partial_grading, test_case, marks):
""" Function validates student code using instructor code as
reference.The first argument ref_code_path, is the path to
instructor code, it is assumed to have executable permission.
@@ -117,6 +117,8 @@ class JavaCodeEvaluator(CodeEvaluator):
"""
success = False
+ test_case_marks = 0.0
+
proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
stdnt_stderr = self._remove_null_substitute_char(stdnt_stderr)
@@ -134,6 +136,7 @@ class JavaCodeEvaluator(CodeEvaluator):
proc, stdout, stderr = ret
if proc.returncode == 0:
success, err = True, "Correct answer"
+ test_case_marks = float(marks) if partial_grading else 0.0
else:
err = stdout + "\n" + stderr
else:
@@ -158,4 +161,4 @@ class JavaCodeEvaluator(CodeEvaluator):
err = err + "\n" + e
except:
err = err + "\n" + stdnt_stderr
- return success, err
+ return success, err, test_case_marks
diff --git a/yaksh/java_stdio_evaluator.py b/yaksh/java_stdio_evaluator.py
index bc9cf80..b074e1c 100644
--- a/yaksh/java_stdio_evaluator.py
+++ b/yaksh/java_stdio_evaluator.py
@@ -14,6 +14,7 @@ class JavaStdioEvaluator(StdIOEvaluator):
def setup(self):
super(JavaStdioEvaluator, self).setup()
+ self.files = []
self.submit_code_path = self.create_submit_code_file('Test.java')
def teardown(self):
@@ -30,8 +31,7 @@ class JavaStdioEvaluator(StdIOEvaluator):
compile_command = 'javac {0}'.format(self.submit_code_path)
return compile_command
- def compile_code(self, user_answer, file_paths, expected_input, expected_output):
- self.files = []
+ def compile_code(self, user_answer, file_paths, expected_input, expected_output, marks):
if not isfile(self.submit_code_path):
msg = "No file at %s or Incorrect path" % self.submit_code_path
return False, msg
@@ -50,8 +50,10 @@ class JavaStdioEvaluator(StdIOEvaluator):
)
return self.compiled_user_answer
- def check_code(self, user_answer, file_paths, expected_input, expected_output):
+ def check_code(self, user_answer, file_paths, partial_grading,
+ expected_input, expected_output, marks):
success = False
+ test_case_marks = 0.0
proc, stdnt_out, stdnt_stderr = self.compiled_user_answer
stdnt_stderr = self._remove_null_substitute_char(stdnt_stderr)
if stdnt_stderr == '' or "error" not in stdnt_stderr:
@@ -77,4 +79,5 @@ class JavaStdioEvaluator(StdIOEvaluator):
err = err + "\n" + e
except:
err = err + "\n" + stdnt_stderr
- return success, err
+ test_case_marks = float(marks) if partial_grading and success else 0.0
+ return success, err, test_case_marks
diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 915491c..1aca309 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -16,6 +16,7 @@ class ScilabCodeEvaluator(CodeEvaluator):
"""Tests the Scilab code obtained from Code Server"""
def setup(self):
super(ScilabCodeEvaluator, self).setup()
+ self.files = []
self.submit_code_path = \
self.create_submit_code_file('function.sci')
@@ -26,8 +27,7 @@ class ScilabCodeEvaluator(CodeEvaluator):
delete_files(self.files)
super(ScilabCodeEvaluator, self).teardown()
- def check_code(self, user_answer, file_paths, test_case):
- self.files = []
+ def check_code(self, user_answer, file_paths, partial_grading, test_case, marks):
if file_paths:
self.files = copy_files(file_paths)
ref_code_path = test_case
@@ -37,6 +37,8 @@ class ScilabCodeEvaluator(CodeEvaluator):
self._remove_scilab_exit(user_answer.lstrip())
success = False
+ test_case_marks = 0.0
+
self.write_to_submit_code_file(self.submit_code_path, user_answer)
# Throw message if there are commmands that terminates scilab
add_err = ""
@@ -63,11 +65,12 @@ class ScilabCodeEvaluator(CodeEvaluator):
stdout = self._strip_output(stdout)
if proc.returncode == 5:
success, err = True, "Correct answer"
+ test_case_marks = float(marks) if partial_grading else 0.0
else:
err = add_err + stdout
else:
err = add_err + stderr
- return success, err
+ return success, err, test_case_marks
def _remove_scilab_exit(self, string):
"""
generated by cgit (git 2.34.1) at 2024-12-20 12:13:16 +0000