cafe-grader-web Commit - r402:7f3e18dca393

cafe-grader-web

Commit `r402:7f3e18dca393` public

parent | child

Description:

add selectable checker (for now, only 'text' and 'float') in the problem import

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r402:7f3e18dca393 - Thu, 14 Aug 2014 11:31:06 - 4 files changed: 25 inserted, 3 deleted

app/models/problem.rb ¶ +8 -1

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   Problem.available.all(:order => "date_added DESC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
+            +                                      import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add_to_base('Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
                     problem.errors.add_to_base('Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
                     problem.errors.add_to_base('Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add_to_base('Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
                     problem.errors.add_to_base('No testdata file.')
                   end
+            +     checker_name = 'text'
+            +     if ['text','float'].include? params[:checker]
+            +       checker_name = params[:checker]
+            +     end
+            +
                   file = params[:file]
                   if !problem.errors.empty?
                     return nil, problem
                   end
                   problem.name = params[:name]
                   if params[:full_name]!=''
                     problem.full_name = params[:full_name]
                   else
                     problem.full_name = params[:name]
                   end
                   return [{
                             :time_limit => time_limit,
                             :memory_limit => memory_limit,
-            -               :file => file
+            +               :file => file,
+            +               :checker_name => checker_name
                           },
                           problem]
                 end
               end

app/views/problems/import.html.haml ¶ +13

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Import problems
               %p= link_to '[Back to problem list]', :action => 'list'
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = form_tag({:action => 'do_import'}, :multipart => true)  do
                 .submitbox
                   %table
                     %tr
                       %td Name:
                       %td= text_field_tag 'name'
                     %tr
                       %td Full name:
                       %td
                         = text_field_tag 'full_name'
                         %span{:class => 'help'} Leave blank to use the same value as the name above.
                     %tr
                       %td Testdata file:
                       %td= file_field_tag 'file'
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           In .zip, .tgz, tar.gz, .tar format.
                           It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
                           and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
                           %br/
                           You may put task description in *.html for raw html
                           and *.md or *.markdown for markdown.
+            +             %br/
+            +             You may also put a pdf file for the task description
+            +       %tr
+            +         %td Checker:
+            +         %td= select_tag 'checker', options_for_select([['Text checker','text'],['Float checker','float']], 'text')
+            +       %tr
+            +         %td
+            +         %td
+            +           %span{:class => 'help'}
+            +             "Text" checker checks if the text (including numbers) is the same, ignoring any whitespace
+            +             %br/
+            +             "Float" checker checks if all numbers is within EPSILON error using formula |a-b| < EPSILON * max(|a|,|b|)
+            +
                     - if @allow_test_pair_import
                       %tr
                         %td
                         %td
                           = check_box_tag 'import_to_db'
                           Import test data to database (for a test-pair task)
                     %tr
                       %td Time limit:
                       %td
                         = text_field_tag 'time_limit'
                         %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
                     %tr
                       %td Memory limit:
                       %td
                         = text_field_tag 'memory_limit'
                         %span{:class => 'help'} In MB. Leave blank to use 32MB.
                     %tr
                       %td
                       %td= submit_tag 'Import problem'
               - if @log
                 %h3 Import log
                 %pre.import-log
                   = @log

lib/grader_script.rb ¶ +1 -1

               module GraderScript
                 def self.grader_control_enabled?
                   if defined? GRADER_ROOT_DIR
                     GRADER_ROOT_DIR != ''
                   else
                     false
                   end
                 end
                 def self.raw_dir
                   File.join GRADER_ROOT_DIR, "raw"
                 end
                 def self.call_grader(params)
                   if GraderScript.grader_control_enabled?
                     cmd = File.join(GRADER_ROOT_DIR, "scripts/grader") + " " + params
                     system(cmd)
                   end
                 end
                 def self.stop_grader(pid)
                   GraderScript.call_grader "stop #{pid}"
                 end
                 def self.stop_graders(pids)
                   pid_str = (pids.map { |process| process.pid.to_s }).join ' '
                   GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue &"
                   GraderScript.call_grader "#{env} test_request &"
                 end
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"
                     output = `#{cmd}`
                     Dir.chdir(cur_dir)
-            -       return output
+            +       return "import CMD: #{cmd}\n" + output
                   end
                   return ''
                 end
               end

lib/testdata_importer.rb ¶ +3 -1

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
+            +                        checker_name='text',
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
-            -                                                   memory_limit)
+            +                                                   memory_limit,
+            +                                                   checker_name)
                   else
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
                   @log_msg << import_problem_pdf(dirname)
                   @log_msg << import_full_score(dirname)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)
                   end
                   Dir.mkdir extract_dir
                   if ext=='.tar.gz' or ext=='.tgz'
                     cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.tar'
                     cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.zip'
                     cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
                   else
                     return nil
                   end
                   system(cmd)
                   files = Dir["#{extract_dir}/**/*1*.in"]
                   return nil if files.length==0
                   File.delete(testdata_filename)
                   return File.dirname(files[0])
                 end
                 def save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   testdata_filename = File.join(Dir.tmpdir,"#{@problem.name}#{ext}")
                   return nil if tempfile==""
                   if tempfile.instance_of?(Tempfile)
                     tempfile.close
                     FileUtils.move(tempfile.path,testdata_filename)
                   else
                     File.open(testdata_filename, "wb") do |f|
                       f.write(tempfile.read)
                     end
                   end
                   return testdata_filename
                 end
                 def import_test_pairs(dirname)
                   test_num = 1
                   while FileTest.exists? "#{dirname}/#{test_num}.in"
                     in_filename = "#{dirname}/#{test_num}.in"
                     sol_filename = "#{dirname}/#{test_num}.sol"
                     break if not FileTest.exists? sol_filename
                     test_pair = TestPair.new(:input => open(in_filename).read,
                                              :solution => open(sol_filename).read,
                                              :problem => @problem)
                     break if not test_pair.save
                     test_num += 1
                   end
                   return test_num > 1
                 end
                 def import_problem_description(dirname)
                   html_files = Dir["#{dirname}/*.html"]
                   markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
                   if (html_files.length != 0) or (markdown_files.length != 0)
                     description = @problem.description || Description.new
                     if html_files.length != 0
                       filename = html_files[0]
                       description.markdowned = false
                     else
                       filename = markdown_files[0]
                       description.markdowned = true
                     end
                     description.body = open(filename).read
                     description.save
                     @problem.description = description
                     @problem.save
                     return "\nProblem description imported from #{filename}."
                   else
                     return ''
                   end
                 end
                 def import_problem_pdf(dirname)
                   pdf_files = Dir["#{dirname}/*.pdf"]
                   puts "CHECKING... #{dirname}"
                   if pdf_files.length != 0
                     puts "HAS PDF FILE"
                     filename = pdf_files[0]
                     @problem.save if not @problem.id
                     out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
                     if not FileTest.exists? out_dirname
                       Dir.mkdir out_dirname
                     end
                     out_filename = "#{out_dirname}/#{@problem.name}.pdf"
                     if FileTest.exists? out_filename
                       File.delete out_filename
                     end
                     File.rename(filename, out_filename)
                     @problem.description_filename = "#{@problem.name}.pdf"
                     @problem.save
                     return "\nProblem pdf imported from #{filename}."
                   else
                     return ""
                   end
                 end
                 #just set the full score to the total number of test case
                 #it is not perfect but works on most normal use case
                 def import_full_score(dirname)
                   in_file = Dir["#{dirname}/*.in"]
                   full_score =in_file.length * 10
                   @problem.full_score = full_score
                   @problem.save
                   return "\nFull score is set to #{full_score}."
                 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

r402:7f3e18dca393 - Thu, 14 Aug 2014 11:31:06 - 4 files changed: 25 inserted, 3 deleted

Sign in to your account

Commit r402:7f3e18dca393 public

Author

r402:7f3e18dca393 - Thu, 14 Aug 2014 11:31:06 - 4 files changed: 25 inserted, 3 deleted

Commit `r402:7f3e18dca393` public