Description:
translates test_request input/output file paths for remote grading test_request
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r117:cc3e1102f8c6 - - 5 files changed: 35 inserted, 2 deleted
@@ -13,8 +13,11 | |||
|
13 | 13 | config.report_grader = true |
|
14 | 14 | |
|
15 | 15 | config.test_request_input_base_dir = RAILS_ROOT + "/data/test_request/input" |
|
16 | 16 | config.test_request_output_base_dir = RAILS_ROOT + "/data/test_request/output" |
|
17 | 17 | config.test_request_problem_templates_dir = config.problems_dir + "/test_request" |
|
18 | 18 | |
|
19 | + # change this if you want the path on the output to be translated | |
|
20 | + config.test_request_org_output_base_dir = config.test_request_output_base_dir | |
|
21 | + | |
|
19 | 22 | config.comment_report_style = :short |
|
20 | 23 | end |
@@ -12,8 +12,11 | |||
|
12 | 12 | config.report_grader = true |
|
13 | 13 | |
|
14 | 14 | config.test_request_input_base_dir = RAILS_ROOT + "/data/test_request/input" |
|
15 | 15 | config.test_request_output_base_dir = RAILS_ROOT + "/data/test_request/output" |
|
16 | 16 | config.test_request_problem_templates_dir = config.problems_dir + "/test_request" |
|
17 | 17 | |
|
18 | + # change this if you want the path on the output to be translated | |
|
19 | + config.test_request_org_output_base_dir = config.test_request_output_base_dir | |
|
20 | + | |
|
18 | 21 | config.comment_report_style = :full |
|
19 | 22 | end |
@@ -14,12 +14,15 | |||
|
14 | 14 | config.comment_report_style = :full |
|
15 | 15 | |
|
16 | 16 | config.test_request_input_base_dir = GRADER_ROOT + "/test/data/test_request/input" |
|
17 | 17 | config.test_request_output_base_dir = GRADER_ROOT + "/test/sandbox/test_request/output" |
|
18 | 18 | config.test_request_problem_templates_dir = GRADER_ROOT + "/test/data/test_request/problems" |
|
19 | 19 | |
|
20 | + # change this if you want the path on the output to be translated | |
|
21 | + config.test_request_org_output_base_dir = config.test_request_output_base_dir | |
|
22 | + | |
|
20 | 23 | # |
|
21 | 24 | # These options are for testing |
|
22 | 25 | # |
|
23 | 26 | class << config |
|
24 | 27 | attr_accessor :test_data_dir, :test_sandbox_dir |
|
25 | 28 | end |
@@ -30,12 +30,16 | |||
|
30 | 30 | |
|
31 | 31 | # These are directories related to the test interface. |
|
32 | 32 | attr_accessor :test_request_input_base_dir |
|
33 | 33 | attr_accessor :test_request_output_base_dir |
|
34 | 34 | attr_accessor :test_request_problem_templates_dir |
|
35 | 35 | |
|
36 | + # this is for linking output from test request | |
|
37 | + # TODO: find a cleaner way to do this. | |
|
38 | + attr_accessor :test_request_org_output_base_dir | |
|
39 | + | |
|
36 | 40 | # Comment received from the grading script will be filtered |
|
37 | 41 | # through Configuration#report_comment. How this method behave |
|
38 | 42 | # depends on this option; right now only two formats, :short and |
|
39 | 43 | # :long |
|
40 | 44 | attr_accessor :comment_report_style |
|
41 | 45 |
@@ -2,12 +2,18 | |||
|
2 | 2 | # This part contains various test_request helpers for interfacing |
|
3 | 3 | # with Grader::Engine. There are TestRequestRoomMaker and |
|
4 | 4 | # TestRequestReporter. |
|
5 | 5 | |
|
6 | 6 | module Grader |
|
7 | 7 | |
|
8 | + def self.translate_filepath(filename, marker, new_base_path) | |
|
9 | + p = filename.index(marker) | |
|
10 | + end_path = filename[(p+marker.length)..-1] | |
|
11 | + return new_base_path + end_path | |
|
12 | + end | |
|
13 | + | |
|
8 | 14 | def self.link_or_copy(src, des) |
|
9 | 15 | begin |
|
10 | 16 | FileUtils.ln_s(src, des) |
|
11 | 17 | rescue NotImplementedError |
|
12 | 18 | FileUtils.cp(src,des) |
|
13 | 19 | end |
@@ -101,14 +107,21 | |||
|
101 | 107 | def copy_problem_template(template_dir,problem_home) |
|
102 | 108 | Grader::call_and_log("Test Request: cannot copy problem template") { |
|
103 | 109 | FileUtils.cp_r("#{template_dir}/.","#{problem_home}") |
|
104 | 110 | } |
|
105 | 111 | end |
|
106 | 112 | |
|
113 | + def translate_input_filename(filename) | |
|
114 | + return Grader::translate_filepath(filename, | |
|
115 | + 'input', | |
|
116 | + @config.test_request_input_base_dir) | |
|
117 | + end | |
|
118 | + | |
|
107 | 119 | def link_input_file(test_request, problem_home) |
|
108 |
- input_fname = |
|
|
120 | + input_fname = translate_input_filename(test_request.input_file_name) | |
|
121 | + | |
|
109 | 122 | if !File.exists?(input_fname) |
|
110 | 123 | raise "Test Request: input file not found." |
|
111 | 124 | end |
|
112 | 125 | |
|
113 | 126 | input_fname_problem_home = "#{problem_home}/test_cases/1/input-1.txt" |
|
114 | 127 | if File.exists?(input_fname_problem_home) |
@@ -211,14 +224,15 | |||
|
211 | 224 | :memory_usage => memory_used |
|
212 | 225 | } |
|
213 | 226 | end |
|
214 | 227 | |
|
215 | 228 | def save_result(test_request,result) |
|
216 | 229 | if result[:output_file_name]!=nil |
|
217 |
- |
|
|
230 | + org_filename = link_output_file(test_request, | |
|
218 | 231 |
|
|
232 | + test_request.output_file_name = translate_output_filename(org_filename) | |
|
219 | 233 | end |
|
220 | 234 | test_request.graded_at = Time.now |
|
221 | 235 | test_request.compiler_message = (result[:cmp_msg] or '') |
|
222 | 236 | test_request.grader_comment = (result[:comment] or '') |
|
223 | 237 | if result[:running_stat]!=nil |
|
224 | 238 | test_request.running_stat = (result[:running_stat][:msg] or '') |
@@ -229,12 +243,18 | |||
|
229 | 243 | test_request.running_stat = '' |
|
230 | 244 | end |
|
231 | 245 | test_request.save |
|
232 | 246 | end |
|
233 | 247 | |
|
234 | 248 | protected |
|
249 | + def translate_output_filename(filename) | |
|
250 | + return Grader::translate_filepath(filename, | |
|
251 | + 'output', | |
|
252 | + @config.test_request_org_output_base_dir) | |
|
253 | + end | |
|
254 | + | |
|
235 | 255 | def link_output_file(test_request, fname) |
|
236 | 256 | target_file_name = random_output_file_name(test_request.user, |
|
237 | 257 | test_request.problem) |
|
238 | 258 | FileUtils.mkdir_p(File.dirname(target_file_name)) |
|
239 | 259 | Grader::link_or_copy("#{fname}", "#{target_file_name}") |
|
240 | 260 | return target_file_name |
You need to be logged in to leave comments.
Login now