cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r181:5c6f0b732e70` public

parent | child

Description:

handle the case when problem id or submission id is null. Grader will simply skip such request. Add more report on console (for command line grading) (mercurial grafted from d233105d3965c5368c9b33125f390e39b25f910e)

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r181:5c6f0b732e70 - Tue, 12 Aug 2014 08:44:55 - 2 files changed: 30 inserted, 30 deleted

grader ¶ +1 -1

                   puts "Grading: #{problem.name}"
                   runner.grade_problem(problem,
                                        :user_conditions => lambda do |u|
                                          u.contest_finished? and
                                            u.contest_ids.include?(contest.id)
                                        end)
                 end
                 if options[:report]
                   result_collector.print_report_by_user
                 end
               end
               def grader_grade_submissions(grader_proc, options)
                 engine = Grader::Engine.new
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
                 ARGV.each do |sub_id|
                   puts "Grading #{sub_id}"
                   begin
                     submission = Submission.find(sub_id.to_i)
                   rescue ActiveRecord::RecordNotFound
-            -       puts "Record not found"
+            +       puts "Submission #{sub_id} not found"
                     submission = nil
                   end
                   if submission!=nil
                     runner.grade_submission(submission)
                   end
                 end
               end
               #########################################
               # main program
               #########################################
               options = process_options_and_stop_file
               GRADER_ENV = options[:environment]
               grader_mode = options[:mode]
               dry_run = options[:dry_run]
               puts "environment: #{GRADER_ENV}"
               require File.join(File.dirname(__FILE__),'config/environment')
               # add grader_mode to config
               # this is needed because method log needs it.  TODO: clean this up
               class << config

lib/engine.rb ¶ +29 -29

                   def initialize(options={})
                     # default options
                     if not options.include? :room_maker
                       options[:room_maker] = Grader::SubmissionRoomMaker.new
                     end
                     if not options.include? :reporter
                       options[:reporter] =  Grader::SubmissionReporter.new
                     end
                     @config = Grader::Configuration.get_instance
                     @room_maker = options[:room_maker]
                     @reporter = options[:reporter]
                   end
                   # takes a submission, asks room_maker to produce grading directories,
                   # calls grader scripts, and asks reporter to save the result
                   def grade(submission)
                     current_dir = FileUtils.pwd
                     user = submission.user
                     problem = submission.problem
-            -       # TODO: will have to create real exception for this
+            +       begin
-            -       if user==nil or problem == nil
+            +         # TODO: will have to create real exception for this
-            -         @reporter.report_error(submission,"Grading error: problem with submission")
+            +         if user==nil or problem == nil
-            -         #raise "engine: user or problem is nil"
+            +           @reporter.report_error(submission,"Grading error: problem with submission")
-            -       end
+            +           raise "engine: user or problem is nil"
+            +         end
-            -       # TODO: this is another hack so that output only task can be judged
-            -       if submission.language!=nil
-            -         language = submission.language.name
-            -         lang_ext = submission.language.ext
-            -       else
-            -         language = 'c'
-            -         lang_ext = 'c'
-            -       end
-            -       # This is needed because older version of std-scripts/compile
+            +         # TODO: this is another hack so that output only task can be judged
-            -       # only look for c++.
+            +         if submission.language!=nil
-            -       if language == 'cpp'
+            +           language = submission.language.name
-            -         language = 'c++'
+            +           lang_ext = submission.language.ext
-            -       end
+            +         else
+            +           language = 'c'
+            +           lang_ext = 'c'
+            +         end
-            -       # COMMENT: should it be only source.ext?
+            +         # This is needed because older version of std-scripts/compile
-            -       if problem!=nil
+            +         # only look for c++.
-            -         source_name = "#{problem.name}.#{lang_ext}"
+            +         if language == 'cpp'
-            -       else
+            +           language = 'c++'
-            -         source_name = "source.#{lang_ext}"
+            +         end
-            -       end
-            -       begin
+            +         # COMMENT: should it be only source.ext?
+            +         if problem!=nil
+            +           source_name = "#{problem.name}.#{lang_ext}"
+            +         else
+            +           source_name = "source.#{lang_ext}"
+            +         end
+            +
                       grading_dir = @room_maker.produce_grading_room(submission)
                       @room_maker.save_source(submission,source_name)
                       problem_home = @room_maker.find_problem_home(submission)
                       # puts "GRADING DIR: #{grading_dir}"
                       # puts "PROBLEM DIR: #{problem_home}"
                       if !FileTest.exist?(problem_home)
                         puts "PROBLEM DIR: #{problem_home}"
-            -           puts "No test data. (check problem dir)"
+            +           raise "engine: No test data."
-            -           raise "No test data."
                       end
                       dinit = DirInit::Manager.new(problem_home)
                       dinit.setup do
                         copy_log = copy_script(problem_home)
                         save_copy_log(problem_home,copy_log)
                       end
                       call_judge(problem_home,language,grading_dir,source_name)
                       @reporter.report(submission,"#{grading_dir}/test-result")
                       dinit.teardown do
                         copy_log = load_copy_log(problem_home)
                         clear_copy_log(problem_home)
                         clear_script(copy_log,problem_home)
                       end
                     rescue RuntimeError => msg
                       @reporter.report_error(submission, msg)
+            +         puts "ERROR: #{msg}"
                     ensure
                       @room_maker.clean_up(submission)
                       Dir.chdir(current_dir)   # this is really important
                     end
                   end
                   protected
                   def talk(str)
                     if @config.talkative
                       puts str
                     end
                   end
                   def call_judge(problem_home,language,grading_dir,fname)
                     ENV['PROBLEM_HOME'] = problem_home
                     ENV['RUBYOPT'] = ''
                     talk grading_dir
                     Dir.chdir grading_dir
                     cmd = "#{problem_home}/script/judge #{language} #{fname}"
                     talk "CMD: #{cmd}"
                     system(cmd)
                   end
                   def get_std_script_dir
                     GRADER_ROOT + '/std-script'
                   end
                   def copy_script(problem_home)
                     script_dir = "#{problem_home}/script"
                     std_script_dir = get_std_script_dir
-            -       raise "std-script directory not found" if !FileTest.exist?(std_script_dir)
+            +       raise "engine: std-script directory not found" if !FileTest.exist?(std_script_dir)
                     scripts = Dir[std_script_dir + '/*']
                     copied = []
                     scripts.each do |s|
                       fname = File.basename(s)
                       next if FileTest.directory?(s)
                       if !FileTest.exist?("#{script_dir}/#{fname}")
                         copied << fname
                         FileUtils.cp(s, "#{script_dir}", :preserve => true)
                       end
                     end
                     return copied
                   end
                   def copy_log_filename(problem_home)
                     return File.join(problem_home, '.scripts_copied')
                   end
                   def save_copy_log(problem_home, log)
                     f = File.new(copy_log_filename(problem_home),"w")
                     log.each do |fname|

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r181:5c6f0b732e70 - Tue, 12 Aug 2014 08:44:55 - 2 files changed: 30 inserted, 30 deleted

Sign in to your account

Commit r181:5c6f0b732e70 public

Author

r181:5c6f0b732e70 - Tue, 12 Aug 2014 08:44:55 - 2 files changed: 30 inserted, 30 deleted

Commit `r181:5c6f0b732e70` public