cafe-grader-judge-scripts

Commit r148:8026f5b1cfca public

parent | child
Description:
fix logg() in compile, add more logging to engine.rb when the problem cannot be found
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

r148:8026f5b1cfca - - 2 files changed: 4 inserted, 2 deleted

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