cafe-grader-web Commit - r384:7f104b042855

cafe-grader-web

Commit `r384:7f104b042855` public

parent | child

Description:

checks solution by lines

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

r384:7f104b042855 - Fri, 30 Jan 2015 02:52:13 - 1 file changed: 9 inserted, 3 deleted

app/controllers/main_controller.rb ¶ +9 -3

                   if !problem.available
                     flash[:notice] = 'Error: problem is not available'
                     redirect_to :action => 'list'
                   else
                     test_pair = TestPair.get_for(problem, true)
                     user = User.find(session[:user_id])
                     assignment = user.get_test_pair_assignment_for(problem)
                     if !assignment
                       assignment = TestPairAssignment.create_for(user, problem, test_pair)
                       assignment.save
                     end
                     send_data(test_pair.input,
               		{:filename => problem.name + '-input.txt',
                                :type => 'text/plain'})
                   end
                 end
                 def verifying_submit
                   user = User.find(session[:user_id])
                   problem_id = params[:id]
                   problem = Problem.find(problem_id)
                   if !problem or !problem.available
                     flash[:notice] = 'Error: problem is not available'
                     redirect_to :action => 'list' and return
                   end
                   @current_problem = problem
                   test_pair = TestPair.get_for(problem, false)
                   if (params['output_file']) and (params['output_file']!='')
                     output = params['output_file'].read
                     @grading_result = grade(output, test_pair.solution)
                     prepare_list_information
                     render :action => 'list' and return
                   else
                     flash[:notice] = 'Error: output file errors'
                     prepare_list_information
                     render :action => 'list' and return
                   end
                 end
                 protected
                 def grade(output, solution)
-            -     out_items = output.split
-            -     sol_items = solution.split
+            +     out_items = output.split("\n")
+            +     sol_items = solution.split("\n")
                   res = ''
                   f = 0
                   s = 0
                   sol_items.length.times do |i|
                     f += 1
-            -       if out_items[i] == sol_items[i]
+            +       si = sol_items[i].chomp
+            +       if out_items[i]
+            +         oi = out_items[i].chomp
+            +       else
+            +         oi = ''
+            +       end
+            +       if oi == si
                       res = res + 'P'
                       s += 1
                     else
                       res = res + '-'
                     end
                   end
                   return { :score => s, :full_score => f, :msg => res }
                 end
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_timeout_information(problems)
                   @submission_timeouts = {}
                   problems.each do |problem|
                     assignment = @user.get_test_pair_assignment_for(problem)
                     if assignment == nil
                       timeout = nil
                     else
                       if (assignment.expired?) or (assignment.submitted)
                         timeout = 0
                       else
                         timeout = assignment.created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION - Time.new.gmtime
                       end
                     end
                     @submission_timeouts[problem.id] = timeout
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|

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

r384:7f104b042855 - Fri, 30 Jan 2015 02:52:13 - 1 file changed: 9 inserted, 3 deleted

Sign in to your account

Commit r384:7f104b042855 public

Author

r384:7f104b042855 - Fri, 30 Jan 2015 02:52:13 - 1 file changed: 9 inserted, 3 deleted

Commit `r384:7f104b042855` public