diff options
| author | prathamesh | 2016-11-17 13:58:51 +0530 |
|---|---|---|
| committer | prathamesh | 2016-11-17 13:58:51 +0530 |
| commit | 93b16753ded5f3ef07187e9413c94bd52f2e77f7 (patch) | |
| tree | f137a0fd2a3036c5a6e87d323d8d14ee3d480c0b /yaksh/java_stdio_evaluator.py | |
| parent | 6ac9e99453543e6a5533f5ab77c7db3c08cc0cf9 (diff) | |
| parent | aa6ed71496c4a36faed9b42104c8426345bdc2e3 (diff) | |
| download | online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.tar.gz online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.tar.bz2 online_test-93b16753ded5f3ef07187e9413c94bd52f2e77f7.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into student-interface
Resolved
Conflicts:
yaksh/templates/yaksh/question.html
Added testarea back for now.
Diffstat (limited to 'yaksh/java_stdio_evaluator.py')
| -rw-r--r-- | yaksh/java_stdio_evaluator.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/yaksh/java_stdio_evaluator.py b/yaksh/java_stdio_evaluator.py index bc9cf80..88d4c88 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, weight): 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, weight): success = False + test_case_weight = 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_weight = float(weight) if partial_grading and success else 0.0 + return success, err, test_case_weight |