cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r99:f439789e790b` public

parent | child

Description:

removed 'system' from grader, grader_id, import_problem

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

r99:f439789e790b - Sat, 24 Apr 2010 09:22:26 - 3 files changed: 14 inserted, 32 deleted

grader ¶ +1 -1

                 FileTest.exist?(File.dirname(__FILE__) + "/stop.all") or
                   FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
               end
               def clear_stopfile
                 if FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
-            -     system("rm " + File.dirname(__FILE__) + "/stop.#{Process.pid}")
+            +     File.delete(File.dirname(__FILE__) + "/stop.#{Process.pid}")
                 end
               end
               def config
                 Grader::Configuration.get_instance
               end

grader_id ¶ -21

               def talk(str)
                 if TALKATIVE
                   puts str
                 end
               end
-            - def execute(command, error_message="")
-            -   if not system(command)
-            -     puts "ERROR: #{error_message}"
-            -     exit(127)
-            -   end
-            - end
+            -
               def save_source(submission,dir,fname)
                 f = File.open("#{dir}/#{fname}","w")
                 f.write(submission.source)
                 f.close
               end
                 save_source(sub,problem_out_dir,source_name)
                 call_judge(problem_home,language,problem_out_dir,source_name)
                 save_result(sub,read_result("#{problem_out_dir}/test-result"))
               end
-            - def stop_grader
-            -   File.open(File.dirname(__FILE__) + '/stop','w')
-            - end
+            -
-            - def check_stopfile
-            -   FileTest.exist?(File.dirname(__FILE__) + '/stop')
-            - end
+            -
-            - def clear_stopfile
-            -   system("rm " + File.dirname(__FILE__) + '/stop')
-            - end
+            -
               # reading environment and options
               GRADER_ENV = 'exam'
               puts "environment: #{GRADER_ENV}"
               require File.dirname(__FILE__) + "/environment.rb"
               #main program
               RAILS_ENV = 'development'
               require RAILS_APP_DIR + '/config/environment'
               current_dir = `pwd`
               grade(ARGV[0].to_i)
+            -
+            -

import_problem ¶ +13 -10

               #!/usr/bin/ruby
               require 'erb'
+            + require 'ftools'
               require 'fileutils'
               require File.join(File.dirname(__FILE__),'lib/import_helper')
               JUDGE_ENVIRONMENTS = [:grading, :exam]
               ENV_INFO = {
                 :grading => {
                   File.basename((/(.*)\.in/.match(filename))[1])
                 end
                 build_testrun_info(num_testruns,filenames,raw_prefix)
               end
               def copy_testcase(importing_test_dir,fname,dir,i)
-            -   system("cp #{importing_test_dir}/#{fname}.in #{input_filename(dir,i)}")
-            -   system("cp #{importing_test_dir}/#{fname}.sol #{answer_filename(dir,i)}")
+            +   File.copy("#{importing_test_dir}/#{fname}.in", "#{input_filename(dir,i)}")
+            +   File.copy("#{importing_test_dir}/#{fname}.sol", "#{answer_filename(dir,i)}")
               end
               def process_options(options)
                 i = 3
                 while i<ARGV.length
                   if ARGV[i]=='-t'
                 problem_dir = "#{ev_dir}/#{problem}"
                 # start working
                 puts "creating directories"
-            -   system("mkdir #{problem_dir}")
-            -   system("mkdir #{problem_dir}/script")
-            -   system("mkdir #{problem_dir}/test_cases")
+            +   File.makedirs("#{problem_dir}")
+            +   File.makedirs("#{problem_dir}/script")
+            +   File.makedirs("#{problem_dir}/test_cases")
                 puts "copying testcases"
                 tr_num = 0
                 num_testcases = 0
                   testrun.each do |testcase_info|
                     testcase_num, testcase_fname = testcase_info
                     puts "copy #{testcase_fname} to #{testcase_num}"
-            -       system("mkdir #{problem_dir}/test_cases/#{testcase_num}")
+            +       File.makedirs("#{problem_dir}/test_cases/#{testcase_num}")
                     copy_testcase("#{testcase_dir}",testcase_fname,"#{problem_dir}/test_cases/#{testcase_num}",testcase_num)
                     num_testcases += 1
                   end
                 end
                   check_file = File.open("#{problem_dir}/script/check","w")
                   check_file.puts check_wrapper.result binding
                   check_file.close
                   File.chmod(0755,"#{problem_dir}/script/check")
-            -     system("cp #{check_script_fname} #{problem_dir}/script/#{script_name}")
+            +     File.copy("#{check_script_fname}", "#{problem_dir}/script/#{script_name}")
                 else
                   if File.exists?(SCRIPT_DIR + "/templates/check.#{check_script}")
                     check_script_fname = SCRIPT_DIR + "/templates/check.#{check_script}"
                   else
                     check_script_fname = check_script
                   end
-            -     system("cp #{check_script_fname} #{problem_dir}/script/check")
+            +     File.copy("#{check_script_fname}", "#{problem_dir}/script/check")
                 end
                 # generating test_request directory
                 puts "generating test_request template"
                 FileUtils.mkdir_p("#{ev_dir}/test_request/#{problem}/script")
                 FileUtils.mkdir_p("#{ev_dir}/test_request/#{problem}/test_cases/1")
                 test_request_all_test_cfg = ERB.new(template)
                 cfg_file = File.open("#{ev_dir}/test_request/#{problem}/test_cases/all_tests.cfg","w")
                 cfg_file.puts test_request_all_test_cfg.result
                 cfg_file.close
-            -   system("cp #{SCRIPT_DIR}/templates/check_empty #{ev_dir}/test_request/#{problem}/script/check")
-            -   system("cp #{SCRIPT_DIR}/templates/answer-1.txt #{ev_dir}/test_request/#{problem}/test_cases/1")
+            +   File.copy("#{SCRIPT_DIR}/templates/check_empty",
+            +             "#{ev_dir}/test_request/#{problem}/script/check")
+            +   File.copy("#{SCRIPT_DIR}/templates/answer-1.txt",
+            +             "#{ev_dir}/test_request/#{problem}/test_cases/1")
                 puts "done"
               end
               SCRIPT_DIR = File.dirname(__FILE__)

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

r99:f439789e790b - Sat, 24 Apr 2010 09:22:26 - 3 files changed: 14 inserted, 32 deleted

Sign in to your account

Commit r99:f439789e790b public

Author

r99:f439789e790b - Sat, 24 Apr 2010 09:22:26 - 3 files changed: 14 inserted, 32 deleted

Commit `r99:f439789e790b` public