cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r31:d810d6c2e99e` public

parent | child

Description:

[grader] fixed: import_problem (error in erb calls), check_wrapper; better error handling -- will get 0 score for a particular test run that fails git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@118 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r31:d810d6c2e99e - Fri, 14 Mar 2008 01:32:57 - 5 files changed: 28 inserted, 15 deleted

import_problem ¶ +3 -3

               # copy check script
               if res = /^wrapper:(.*)$/.match(check_script)
                 # wrapper script
                 check_script_fname = res[1]
                 script_name = File.basename(check_script_fname)
-            -   check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper")
+            +   check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper").read
-            -   check_wrapper = ERB.new(template)
+            +   check_wrapper = ERB.new(check_wrapper_template)
                 check_file = File.open("#{problem}/script/check","w")
-            -   check_file.puts check_wrapper
+            +   check_file.puts check_wrapper.result
                 check_file.close
                 File.chmod(0755,"#{problem}/script/check")
                 system("cp #{check_script_fname} #{problem}/script/#{script_name}")
               else

std-script/grade ¶ +10 -5

               #!/usr/bin/ruby
+            + CORRECT_MARK = 'P'
+            + INCORRECT_MARK = '-'
+            + TIMEOUT_MARK = 'T'
+            + RUN_ERROR_MARK = 'x'
+            +
               def log(str='')
                 if ENV['TALKATIVE']!=nil
                   puts str
                 end
                 if ENV['GRADER_LOGGING']!=nil
                   log_fname = ENV['GRADER_LOGGING']
                   fp.close
                 end
               end
               def char_comment(comment)
                 if comment =~ /[iI]ncorrect/
-            -     '-'
+            +     INCORRECT_MARK
                 elsif comment =~ /[Cc]orrect/
-            -     'P'
+            +     CORRECT_MARK
                 elsif comment =~ /[Tt]ime/
-            -     'T'
+            +     TIMEOUT_MARK
                 else
-            -     'x'  # these are run time errors
+            +     RUN_ERROR_MARK  # these are run time errors
                 end
               end
               problem_home = ENV['PROBLEM_HOME']
               require "#{problem_home}/script/test_dsl.rb"
               load "#{problem_home}/test_cases/all_tests.cfg"
                 run_comment = ''
                 run_comment_short = ''
                 run.tests.each do |test_num|
                   result_file_name = "#{test_num}/result"
                   if not File.exists?(result_file_name)
                     run_comment += "result file for test #{test_num} not found\n"
-            -       run_comment_short += 'x'
+            +       run_comment_short += RUN_ERROR_MARK
                     log "Cannot find the file #{test_num}/result!"
                   else
                     result_file = File.new(result_file_name, "r")
                     result_file_lines = result_file.readlines
                     run_score = run_score + result_file_lines[1].to_i
                     run_comment += result_file_lines[0]

std-script/judge ¶ +8 -4

               end
               problem_home = ENV['PROBLEM_HOME']
               def execute(command, error_message="")
                 if not system(command)
-            -     log "ERROR: #{error_message}"
+            +     msg = "ERROR: #{error_message}"
-            -     puts "ERROR: #{error_message}"
+            +     log msg
-            -     exit(127)
+            +     raise msg
                 end
               end
               # ARGV[0] --- language
               # ARGV[1] --- program source file
               # ARGV[2] --- test result directory
               end
               # Doing the testing.
               (1..(problem.num_tests)).each do |test_num|
                 log "Test number: #{test_num}"
                 execute("cp #{test_result_dir}/a.out #{sandbox_dir}", "Cannot copy the compiled program into #{sandbox_dir}")
-            -   execute("#{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
+            +   begin
+            +     execute("#{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
+            +   rescue
+            +     # do nothing
+            +   end
                 execute("mkdir #{test_result_dir}/#{test_num}", "Cannot create directory #{test_result_dir}/#{test_num}")
                 execute("mv #{sandbox_dir}/result #{test_result_dir}/#{test_num}", "Cannot copy the result file into #{test_result_dir}/#{test_num}")
                 execute("mv #{sandbox_dir}/comment #{test_result_dir}/#{test_num}", "Cannot copy the comment file into #{test_result_dir}/#{test_num}")
                 execute("mv #{sandbox_dir}/output.txt #{test_result_dir}/#{test_num}", "Cannot copy the output file into #{test_result_dir}/#{test_num}")
                 execute("rm -Rf #{sandbox_dir}/*", "Cannot clear #{sandbox_dir}")
               end

std-script/run ¶ +1

               #puts "There was no runtime error. Proceed to checking the output."
               check_command = "#{problem_home}/script/check #{language} #{test_num}"
               log "Checking the output..."
               log check_command
               if not system(check_command)
                 log "Problem with check script"
+            +   report.call("Incorrect",0,"Check script error.\n")
                 exit(127)
               end
               check_file = File.new("check_result", "r")
               check_file_lines = check_file.readlines

templates/check_wrapper ¶ +6 -3

                 output_file_name = "output.txt"
               end
               load "#{problem_home}/test_cases/all_tests.cfg"
               problem = Problem.get_instance
-            - answer_file_name = File.new("#{problem_home}/test_cases/#{test_num}/answer-#{test_num}.txt")
+            + answer_file_name = "#{problem_home}/test_cases/#{test_num}/answer-#{test_num}.txt"
-            - input_file_name = File.new("#{problem_home}/test_cases/#{test_num}/input-#{test_num}.txt")
+            + input_file_name = "#{problem_home}/test_cases/#{test_num}/input-#{test_num}.txt"
-            - score = Problem.get_score(test_num)
+            + score = problem.get_score(test_num)
               cmd = "#{problem_home}/script/#{REAL_CHECK_SCRIPT} " +
                 "#{language} #{test_num} #{input_file_name} #{output_file_name} " +
                 "#{answer_file_name} #{score} > check_result"
+            + #puts "wrapper-CMD: #{cmd}"
+            +
+            + system(cmd)

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

r31:d810d6c2e99e - Fri, 14 Mar 2008 01:32:57 - 5 files changed: 28 inserted, 15 deleted

Sign in to your account

Commit r31:d810d6c2e99e public

Author

r31:d810d6c2e99e - Fri, 14 Mar 2008 01:32:57 - 5 files changed: 28 inserted, 15 deleted

Commit `r31:d810d6c2e99e` public