cafe-grader-judge-scripts

Commit r91:5df0d71260f4 public

parent | child
Description:
added --dry option to grader prob mode
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r91:5df0d71260f4 - - 2 files changed: 72 inserted, 46 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -39,87 +39,115
39 39 fp = File.open(log_file_name,"a")
40 40 fp.puts("GRADER: #{Time.new.strftime("%H:%M")} #{str}")
41 41 fp.close
42 42 end
43 43 end
44 44
45 45 def display_manual
46 46 puts <<USAGE
47 47 Grader.
48 48 using: (1) grader
49 49 (2) grader environment [mode]
50 50 (3) grader stop [all|pids-list]
51 51 (4) grader --help
52 52 (1) call grader with environment = 'exam', mode = 'queue'
53 53 (2) possible modes are: 'queue', 'prob', 'test_request'
54 54 (3) create stop-file to stop running grader in queue mode
55 55 (4) You are here.
56 56 USAGE
57 57 end
58 58
59 59 #########################################
60 60 # main program
61 61 #########################################
62 62
63 - # with --help
64 - if (ARGV.length==1) and (/help/.match(ARGV[0]))
65 - display_manual
66 - exit(0)
63 + # Reading environment and options.
64 +
65 + def process_options_and_stop_file
66 + # The list of options are:
67 + # - stop [all|process ids]
68 + # -
69 +
70 + # Process 'help' option
71 + if (ARGV.length==1) and (/help/.match(ARGV[0]))
72 + display_manual
73 + exit(0)
74 + end
75 +
76 + # Process 'stop' option.
77 + if (ARGV.length >= 1) and (ARGV[0]=='stop')
78 + if ARGV.length==1
79 + puts "you should specify pid-list or 'all'"
80 + display_manual
81 + elsif (ARGV.length==2) and (ARGV[1]=='all')
82 + stop_grader(:all)
83 + puts "A global stop file ('stop.all') created."
84 + puts "You should remove it manually later."
85 + else
86 + (1..ARGV.length-1).each do |i|
87 + stop_grader(ARGV[i])
88 + end
89 + puts "stop file(s) created"
90 + end
91 + exit(0)
92 + end
93 +
94 + # Check stop file.
95 + if check_stopfile
96 + puts "Stop file exists. Terminated."
97 + clear_stopfile
98 + exit(0)
99 + end
100 +
101 + #default options
102 + options = {
103 + :mode => 'queue',
104 + :environment => 'exam',
105 + :dry_run => false,
106 + }
107 +
108 + # Process mode and environment option
109 + if ARGV.length >= 1
110 + options[:environment] = ARGV.shift
111 + if ARGV.length >=1
112 + options[:mode] = ARGV.shift
113 + end
114 + end
115 +
116 + options[:dry_run] = (ARGV.delete('--dry') != nil)
117 + if options[:dry_run] and (not options[:mode] == 'prob')
118 + puts "Dry run currently works for 'prob' mode."
119 + exit(0)
120 + end
121 +
122 + return options
67 123 end
68 124
69 - # reading environment and options
70 - if (ARGV.length >= 1) and (ARGV[0]=='stop')
71 - if ARGV.length==1
72 - puts "you should specify pid-list or 'all'"
73 - display_manual
74 - elsif (ARGV.length==2) and (ARGV[1]=='all')
75 - stop_grader(:all)
76 - puts "A global stop file ('stop.all') created."
77 - puts "You should remove it manually later."
78 - else
79 - (1..ARGV.length-1).each do |i|
80 - stop_grader(ARGV[i])
81 - end
82 - puts "stop file(s) created"
83 - end
84 - exit(0)
85 - end
86 -
87 - if check_stopfile
88 - puts "Stop file exists. Terminated."
89 - clear_stopfile
90 - exit(0)
91 - end
92 -
93 - grader_mode = 'queue'
94 - if ARGV.length >= 1
95 - GRADER_ENV = ARGV[0]
96 - if ARGV.length >=2
97 - grader_mode = ARGV[1]
98 - end
99 - else
100 - GRADER_ENV = 'exam'
101 - end
125 + # ======= Main ========
126 + options = process_options_and_stop_file
127 + GRADER_ENV = options[:environment]
128 + grader_mode = options[:mode]
129 + dry_run = options[:dry_run]
102 130
103 131 puts "environment: #{GRADER_ENV}"
104 132 require File.join(File.dirname(__FILE__),'config/environment')
105 133
106 134 # add grader_mode to config
107 135 # this is needed because method log needs it. TODO: clean this up
108 136 class << config
109 137 attr_accessor :grader_mode
110 138 end
111 139 config.grader_mode = grader_mode
112 140
113 141 # reading rails environment
114 142 log 'Reading rails environment'
115 143
116 144 RAILS_ENV = config.rails_env
117 145 require RAILS_ROOT + '/config/environment'
118 146
119 147 # register grader process
120 148 if config.report_grader
121 149 grader_proc = GraderProcess.register(config.grader_hostname,
122 150 Process.pid,
123 151 grader_mode)
124 152 else
125 153 grader_proc = nil
@@ -149,69 +177,63
149 177 engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
150 178 Grader::TestRequestReporter.new)
151 179 end
152 180
153 181 runner = Grader::Runner.new(engine, grader_proc)
154 182 while true
155 183
156 184 if check_stopfile # created by calling grader stop
157 185 clear_stopfile
158 186 log "stopped (with stop file)"
159 187 break
160 188 end
161 189
162 190 if grader_mode=="queue"
163 191 task = runner.grade_oldest_task
164 192 else
165 193 task = runner.grade_oldest_test_request
166 194 end
167 195 if task==nil
168 196 sleep(1)
169 197 end
170 198 end
171 199
172 200 when "prob"
173 - engine = Grader::Engine.new
201 + engine = Grader::Engine.new(nil, Grader::SubmissionReporter.new(dry_run))
174 202 runner = Grader::Runner.new(engine, grader_proc)
175 203
176 204 grader_proc.report_active if grader_proc!=nil
177 205
178 - ARGV.shift
179 - ARGV.shift
180 -
181 206 ARGV.each do |prob_name|
182 207 prob = Problem.find_by_name(prob_name)
183 208 if prob==nil
184 209 puts "cannot find problem: #{prob_name}"
185 210 else
186 211 runner.grade_problem(prob)
187 212 end
188 213 end
189 214
190 215 when "sub"
191 216 engine = Grader::Engine.new
192 217 runner = Grader::Runner.new(engine, grader_proc)
193 218
194 219 grader_proc.report_active if grader_proc!=nil
195 220
196 - ARGV.shift
197 - ARGV.shift
198 -
199 221 ARGV.each do |sub_id|
200 222 puts "Grading #{sub_id}"
201 223 begin
202 224 submission = Submission.find(sub_id.to_i)
203 225 rescue ActiveRecord::RecordNotFound
204 226 puts "Record not found"
205 227 submission = nil
206 228 end
207 229
208 230 if submission!=nil
209 231 runner.grade_submission(submission)
210 232 end
211 233 end
212 234
213 235 else
214 236 display_manual
215 237 exit(0)
216 238 end
217 239
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,50 +11,51
11 11 grading_room = "#{@config.user_result_dir}/" +
12 12 "#{user.login}/#{problem.name}/#{submission.id}"
13 13
14 14 FileUtils.mkdir_p(grading_room)
15 15 grading_room
16 16 end
17 17
18 18 def find_problem_home(submission)
19 19 problem = submission.problem
20 20 "#{@config.problems_dir}/#{problem.name}"
21 21 end
22 22
23 23 def save_source(submission,source_name)
24 24 dir = self.produce_grading_room(submission)
25 25 f = File.open("#{dir}/#{source_name}","w")
26 26 f.write(submission.source)
27 27 f.close
28 28 end
29 29
30 30 def clean_up(submission)
31 31 end
32 32 end
33 33
34 34 class SubmissionReporter
35 - def initialize
35 + def initialize(dry_run=false)
36 36 @config = Grader::Configuration.get_instance
37 + @dry_run = dry_run
37 38 end
38 39
39 40 def report(sub,test_result_dir)
40 41 save_result(sub,read_result(test_result_dir))
41 42 end
42 43
43 44 def report_error(sub,msg)
44 45 save_result(sub,{:points => 0,
45 46 :comment => "Grading error: #{msg}" })
46 47 end
47 48
48 49 protected
49 50 def read_result(test_result_dir)
50 51 cmp_msg_fname = "#{test_result_dir}/compiler_message"
51 52 if FileTest.exist?(cmp_msg_fname)
52 53 cmp_file = File.open(cmp_msg_fname)
53 54 cmp_msg = cmp_file.read
54 55 cmp_file.close
55 56 else
56 57 cmp_msg = ""
57 58 end
58 59
59 60 result_fname = "#{test_result_dir}/result"
60 61 comment_fname = "#{test_result_dir}/comment"
@@ -94,30 +95,33
94 95 end
95 96
96 97 def save_result(submission,result)
97 98 problem = submission.problem
98 99 submission.graded_at = Time.now.gmtime
99 100 points = result[:points]
100 101 submission.points = points
101 102 comment = @config.report_comment(result[:comment])
102 103
103 104 #
104 105 # TODO: FIX THIS MESSAGE
105 106 #
106 107 if problem == nil
107 108 submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)'
108 109 elsif points == problem.full_score
109 110 #submission.grader_comment = 'PASSED: ' + comment
110 111 submission.grader_comment = comment
111 112 elsif result[:comment].chomp =~ /^[\[\]P]+$/
112 113 submission.grader_comment = 'PASSED: ' + comment + '(inconsistent score)'
113 114 else
114 115 #submission.grader_comment = 'FAILED: ' + comment
115 116 submission.grader_comment = comment
116 117 end
117 118 submission.compiler_message = result[:cmp_msg] or ''
118 - submission.save
119 +
120 + if not @dry_run
121 + submission.save
122 + end
119 123 end
120 124
121 125 end
122 126
123 127 end
You need to be logged in to leave comments. Login now