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 | 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

r91:5df0d71260f4 - - 2 files changed: 42 inserted, 16 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -60,13 +60,20
60 60 # main program
61 61 #########################################
62 62
63 - # with --help
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
64 71 if (ARGV.length==1) and (/help/.match(ARGV[0]))
65 72 display_manual
66 73 exit(0)
67 74 end
68 75
69 - # reading environment and options
76 + # Process 'stop' option.
70 77 if (ARGV.length >= 1) and (ARGV[0]=='stop')
71 78 if ARGV.length==1
72 79 puts "you should specify pid-list or 'all'"
@@ -84,22 +91,43
84 91 exit(0)
85 92 end
86 93
94 + # Check stop file.
87 95 if check_stopfile
88 96 puts "Stop file exists. Terminated."
89 97 clear_stopfile
90 98 exit(0)
91 99 end
92 100
93 - grader_mode = 'queue'
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
94 111 if ARGV.length >= 1
95 - GRADER_ENV = ARGV[0]
96 - if ARGV.length >=2
97 - grader_mode = ARGV[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)
98 120 end
99 - else
100 - GRADER_ENV = 'exam'
121 +
122 + return options
101 123 end
102 124
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]
130 +
103 131 puts "environment: #{GRADER_ENV}"
104 132 require File.join(File.dirname(__FILE__),'config/environment')
105 133
@@ -170,14 +198,11
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
@@ -193,9 +218,6
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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -32,8 +32,9
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)
@@ -115,8 +116,11
115 116 submission.grader_comment = comment
116 117 end
117 118 submission.compiler_message = result[:cmp_msg] or ''
119 +
120 + if not @dry_run
118 121 submission.save
119 122 end
123 + end
120 124
121 125 end
122 126
You need to be logged in to leave comments. Login now