cafe-grader-judge-scripts

Commit r31:d810d6c2e99e public

parent | child
Description:
[grader] fixed: import_problem (error in erb calls), check_wrapper; better error handling -- will get 0 score for a particular test run that fails git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@118 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r31:d810d6c2e99e - - 5 files changed: 27 inserted, 14 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -102,11 +102,11
102 102 # wrapper script
103 103 check_script_fname = res[1]
104 104 script_name = File.basename(check_script_fname)
105 - check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper")
106 - check_wrapper = ERB.new(template)
105 + check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper").read
106 + check_wrapper = ERB.new(check_wrapper_template)
107 107
108 108 check_file = File.open("#{problem}/script/check","w")
109 - check_file.puts check_wrapper
109 + check_file.puts check_wrapper.result
110 110 check_file.close
111 111
112 112 File.chmod(0755,"#{problem}/script/check")
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,10
1 1 #!/usr/bin/ruby
2 2
3 + CORRECT_MARK = 'P'
4 + INCORRECT_MARK = '-'
5 + TIMEOUT_MARK = 'T'
6 + RUN_ERROR_MARK = 'x'
7 +
3 8 def log(str='')
4 9 if ENV['TALKATIVE']!=nil
5 10 puts str
@@ -14,13 +19,13
14 19
15 20 def char_comment(comment)
16 21 if comment =~ /[iI]ncorrect/
17 - '-'
22 + INCORRECT_MARK
18 23 elsif comment =~ /[Cc]orrect/
19 - 'P'
24 + CORRECT_MARK
20 25 elsif comment =~ /[Tt]ime/
21 - 'T'
26 + TIMEOUT_MARK
22 27 else
23 - 'x' # these are run time errors
28 + RUN_ERROR_MARK # these are run time errors
24 29 end
25 30 end
26 31
@@ -46,7 +51,7
46 51 result_file_name = "#{test_num}/result"
47 52 if not File.exists?(result_file_name)
48 53 run_comment += "result file for test #{test_num} not found\n"
49 - run_comment_short += 'x'
54 + run_comment_short += RUN_ERROR_MARK
50 55 log "Cannot find the file #{test_num}/result!"
51 56 else
52 57 result_file = File.new(result_file_name, "r")
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -16,9 +16,9
16 16
17 17 def execute(command, error_message="")
18 18 if not system(command)
19 - log "ERROR: #{error_message}"
20 - puts "ERROR: #{error_message}"
21 - exit(127)
19 + msg = "ERROR: #{error_message}"
20 + log msg
21 + raise msg
22 22 end
23 23 end
24 24
@@ -105,7 +105,11
105 105 (1..(problem.num_tests)).each do |test_num|
106 106 log "Test number: #{test_num}"
107 107 execute("cp #{test_result_dir}/a.out #{sandbox_dir}", "Cannot copy the compiled program into #{sandbox_dir}")
108 + begin
108 109 execute("#{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
110 + rescue
111 + # do nothing
112 + end
109 113 execute("mkdir #{test_result_dir}/#{test_num}", "Cannot create directory #{test_result_dir}/#{test_num}")
110 114 execute("mv #{sandbox_dir}/result #{test_result_dir}/#{test_num}", "Cannot copy the result file into #{test_result_dir}/#{test_num}")
111 115 execute("mv #{sandbox_dir}/comment #{test_result_dir}/#{test_num}", "Cannot copy the comment file into #{test_result_dir}/#{test_num}")
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -133,6 +133,7
133 133 log check_command
134 134 if not system(check_command)
135 135 log "Problem with check script"
136 + report.call("Incorrect",0,"Check script error.\n")
136 137 exit(127)
137 138 end
138 139
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -34,12 +34,15
34 34 load "#{problem_home}/test_cases/all_tests.cfg"
35 35 problem = Problem.get_instance
36 36
37 - answer_file_name = File.new("#{problem_home}/test_cases/#{test_num}/answer-#{test_num}.txt")
38 - input_file_name = File.new("#{problem_home}/test_cases/#{test_num}/input-#{test_num}.txt")
37 + answer_file_name = "#{problem_home}/test_cases/#{test_num}/answer-#{test_num}.txt"
38 + input_file_name = "#{problem_home}/test_cases/#{test_num}/input-#{test_num}.txt"
39 39
40 - score = Problem.get_score(test_num)
40 + score = problem.get_score(test_num)
41 41
42 42 cmd = "#{problem_home}/script/#{REAL_CHECK_SCRIPT} " +
43 43 "#{language} #{test_num} #{input_file_name} #{output_file_name} " +
44 44 "#{answer_file_name} #{score} > check_result"
45 45
46 + #puts "wrapper-CMD: #{cmd}"
47 +
48 + system(cmd)
You need to be logged in to leave comments. Login now