cafe-grader-judge-scripts

Commit r122:ed471e6e96ca public

parent | child
Description:
added after_save_hook to ResultCollector
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

r122:ed471e6e96ca - - 1 file changed: 15 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -111,13 +111,13
111 if options[:dry_run] and (not ['prob','contest','autonew'].include? options[:mode])
111 if options[:dry_run] and (not ['prob','contest','autonew'].include? options[:mode])
112 puts "Dry run currently works only for 'prob' or 'contest' modes."
112 puts "Dry run currently works only for 'prob' or 'contest' modes."
113 exit(0)
113 exit(0)
114 end
114 end
115
115
116 options[:report] = (ARGV.delete('--report') != nil)
116 options[:report] = (ARGV.delete('--report') != nil)
117 - if options[:report] and (not ['prob','contest'].include? options[:mode])
117 + if options[:report] and (not ['prob','contest','autonew'].include? options[:mode])
118 puts "Report currently works only for 'prob' or 'contest' modes."
118 puts "Report currently works only for 'prob' or 'contest' modes."
119 exit(0)
119 exit(0)
120 end
120 end
121
121
122 return options
122 return options
123 end
123 end
@@ -126,20 +126,25
126 def initialize
126 def initialize
127 @results = {}
127 @results = {}
128 @problems = {}
128 @problems = {}
129 @users = {}
129 @users = {}
130 end
130 end
131
131
132 + def after_save_hook(user, problem, grading_result)
133 + end
134 +
132 def save(user, problem, grading_result)
135 def save(user, problem, grading_result)
133 if not @problems.has_key? problem.id
136 if not @problems.has_key? problem.id
134 @problems[problem.id] = problem
137 @problems[problem.id] = problem
135 end
138 end
136 if not @users.has_key? user.id
139 if not @users.has_key? user.id
137 @users[user.id] = user
140 @users[user.id] = user
138 end
141 end
139 @results[[user.id, problem.id]] = grading_result
142 @results[[user.id, problem.id]] = grading_result
143 +
144 + after_save_hook(user, problem, grading_result)
140 end
145 end
141
146
142 def print_report_by_user
147 def print_report_by_user
143 puts "---------------------"
148 puts "---------------------"
144 puts " REPORT"
149 puts " REPORT"
145 puts "---------------------"
150 puts "---------------------"
@@ -199,17 +204,25
199 end
204 end
200 end
205 end
201
206
202 def grader_autonew_loop(grader_proc, options)
207 def grader_autonew_loop(grader_proc, options)
203 log "Grader: autonew"
208 log "Grader: autonew"
204
209
210 + if options[:report]
211 + result_collector = ResultCollector.new
212 + else
213 + result_collector = nil
214 + end
215 +
205 if options[:dry_run]
216 if options[:dry_run]
206 puts "Running in dry mode"
217 puts "Running in dry mode"
207 end
218 end
208
219
209 - prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run])
220 + prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run],
221 + :result_collector => result_collector)
222 +
210 engine = Grader::Engine.new(:reporter => prob_reporter)
223 engine = Grader::Engine.new(:reporter => prob_reporter)
211 runner = Grader::Runner.new(engine, grader_proc)
224 runner = Grader::Runner.new(engine, grader_proc)
212
225
213 grader_proc.report_active if grader_proc!=nil
226 grader_proc.report_active if grader_proc!=nil
214
227
215 latest_submitted_at = nil
228 latest_submitted_at = nil
You need to be logged in to leave comments. Login now