cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r200:3db773289a2d` public

parent | child

Description:

Merge pull request #6 from nattee/master add options for grading all submissions of a specific problem

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r200:3db773289a2d - Thu, 11 Sep 2014 11:05:40 - 2 files changed: 28 inserted, 7 deleted

grader ¶ +18 -2

                 end
                 if config.logging
                   fp = File.open(log_file_name,"a")
                   fp.puts("GRADER: #{Time.new.strftime("%H:%M")} #{str}")
                   fp.close
                 end
               end
               def display_manual
                 puts <<USAGE
               Grader.
               using: (1) grader
-            -        (2) grader environment [mode]
+            +        (2) grader environment [mode] [options]
                      (3) grader stop [all|pids-list]
                      (4) grader --help
               (1) call grader with environment = 'exam', mode = 'queue'
               (2) possible modes are: 'queue', 'test_request', 'prob', 'sub', 'contest', and 'autonew'
+            +   queue: repeatedly check the task queue and grade any available tasks
+            +
+            +   prob:  re-grade every user latest submission of the specific problem.
+            +          the problem name must be specified by the next argument.
+            +
+            +          additional options:
+            +
+            +             --all-sub    re-grade every submissions instead of just the latest submission of each user.
+            +   sub:   re-grader the specified submission.
+            +          The submission ID to be re-graded must be specified by the next argument.
+            +
               (3) create stop-file to stop running grader in queue mode
               (4) You are here.
               USAGE
               end
               def process_options_and_stop_file
                 # The list of options are:
                 #   - stop [all|process ids]
                 #   -
                 # Process 'help' option
                 if (ARGV.length==1) and (/help/.match(ARGV[0]))
                 options = {
                   :mode => 'queue',
                   :environment => 'exam',
                   :dry_run => false,
                 }
                 # Process mode and environment option
                 if ARGV.length >= 1
                   options[:environment] = ARGV.shift
                   if ARGV.length >=1
                     options[:mode] = ARGV.shift
                   end
+            +   else
+            +     puts 'no argument specified, using default mode and environment.'
                 end
                 options[:dry_run] = (ARGV.delete('--dry') != nil)
                 if options[:dry_run] and (not ['prob','contest','autonew'].include? options[:mode])
                   puts "Dry run currently works only for 'prob' or 'contest' modes."
                   exit(0)
                 end
                 options[:report] = (ARGV.delete('--report') != nil)
                 if options[:report] and (not ['prob','contest','autonew'].include? options[:mode])
                   puts "Report currently works only for 'prob' or 'contest' modes."
                   exit(0)
                 end
+            +   options[:all_sub] = (ARGV.delete('--all-sub') != nil)
+            +
                 return options
               end
               class ResultCollector
                 def initialize
                   @results = {}
                   @problems = {}
                   @users = {}
                 end
                 def after_save_hook(submission, grading_result)
                 end
                 prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run],
                                                                :result_collector => result_collector)
                 engine = Grader::Engine.new(:reporter => prob_reporter)
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
                 ARGV.each do |prob_name|
                   prob = Problem.find_by_name(prob_name)
                   if prob==nil
                     puts "cannot find problem: #{prob_name}"
                   else
-            -       runner.grade_problem(prob)
+            +       runner.grade_problem(prob,options)
                   end
                 end
                 if options[:report]
                   result_collector.print_report_by_user
                 end
               end
               def grader_grade_contests(grader_proc, options)
                 # always use dry run when grading during contest
                 dry_run = options[:dry_run] = true
               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}"
+            + puts "grader mode: #{grader_mode}"
               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
                 attr_accessor :grader_mode
               end
               config.grader_mode = grader_mode
               # reading rails environment
               log 'Reading rails environment'

lib/runner.rb ¶ +10 -5

                     if task!=nil
                       @grader_process.report_active(task) if @grader_process!=nil
                       submission = Submission.find(task.submission_id)
                       @engine.grade(submission)
                       task.status_complete!
                       @grader_process.report_inactive(task) if @grader_process!=nil
                     end
                     return task
                   end
                   def grade_problem(problem, options={})
-            -       users = User.find(:all)
-            -       users.each do |u|
+            +       User.find_each do |u|
                       puts "user: #{u.login}"
                       if options[:user_conditions]!=nil
                         con_proc = options[:user_conditions]
                         next if not con_proc.call(u)
                       end
-            -         last_sub = Submission.find_last_by_user_and_problem(u.id,problem.id)
-            -         if last_sub!=nil
-            -           @engine.grade(last_sub)
+            +         if options[:all_sub]
+            +           Submission.where(user_id: u.id,problem_id: problem.id).find_each do |sub|
+            +             @engine.grade(sub)
+            +           end
+            +         else
+            +           last_sub = Submission.find_last_by_user_and_problem(u.id,problem.id)
+            +           if last_sub!=nil
+            +             @engine.grade(last_sub)
+            +           end
                       end
                     end
                   end
                   def grade_submission(submission)
                     puts "Submission: #{submission.id} by #{submission.user.full_name}"
                     @engine.grade(submission)
                   end
                   def grade_oldest_test_request
                     test_request = TestRequest.get_inqueue_and_change_status(Task::STATUS_GRADING)
                     if test_request!=nil

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

r200:3db773289a2d - Thu, 11 Sep 2014 11:05:40 - 2 files changed: 28 inserted, 7 deleted

Sign in to your account

Commit r200:3db773289a2d public

Author

r200:3db773289a2d - Thu, 11 Sep 2014 11:05:40 - 2 files changed: 28 inserted, 7 deleted

Commit `r200:3db773289a2d` public