Description:
[grader] fixed bug #6 and #9
git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@139 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r37:effd16a52c43 - - 5 files changed: 13 inserted, 3 deleted
@@ -42,8 +42,10 | |||||
|
42 | def report_comment(comment) |
|
42 | def report_comment(comment) |
|
43 | case comment_report_style |
|
43 | case comment_report_style |
|
44 | when :short |
|
44 | when :short |
|
45 | - if comment.chomp =~ /^P+$/ # all P's |
|
45 | + if comment.chomp =~ /^[\[\]P]+$/ # all P's |
|
46 | 'passed' |
|
46 | 'passed' |
|
|
47 | + elsif comment.chomp =~ /[Cc]ompil.*[Ee]rror/ | ||
|
|
48 | + 'compilation error' | ||
|
47 | else |
|
49 | else |
|
48 | 'failed' |
|
50 | 'failed' |
|
49 | end |
|
51 | end |
@@ -87,7 +87,7 | |||||
|
87 | :cmp_msg => cmp_msg} |
|
87 | :cmp_msg => cmp_msg} |
|
88 | else |
|
88 | else |
|
89 | return {:points => 0, |
|
89 | return {:points => 0, |
|
90 |
- :comment => 'compil |
|
90 | + :comment => 'compilation error', |
|
91 | :cmp_msg => cmp_msg} |
|
91 | :cmp_msg => cmp_msg} |
|
92 | end |
|
92 | end |
|
93 | end |
|
93 | end |
@@ -103,6 +103,8 | |||||
|
103 | submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)' |
|
103 | submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)' |
|
104 | elsif points == problem.full_score |
|
104 | elsif points == problem.full_score |
|
105 | submission.grader_comment = 'PASSED: ' + comment |
|
105 | submission.grader_comment = 'PASSED: ' + comment |
|
|
106 | + elsif result[:comment].chomp =~ /^[\[\]P]+$/ | ||
|
|
107 | + submission.grader_comment = 'PASSED: ' + comment + '(inconsistent score)' | ||
|
106 | else |
|
108 | else |
|
107 | submission.grader_comment = 'FAILED: ' + comment |
|
109 | submission.grader_comment = 'FAILED: ' + comment |
|
108 | end |
|
110 | end |
@@ -1,3 +1,6 | |||||
|
|
1 | + /* | ||
|
|
2 | + LANG: C | ||
|
|
3 | + */ | ||
|
1 | #include <stdio.h> |
|
4 | #include <stdio.h> |
|
2 |
|
5 | ||
|
3 | int main() |
|
6 | int main() |
@@ -1,3 +1,6 | |||||
|
|
1 | + /* | ||
|
|
2 | + LANG: C | ||
|
|
3 | + */ | ||
|
1 | #include <stdio.h> |
|
4 | #include <stdio.h> |
|
2 |
|
5 | ||
|
3 | int main() |
|
6 | int main() |
@@ -33,7 +33,7 | |||||
|
33 | :on => @problem_test_normal, |
|
33 | :on => @problem_test_normal, |
|
34 | :and_report => { |
|
34 | :and_report => { |
|
35 | :score => 0, |
|
35 | :score => 0, |
|
36 |
- :comment => 'FAILED: compil |
|
36 | + :comment => 'FAILED: compilation error', |
|
37 | :compiler_message => /[Ee]rror/}) |
|
37 | :compiler_message => /[Ee]rror/}) |
|
38 | end |
|
38 | end |
|
39 |
|
39 |
You need to be logged in to leave comments.
Login now