cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r92:274af5f15b1f` public

parent | child

Description:

added grading report

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

r92:274af5f15b1f - Thu, 11 Mar 2010 04:28:53 - 4 files changed: 95 inserted, 21 deleted

grader ¶ +71 -13

               USAGE
               end
-            - #########################################
-            - # main program
-            - #########################################
+            -
-            - # Reading environment and options.
+            -
               def process_options_and_stop_file
                 # The list of options are:
                 #   - stop [all|process ids]
                 options[:dry_run] = (ARGV.delete('--dry') != nil)
                 if options[:dry_run] and (not options[:mode] == 'prob')
-            -     puts "Dry run currently works for 'prob' mode."
+            +     puts "Dry run currently works only for 'prob' mode."
+            +     exit(0)
+            +   end
+            +
+            +   options[:report] = (ARGV.delete('--report') != nil)
+            +   if options[:report] and (not options[:mode] == 'prob')
+            +     puts "Report currently works only for 'prob' mode."
                   exit(0)
                 end
                 return options
               end
-            - # ======= Main ========
+            + class ResultCollector
+            +   def initialize
+            +     @results = {}
+            +     @problems = {}
+            +     @users = {}
+            +   end
+            +
+            +   def save(user, problem, grading_result)
+            +     if not @problems.has_key? problem.id
+            +       @problems[problem.id] = problem
+            +     end
+            +     if not @users.has_key? user.id
+            +       @users[user.id] = user
+            +     end
+            +     @results[[user.id, problem.id]] = grading_result
+            +   end
+            +
+            +   def print_report_by_user
+            +     puts "---------------------"
+            +     puts "       REPORT"
+            +     puts "---------------------"
+            +
+            +     print "login"
+            +     @problems.each_value do |problem|
+            +       print ",#{problem.name}"
+            +     end
+            +     print "\n"
+            +
+            +     @users.each_value do |user|
+            +       print "#{user.login}"
+            +       @problems.each_value do |problem|
+            +         if @results.has_key? [user.id, problem.id]
+            +           print ",#{@results[[user.id,problem.id]][:points]}"
+            +         else
+            +           print ","
+            +         end
+            +       end
+            +       print "\n"
+            +     end
+            +   end
+            + end
+            +
+            + #########################################
+            + # main program
+            + #########################################
+            +
               options = process_options_and_stop_file
               GRADER_ENV = options[:environment]
               grader_mode = options[:mode]
                 if grader_mode=="queue"
                   engine = Grader::Engine.new
                 else
-            -     engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
-            -                                 Grader::TestRequestReporter.new)
+            +     engine = Grader::Engine.new(:room_maker => Grader::TestRequestRoomMaker.new,
+            +                                 :reporter => Grader::TestRequestReporter.new)
                 end
                 runner = Grader::Runner.new(engine, grader_proc)
                 end
               when "prob"
-            -   engine = Grader::Engine.new(nil, Grader::SubmissionReporter.new(dry_run))
+            +   if options[:report]
+            +     result_collector = ResultCollector.new
+            +   else
+            +     result_collector = nil
+            +   end
+            +
+            +   engine = (Grader::Engine.
+            +             new(:reporter =>
+            +                 Grader::SubmissionReporter.new(:dry_run => dry_run,
+            +                                                :result_collector => result_collector)))
                 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
                   end
                 end
+            +   if options[:report]
+            +     result_collector.print_report_by_user
+            +   end
+            +
               when "sub"
                 engine = Grader::Engine.new
                 runner = Grader::Runner.new(engine, grader_proc)

lib/engine.rb ¶ +11 -3

                   attr_writer :room_maker
                   attr_writer :reporter
-            -     def initialize(room_maker=nil, reporter=nil)
+            +     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 = room_maker || Grader::SubmissionRoomMaker.new
-            -       @reporter = reporter || Grader::SubmissionReporter.new
+            +       @room_maker = options[:room_maker]
+            +       @reporter = options[:reporter]
                   end
                   # takes a submission, asks room_maker to produce grading directories,

lib/submission_helper.rb ¶ +11 -3

                 end
                 class SubmissionReporter
-            -     def initialize(dry_run=false)
+            +     def initialize(options={})
+            +       options = {:dry_run => false, :result_collector => nil}.merge(options)
                     @config = Grader::Configuration.get_instance
-            -       @dry_run = dry_run
+            +       @dry_run = options[:dry_run]
+            +       @result_collector = options[:result_collector]
                   end
                   def report(sub,test_result_dir)
-            -       save_result(sub,read_result(test_result_dir))
+            +       result = read_result(test_result_dir)
+            +       if @result_collector
+            +         @result_collector.save(sub.user,
+            +                                sub.problem,
+            +                                result)
+            +       end
+            +       save_result(sub,result)
                   end
                   def report_error(sub,msg)

test/engine_spec.rb ¶ +2 -2

                 before(:each) do
                   @config = Grader::Configuration.get_instance
-            -     @engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
-            -                                  Grader::TestRequestReporter.new)
+            +     @engine = Grader::Engine.new(:room_maker => Grader::TestRequestRoomMaker.new,
+            +                                  :reporter => Grader::TestRequestReporter.new)
                   init_sandbox
                 end

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

r92:274af5f15b1f - Thu, 11 Mar 2010 04:28:53 - 4 files changed: 95 inserted, 21 deleted

Sign in to your account

Commit r92:274af5f15b1f public

Author

r92:274af5f15b1f - Thu, 11 Mar 2010 04:28:53 - 4 files changed: 95 inserted, 21 deleted

Commit `r92:274af5f15b1f` public