cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r91:5df0d71260f4` public

parent | child

Description:

added --dry option to grader prob mode

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

r91:5df0d71260f4 - Wed, 10 Mar 2010 03:58:40 - 2 files changed: 42 inserted, 16 deleted

grader ¶ +37 -15

                   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]
                      (3) grader stop [all|pids-list]
                      (4) grader --help
               (1) call grader with environment = 'exam', mode = 'queue'
               (2) possible modes are: 'queue', 'prob', 'test_request'
               (3) create stop-file to stop running grader in queue mode
               (4) You are here.
               USAGE
               end
               #########################################
               # main program
               #########################################
-            - # with --help
+            + # Reading environment and options.
+            +
+            + 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]))
                   display_manual
                   exit(0)
                 end
-            - # reading environment and options
+            +   # Process 'stop' option.
                 if (ARGV.length >= 1) and (ARGV[0]=='stop')
                   if ARGV.length==1
                     puts "you should specify pid-list or 'all'"
                     display_manual
                   elsif (ARGV.length==2) and (ARGV[1]=='all')
                     stop_grader(:all)
                     puts "A global stop file ('stop.all') created."
                     puts "You should remove it manually later."
                   else
                     (1..ARGV.length-1).each do |i|
                       stop_grader(ARGV[i])
                     end
                     puts "stop file(s) created"
                   end
                   exit(0)
                 end
+            +   # Check stop file.
                 if check_stopfile
                   puts "Stop file exists.  Terminated."
                   clear_stopfile
                   exit(0)
                 end
-            - grader_mode = 'queue'
+            +   #default options
+            +   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
-            -   GRADER_ENV = ARGV[0]
+            +       options[:mode] = ARGV.shift
-            -   if ARGV.length >=2
+            +     end
-            -     grader_mode = ARGV[1]
+            +   end
+            +
+            +   options[:dry_run] = (ARGV.delete('--dry') != nil)
+            +   if options[:dry_run] and (not options[:mode] == 'prob')
+            +     puts "Dry run currently works for 'prob' mode."
+            +     exit(0)
                 end
-            - else
-            -   GRADER_ENV = 'exam'
+            +   return options
               end
+            + # ======= Main ========
+            + 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
                 attr_accessor :grader_mode
               end
               config.grader_mode = grader_mode
               # reading rails environment
               log 'Reading rails environment'
               RAILS_ENV = config.rails_env
               require RAILS_ROOT + '/config/environment'
               # register grader process
               if config.report_grader
                 grader_proc = GraderProcess.register(config.grader_hostname,
                                                      Process.pid,
                                                      grader_mode)
               else
                 grader_proc = nil
               end
                   engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
                                               Grader::TestRequestReporter.new)
                 end
                 runner = Grader::Runner.new(engine, grader_proc)
                 while true
                   if check_stopfile    # created by calling grader stop
                     clear_stopfile
                     log "stopped (with stop file)"
                     break
                   end
                   if grader_mode=="queue"
                     task = runner.grade_oldest_task
                   else
                     task = runner.grade_oldest_test_request
                   end
                   if task==nil
                     sleep(1)
                   end
                 end
               when "prob"
-            -   engine = Grader::Engine.new
+            +   engine = Grader::Engine.new(nil, Grader::SubmissionReporter.new(dry_run))
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
-            -   ARGV.shift
-            -   ARGV.shift
                 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)
                   end
                 end
               when "sub"
                 engine = Grader::Engine.new
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
-            -   ARGV.shift
-            -   ARGV.shift
                 ARGV.each do |sub_id|
                   puts "Grading #{sub_id}"
                   begin
                     submission = Submission.find(sub_id.to_i)
                   rescue ActiveRecord::RecordNotFound
                     puts "Record not found"
                     submission = nil
                   end
                   if submission!=nil
                     runner.grade_submission(submission)
                   end
                 end
               else
                 display_manual
                 exit(0)
               end

lib/submission_helper.rb ¶ +5 -1

                     grading_room = "#{@config.user_result_dir}/" +
                       "#{user.login}/#{problem.name}/#{submission.id}"
                     FileUtils.mkdir_p(grading_room)
                     grading_room
                   end
                   def find_problem_home(submission)
                     problem = submission.problem
                     "#{@config.problems_dir}/#{problem.name}"
                   end
                   def save_source(submission,source_name)
                     dir = self.produce_grading_room(submission)
                     f = File.open("#{dir}/#{source_name}","w")
                     f.write(submission.source)
                     f.close
                   end
                   def clean_up(submission)
                   end
                 end
                 class SubmissionReporter
-            -     def initialize
+            +     def initialize(dry_run=false)
                     @config = Grader::Configuration.get_instance
+            +       @dry_run = dry_run
                   end
                   def report(sub,test_result_dir)
                     save_result(sub,read_result(test_result_dir))
                   end
                   def report_error(sub,msg)
                     save_result(sub,{:points => 0,
                                   :comment => "Grading error: #{msg}" })
                   end
                   protected
                   def read_result(test_result_dir)
                     cmp_msg_fname = "#{test_result_dir}/compiler_message"
                     if FileTest.exist?(cmp_msg_fname)
                       cmp_file = File.open(cmp_msg_fname)
                       cmp_msg = cmp_file.read
                       cmp_file.close
                     else
                       cmp_msg = ""
                     end
                     result_fname = "#{test_result_dir}/result"
                     comment_fname = "#{test_result_dir}/comment"
                   end
                   def save_result(submission,result)
                     problem = submission.problem
                     submission.graded_at = Time.now.gmtime
                     points = result[:points]
                     submission.points = points
                     comment = @config.report_comment(result[:comment])
                     #
                     # TODO: FIX THIS MESSAGE
                     #
                     if problem == nil
                       submission.grader_comment = 'PASSED: ' + comment + '(problem is nil)'
                     elsif points == problem.full_score
                       #submission.grader_comment = 'PASSED: ' + comment
                       submission.grader_comment = comment
                     elsif result[:comment].chomp =~ /^[\[\]P]+$/
                       submission.grader_comment = 'PASSED: ' + comment + '(inconsistent score)'
                     else
                       #submission.grader_comment = 'FAILED: ' + comment
                       submission.grader_comment = comment
                     end
                     submission.compiler_message = result[:cmp_msg] or ''
+            +
+            +       if not @dry_run
                       submission.save
                     end
+            +     end
                 end
               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

r91:5df0d71260f4 - Wed, 10 Mar 2010 03:58:40 - 2 files changed: 42 inserted, 16 deleted

Sign in to your account

Commit r91:5df0d71260f4 public

Author

r91:5df0d71260f4 - Wed, 10 Mar 2010 03:58:40 - 2 files changed: 42 inserted, 16 deleted

Commit `r91:5df0d71260f4` public