Description:
merge bugfix from the main branch
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r149:84ba9b0dee25 - - 2 files changed: 4 inserted, 2 deleted
@@ -1,171 +1,173 | |||||
|
1 | require 'fileutils' |
|
1 | require 'fileutils' |
|
2 | require File.join(File.dirname(__FILE__),'dir_init') |
|
2 | require File.join(File.dirname(__FILE__),'dir_init') |
|
3 |
|
3 | ||
|
4 | module Grader |
|
4 | module Grader |
|
5 |
|
5 | ||
|
6 | # |
|
6 | # |
|
7 | # A grader engine grades a submission, against anything: a test |
|
7 | # A grader engine grades a submission, against anything: a test |
|
8 | # data, or a user submitted test data. It uses two helpers objects: |
|
8 | # data, or a user submitted test data. It uses two helpers objects: |
|
9 | # room_maker and reporter. |
|
9 | # room_maker and reporter. |
|
10 | # |
|
10 | # |
|
11 | class Engine |
|
11 | class Engine |
|
12 |
|
12 | ||
|
13 | attr_writer :room_maker |
|
13 | attr_writer :room_maker |
|
14 | attr_writer :reporter |
|
14 | attr_writer :reporter |
|
15 |
|
15 | ||
|
16 | def initialize(options={}) |
|
16 | def initialize(options={}) |
|
17 | # default options |
|
17 | # default options |
|
18 | if not options.include? :room_maker |
|
18 | if not options.include? :room_maker |
|
19 | options[:room_maker] = Grader::SubmissionRoomMaker.new |
|
19 | options[:room_maker] = Grader::SubmissionRoomMaker.new |
|
20 | end |
|
20 | end |
|
21 | if not options.include? :reporter |
|
21 | if not options.include? :reporter |
|
22 | options[:reporter] = Grader::SubmissionReporter.new |
|
22 | options[:reporter] = Grader::SubmissionReporter.new |
|
23 | end |
|
23 | end |
|
24 |
|
24 | ||
|
25 | @config = Grader::Configuration.get_instance |
|
25 | @config = Grader::Configuration.get_instance |
|
26 |
|
26 | ||
|
27 | @room_maker = options[:room_maker] |
|
27 | @room_maker = options[:room_maker] |
|
28 | @reporter = options[:reporter] |
|
28 | @reporter = options[:reporter] |
|
29 | end |
|
29 | end |
|
30 |
|
30 | ||
|
31 | # takes a submission, asks room_maker to produce grading directories, |
|
31 | # takes a submission, asks room_maker to produce grading directories, |
|
32 | # calls grader scripts, and asks reporter to save the result |
|
32 | # calls grader scripts, and asks reporter to save the result |
|
33 | def grade(submission) |
|
33 | def grade(submission) |
|
34 | current_dir = FileUtils.pwd |
|
34 | current_dir = FileUtils.pwd |
|
35 |
|
35 | ||
|
36 | user = submission.user |
|
36 | user = submission.user |
|
37 | problem = submission.problem |
|
37 | problem = submission.problem |
|
38 |
|
38 | ||
|
39 | # TODO: will have to create real exception for this |
|
39 | # TODO: will have to create real exception for this |
|
40 | if user==nil or problem == nil |
|
40 | if user==nil or problem == nil |
|
41 | @reporter.report_error(submission,"Grading error: problem with submission") |
|
41 | @reporter.report_error(submission,"Grading error: problem with submission") |
|
42 | #raise "engine: user or problem is nil" |
|
42 | #raise "engine: user or problem is nil" |
|
43 | end |
|
43 | end |
|
44 |
|
44 | ||
|
45 | # TODO: this is another hack so that output only task can be judged |
|
45 | # TODO: this is another hack so that output only task can be judged |
|
46 | if submission.language!=nil |
|
46 | if submission.language!=nil |
|
47 | language = submission.language.name |
|
47 | language = submission.language.name |
|
48 | lang_ext = submission.language.ext |
|
48 | lang_ext = submission.language.ext |
|
49 | else |
|
49 | else |
|
50 | language = 'c' |
|
50 | language = 'c' |
|
51 | lang_ext = 'c' |
|
51 | lang_ext = 'c' |
|
52 | end |
|
52 | end |
|
53 |
|
53 | ||
|
54 | # This is needed because older version of std-scripts/compile |
|
54 | # This is needed because older version of std-scripts/compile |
|
55 | # only look for c++. |
|
55 | # only look for c++. |
|
56 | if language == 'cpp' |
|
56 | if language == 'cpp' |
|
57 | language = 'c++' |
|
57 | language = 'c++' |
|
58 | end |
|
58 | end |
|
59 |
|
59 | ||
|
60 | # COMMENT: should it be only source.ext? |
|
60 | # COMMENT: should it be only source.ext? |
|
61 | if problem!=nil |
|
61 | if problem!=nil |
|
62 | source_name = "#{problem.name}.#{lang_ext}" |
|
62 | source_name = "#{problem.name}.#{lang_ext}" |
|
63 | else |
|
63 | else |
|
64 | source_name = "source.#{lang_ext}" |
|
64 | source_name = "source.#{lang_ext}" |
|
65 | end |
|
65 | end |
|
66 |
|
66 | ||
|
67 | begin |
|
67 | begin |
|
68 | grading_dir = @room_maker.produce_grading_room(submission) |
|
68 | grading_dir = @room_maker.produce_grading_room(submission) |
|
69 | @room_maker.save_source(submission,source_name) |
|
69 | @room_maker.save_source(submission,source_name) |
|
70 | problem_home = @room_maker.find_problem_home(submission) |
|
70 | problem_home = @room_maker.find_problem_home(submission) |
|
71 |
|
71 | ||
|
72 | # puts "GRADING DIR: #{grading_dir}" |
|
72 | # puts "GRADING DIR: #{grading_dir}" |
|
73 | # puts "PROBLEM DIR: #{problem_home}" |
|
73 | # puts "PROBLEM DIR: #{problem_home}" |
|
74 |
|
74 | ||
|
75 | if !FileTest.exist?(problem_home) |
|
75 | if !FileTest.exist?(problem_home) |
|
|
76 | + puts "PROBLEM DIR: #{problem_home}" | ||
|
|
77 | + puts "No test data. (check problem dir)" | ||
|
76 | raise "No test data." |
|
78 | raise "No test data." |
|
77 | end |
|
79 | end |
|
78 |
|
80 | ||
|
79 | dinit = DirInit::Manager.new(problem_home) |
|
81 | dinit = DirInit::Manager.new(problem_home) |
|
80 |
|
82 | ||
|
81 | dinit.setup do |
|
83 | dinit.setup do |
|
82 | copy_log = copy_script(problem_home) |
|
84 | copy_log = copy_script(problem_home) |
|
83 | save_copy_log(problem_home,copy_log) |
|
85 | save_copy_log(problem_home,copy_log) |
|
84 | end |
|
86 | end |
|
85 |
|
87 | ||
|
86 | call_judge(problem_home,language,grading_dir,source_name) |
|
88 | call_judge(problem_home,language,grading_dir,source_name) |
|
87 |
|
89 | ||
|
88 | @reporter.report(submission,"#{grading_dir}/test-result") |
|
90 | @reporter.report(submission,"#{grading_dir}/test-result") |
|
89 |
|
91 | ||
|
90 | dinit.teardown do |
|
92 | dinit.teardown do |
|
91 | copy_log = load_copy_log(problem_home) |
|
93 | copy_log = load_copy_log(problem_home) |
|
92 | clear_copy_log(problem_home) |
|
94 | clear_copy_log(problem_home) |
|
93 | clear_script(copy_log,problem_home) |
|
95 | clear_script(copy_log,problem_home) |
|
94 | end |
|
96 | end |
|
95 |
|
97 | ||
|
96 | rescue RuntimeError => msg |
|
98 | rescue RuntimeError => msg |
|
97 | @reporter.report_error(submission, msg) |
|
99 | @reporter.report_error(submission, msg) |
|
98 |
|
100 | ||
|
99 | ensure |
|
101 | ensure |
|
100 | @room_maker.clean_up(submission) |
|
102 | @room_maker.clean_up(submission) |
|
101 | Dir.chdir(current_dir) # this is really important |
|
103 | Dir.chdir(current_dir) # this is really important |
|
102 | end |
|
104 | end |
|
103 | end |
|
105 | end |
|
104 |
|
106 | ||
|
105 | protected |
|
107 | protected |
|
106 |
|
108 | ||
|
107 | def talk(str) |
|
109 | def talk(str) |
|
108 | if @config.talkative |
|
110 | if @config.talkative |
|
109 | puts str |
|
111 | puts str |
|
110 | end |
|
112 | end |
|
111 | end |
|
113 | end |
|
112 |
|
114 | ||
|
113 | def call_judge(problem_home,language,grading_dir,fname) |
|
115 | def call_judge(problem_home,language,grading_dir,fname) |
|
114 | ENV['PROBLEM_HOME'] = problem_home |
|
116 | ENV['PROBLEM_HOME'] = problem_home |
|
115 | ENV['RUBYOPT'] = '' |
|
117 | ENV['RUBYOPT'] = '' |
|
116 |
|
118 | ||
|
117 | talk grading_dir |
|
119 | talk grading_dir |
|
118 | Dir.chdir grading_dir |
|
120 | Dir.chdir grading_dir |
|
119 | cmd = "#{problem_home}/script/judge #{language} #{fname}" |
|
121 | cmd = "#{problem_home}/script/judge #{language} #{fname}" |
|
120 | talk "CMD: #{cmd}" |
|
122 | talk "CMD: #{cmd}" |
|
121 | system(cmd) |
|
123 | system(cmd) |
|
122 | end |
|
124 | end |
|
123 |
|
125 | ||
|
124 | def get_std_script_dir |
|
126 | def get_std_script_dir |
|
125 | GRADER_ROOT + '/std-script' |
|
127 | GRADER_ROOT + '/std-script' |
|
126 | end |
|
128 | end |
|
127 |
|
129 | ||
|
128 | def copy_script(problem_home) |
|
130 | def copy_script(problem_home) |
|
129 | script_dir = "#{problem_home}/script" |
|
131 | script_dir = "#{problem_home}/script" |
|
130 | std_script_dir = get_std_script_dir |
|
132 | std_script_dir = get_std_script_dir |
|
131 |
|
133 | ||
|
132 | raise "std-script directory not found" if !FileTest.exist?(std_script_dir) |
|
134 | raise "std-script directory not found" if !FileTest.exist?(std_script_dir) |
|
133 |
|
135 | ||
|
134 | scripts = Dir[std_script_dir + '/*'] |
|
136 | scripts = Dir[std_script_dir + '/*'] |
|
135 |
|
137 | ||
|
136 | copied = [] |
|
138 | copied = [] |
|
137 |
|
139 | ||
|
138 | scripts.each do |s| |
|
140 | scripts.each do |s| |
|
139 | fname = File.basename(s) |
|
141 | fname = File.basename(s) |
|
140 | next if FileTest.directory?(s) |
|
142 | next if FileTest.directory?(s) |
|
141 | if !FileTest.exist?("#{script_dir}/#{fname}") |
|
143 | if !FileTest.exist?("#{script_dir}/#{fname}") |
|
142 | copied << fname |
|
144 | copied << fname |
|
143 | FileUtils.cp(s, "#{script_dir}", :preserve => true) |
|
145 | FileUtils.cp(s, "#{script_dir}", :preserve => true) |
|
144 | end |
|
146 | end |
|
145 | end |
|
147 | end |
|
146 |
|
148 | ||
|
147 | return copied |
|
149 | return copied |
|
148 | end |
|
150 | end |
|
149 |
|
151 | ||
|
150 | def copy_log_filename(problem_home) |
|
152 | def copy_log_filename(problem_home) |
|
151 | return File.join(problem_home, '.scripts_copied') |
|
153 | return File.join(problem_home, '.scripts_copied') |
|
152 | end |
|
154 | end |
|
153 |
|
155 | ||
|
154 | def save_copy_log(problem_home, log) |
|
156 | def save_copy_log(problem_home, log) |
|
155 | f = File.new(copy_log_filename(problem_home),"w") |
|
157 | f = File.new(copy_log_filename(problem_home),"w") |
|
156 | log.each do |fname| |
|
158 | log.each do |fname| |
|
157 | f.write("#{fname}\n") |
|
159 | f.write("#{fname}\n") |
|
158 | end |
|
160 | end |
|
159 | f.close |
|
161 | f.close |
|
160 | end |
|
162 | end |
|
161 |
|
163 | ||
|
162 | def load_copy_log(problem_home) |
|
164 | def load_copy_log(problem_home) |
|
163 | f = File.new(copy_log_filename(problem_home),"r") |
|
165 | f = File.new(copy_log_filename(problem_home),"r") |
|
164 | log = [] |
|
166 | log = [] |
|
165 | f.readlines.each do |line| |
|
167 | f.readlines.each do |line| |
|
166 | log << line.strip |
|
168 | log << line.strip |
|
167 | end |
|
169 | end |
|
168 | f.close |
|
170 | f.close |
|
169 | log |
|
171 | log |
|
170 | end |
|
172 | end |
|
171 |
|
173 |
@@ -1,117 +1,117 | |||||
|
1 | #!/usr/bin/env ruby |
|
1 | #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | require 'fileutils' |
|
3 | require 'fileutils' |
|
4 |
|
4 | ||
|
5 | ############################## |
|
5 | ############################## |
|
6 | # |
|
6 | # |
|
7 | # Standard Compile Script |
|
7 | # Standard Compile Script |
|
8 | # |
|
8 | # |
|
9 | # Supported compilers: |
|
9 | # Supported compilers: |
|
10 | # gcc, g++, and fpc. |
|
10 | # gcc, g++, and fpc. |
|
11 | # |
|
11 | # |
|
12 | ############################## |
|
12 | ############################## |
|
13 |
|
13 | ||
|
14 |
- def talk( |
|
14 | + def talk(str='') |
|
15 | if ENV['TALKATIVE']!=nil |
|
15 | if ENV['TALKATIVE']!=nil |
|
16 | puts str |
|
16 | puts str |
|
17 | end |
|
17 | end |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
20 | fp = File.open(log_fname,"a") |
|
20 | fp = File.open(log_fname,"a") |
|
21 |
- fp.puts("run: #{Time.new.strftime("%H:%M")} #{ |
|
21 | + fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}") |
|
22 | fp.close |
|
22 | fp.close |
|
23 | end |
|
23 | end |
|
24 | end |
|
24 | end |
|
25 |
|
25 | ||
|
26 | C_COMPILER = "/usr/bin/gcc" |
|
26 | C_COMPILER = "/usr/bin/gcc" |
|
27 | CPLUSPLUS_COMPILER = "/usr/bin/g++" |
|
27 | CPLUSPLUS_COMPILER = "/usr/bin/g++" |
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
29 | JAVA_COMPILER = "/usr/bin/javac" |
|
29 | JAVA_COMPILER = "/usr/bin/javac" |
|
30 | RUBY_INTEPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby" |
|
30 | RUBY_INTEPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby" |
|
31 |
|
31 | ||
|
32 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
32 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
33 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
33 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
34 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
34 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
35 | JAVA_OPTIONS = "" |
|
35 | JAVA_OPTIONS = "" |
|
36 |
|
36 | ||
|
37 | # Check for the correct number of arguments. Otherwise, print usage. |
|
37 | # Check for the correct number of arguments. Otherwise, print usage. |
|
38 | if ARGV.length == 0 or ARGV.length > 4 |
|
38 | if ARGV.length == 0 or ARGV.length > 4 |
|
39 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
39 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
40 | puts |
|
40 | puts |
|
41 | puts "<source-file> is defaulted to \"source\"." |
|
41 | puts "<source-file> is defaulted to \"source\"." |
|
42 | puts "<output-file> is defaulted to \"a.out\"." |
|
42 | puts "<output-file> is defaulted to \"a.out\"." |
|
43 | puts "<message-file> is defaulted to \"compiler_message\"." |
|
43 | puts "<message-file> is defaulted to \"compiler_message\"." |
|
44 | puts |
|
44 | puts |
|
45 | exit(127) |
|
45 | exit(127) |
|
46 | end |
|
46 | end |
|
47 |
|
47 | ||
|
48 | PARAMS = { |
|
48 | PARAMS = { |
|
49 | :source_file => [1,'source'], |
|
49 | :source_file => [1,'source'], |
|
50 | :output_file => [2,'a.out'], |
|
50 | :output_file => [2,'a.out'], |
|
51 | :message_file => [3,'compiler_message'] |
|
51 | :message_file => [3,'compiler_message'] |
|
52 | } |
|
52 | } |
|
53 |
|
53 | ||
|
54 | params = {} |
|
54 | params = {} |
|
55 | params[:prog_lang] = ARGV[0] |
|
55 | params[:prog_lang] = ARGV[0] |
|
56 | PARAMS.each_key do |param_name| |
|
56 | PARAMS.each_key do |param_name| |
|
57 | index, default = PARAMS[param_name] |
|
57 | index, default = PARAMS[param_name] |
|
58 | if ARGV.length > index |
|
58 | if ARGV.length > index |
|
59 | params[param_name] = ARGV[index] |
|
59 | params[param_name] = ARGV[index] |
|
60 | else |
|
60 | else |
|
61 | params[param_name] = default |
|
61 | params[param_name] = default |
|
62 | end |
|
62 | end |
|
63 | talk "#{param_name}: #{params[param_name]}" |
|
63 | talk "#{param_name}: #{params[param_name]}" |
|
64 | end |
|
64 | end |
|
65 |
|
65 | ||
|
66 | # Remove any remaining output files or message files. |
|
66 | # Remove any remaining output files or message files. |
|
67 | if FileTest.exists? params[:output_file] |
|
67 | if FileTest.exists? params[:output_file] |
|
68 | FileUtils.rm(params[:output_file]) |
|
68 | FileUtils.rm(params[:output_file]) |
|
69 | end |
|
69 | end |
|
70 | if FileTest.exists? params[:message_file] |
|
70 | if FileTest.exists? params[:message_file] |
|
71 | FileUtils.rm(params[:message_file]) |
|
71 | FileUtils.rm(params[:message_file]) |
|
72 | end |
|
72 | end |
|
73 |
|
73 | ||
|
74 | # Check if the source file exists before attempt compiling. |
|
74 | # Check if the source file exists before attempt compiling. |
|
75 | if !FileTest.exists? params[:source_file] |
|
75 | if !FileTest.exists? params[:source_file] |
|
76 | talk("ERROR: The source file does not exist!") |
|
76 | talk("ERROR: The source file does not exist!") |
|
77 | open(params[:message_file],"w") do |f| |
|
77 | open(params[:message_file],"w") do |f| |
|
78 | f.puts "ERROR: The source file did not exist." |
|
78 | f.puts "ERROR: The source file did not exist." |
|
79 | end |
|
79 | end |
|
80 | exit(127) |
|
80 | exit(127) |
|
81 | end |
|
81 | end |
|
82 |
|
82 | ||
|
83 | if params[:prog_lang]=='cpp' |
|
83 | if params[:prog_lang]=='cpp' |
|
84 | params[:prog_lang] = 'c++' |
|
84 | params[:prog_lang] = 'c++' |
|
85 | end |
|
85 | end |
|
86 |
|
86 | ||
|
87 | # Compile. |
|
87 | # Compile. |
|
88 | case params[:prog_lang] |
|
88 | case params[:prog_lang] |
|
89 |
|
89 | ||
|
90 | when "c" |
|
90 | when "c" |
|
91 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
91 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
92 | system(command) |
|
92 | system(command) |
|
93 |
|
93 | ||
|
94 | when "c++" |
|
94 | when "c++" |
|
95 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
95 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
96 | system(command) |
|
96 | system(command) |
|
97 |
|
97 | ||
|
98 | when "pas" |
|
98 | when "pas" |
|
99 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
99 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
100 | system(command) |
|
100 | system(command) |
|
101 | FileUtils.mv("output", params[:output_file]) |
|
101 | FileUtils.mv("output", params[:output_file]) |
|
102 |
|
102 | ||
|
103 | when "java" |
|
103 | when "java" |
|
104 | #rename the file to the public class name |
|
104 | #rename the file to the public class name |
|
105 |
|
105 | ||
|
106 | #get the class name |
|
106 | #get the class name |
|
107 | classname = 'DUMMY' |
|
107 | classname = 'DUMMY' |
|
108 | File.foreach(params[:source_file]) do |line| |
|
108 | File.foreach(params[:source_file]) do |line| |
|
109 | md = /\s*public\s*class\s*(\w*)/.match(line) |
|
109 | md = /\s*public\s*class\s*(\w*)/.match(line) |
|
110 | classname=md[1] if md |
|
110 | classname=md[1] if md |
|
111 | end |
|
111 | end |
|
112 | system("cp #{params[:source_file]} #{classname}.java") |
|
112 | system("cp #{params[:source_file]} #{classname}.java") |
|
113 | command = "#{JAVA_COMPILER} #{classname}.java > #{params[:message_file]}" |
|
113 | command = "#{JAVA_COMPILER} #{classname}.java > #{params[:message_file]}" |
|
114 | system(command) |
|
114 | system(command) |
|
115 | File.open(params[:output_file],"w") {|file| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")} |
|
115 | File.open(params[:output_file],"w") {|file| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")} |
|
116 | File.chmod(0755, params[:output_file]) |
|
116 | File.chmod(0755, params[:output_file]) |
|
117 |
|
117 |
You need to be logged in to leave comments.
Login now