cafe-grader-judge-scripts

Commit r196:4097795ac013 public

parent | child
Description:
Merge pull request #1 from jittat/master Merge from origin
Commit status:
[Not Reviewed]
References:
merge 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

r196:4097795ac013 - - 3 files changed: 9 inserted, 7 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -355,13 +355,13
355
355
356 ARGV.each do |sub_id|
356 ARGV.each do |sub_id|
357 puts "Grading #{sub_id}"
357 puts "Grading #{sub_id}"
358 begin
358 begin
359 submission = Submission.find(sub_id.to_i)
359 submission = Submission.find(sub_id.to_i)
360 rescue ActiveRecord::RecordNotFound
360 rescue ActiveRecord::RecordNotFound
361 - puts "Record not found"
361 + puts "Submission #{sub_id} not found"
362 submission = nil
362 submission = nil
363 end
363 end
364
364
365 if submission!=nil
365 if submission!=nil
366 runner.grade_submission(submission)
366 runner.grade_submission(submission)
367 end
367 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -33,16 +33,17
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 + begin
39 # TODO: will have to create real exception for this
40 # TODO: will have to create real exception for this
40 if user==nil or problem == nil
41 if user==nil or problem == nil
41 @reporter.report_error(submission,"Grading error: problem with submission")
42 @reporter.report_error(submission,"Grading error: problem with submission")
42 - #raise "engine: user or problem is nil"
43 + raise "engine: user or problem is nil"
43 end
44 end
44
45
45 # TODO: this is another hack so that output only task can be judged
46 # TODO: this is another hack so that output only task can be judged
46 if submission.language!=nil
47 if submission.language!=nil
47 language = submission.language.name
48 language = submission.language.name
48 lang_ext = submission.language.ext
49 lang_ext = submission.language.ext
@@ -61,22 +62,22
61 if problem!=nil
62 if problem!=nil
62 source_name = "#{problem.name}.#{lang_ext}"
63 source_name = "#{problem.name}.#{lang_ext}"
63 else
64 else
64 source_name = "source.#{lang_ext}"
65 source_name = "source.#{lang_ext}"
65 end
66 end
66
67
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 - raise "No test data."
76 + puts "PROBLEM DIR: #{problem_home}"
77 + raise "engine: No test data."
77 end
78 end
78
79
79 dinit = DirInit::Manager.new(problem_home)
80 dinit = DirInit::Manager.new(problem_home)
80
81
81 dinit.setup do
82 dinit.setup do
82 copy_log = copy_script(problem_home)
83 copy_log = copy_script(problem_home)
@@ -92,12 +93,13
92 clear_copy_log(problem_home)
93 clear_copy_log(problem_home)
93 clear_script(copy_log,problem_home)
94 clear_script(copy_log,problem_home)
94 end
95 end
95
96
96 rescue RuntimeError => msg
97 rescue RuntimeError => msg
97 @reporter.report_error(submission, msg)
98 @reporter.report_error(submission, msg)
99 + puts "ERROR: #{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
@@ -126,13 +128,13
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 "engine: 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|
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -8,20 +8,20
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(msg)
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")} #{msg}")
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++"
You need to be logged in to leave comments. Login now