cafe-grader-web Commit - r214:cdf8c2c3dce8

cafe-grader-web

Commit `r214:cdf8c2c3dce8` public

parent | child

Description:

added solution submission with grading

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

r214:cdf8c2c3dce8 - Mon, 18 Jan 2010 23:36:23 - 3 files changed: 52 inserted, 7 deleted

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

                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
-            -   verify :method => :post, :only => [:submit],
+            +   verify :method => :post, :only => [:submit, :new_input, :download_input, :submit_solution],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                   else
                     flash[:notice] = 'You cannot request new input now.'
                     redirect_to :action => 'list'
                   end
                 end
-            -   def download
+            +   def download_input
                   problem = Problem.find(params[:id])
                   user = User.find(session[:user_id])
                   recent_assignment = user.get_recent_test_pair_assignment_for problem
                   if recent_assignment != nil
                     send_data(recent_assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{recent_assignment.request_number}.in",
                                 :type => 'text/plain' })
                   else
-            -       flash[:notice] = 'You have not request for any input data for this problem.'
+            +       flash[:notice] = 'You have not requested for any input data for this problem.'
+            +       redirect_to :action => 'list'
+            +     end
+            +   end
+            +
+            +   def submit_solution
+            +     problem = Problem.find(params[:id])
+            +     user = User.find(session[:user_id])
+            +     recent_assignment = user.get_recent_test_pair_assignment_for problem
+            +     if recent_assignment != nil
+            +       submitted_solution = params[:file].read
+            +       test_pair = recent_assignment.test_pair
+            +       passed = test_pair.grade(submitted_solution)
+            +       points = passed ? 100 : 0
+            +       submission = Submission.new(:user => user,
+            +                                   :problem => problem,
+            +                                   :source => params[:file].read,
+            +                                   :source_filename => params['file'].original_filename,
+            +                                   :language_id => 0,
+            +                                   :submitted_at => Time.new.gmtime,
+            +                                   :graded_at => Time.new.gmtime,
+            +                                   :points => points)
+            +       submission.save
+            +       recent_assignment.submitted = true
+            +       recent_assignment.save
+            +       if passed
+            +         flash[:notice] = 'Correct solution'
+            +       else
+            +         flash[:notice] = 'Incorrect solution'
+            +       end
+            +       redirect_to :action => 'list'
+            +     else
+            +       flash[:notice] = 'You have not requested for any input data for this problem.'
                     redirect_to :action => 'list'
                   end
                 end
                 protected

app/models/test_pair.rb ¶ +13

               # which follows the Google Code Jam format, i.e., a participant only
               # submits a solution to a single random input that the participant
               # requested.  This input-solution pair is a TestPair.
               class TestPair < ActiveRecord::Base
                 belongs_to :problem
+            +
+            +   def grade(submitted_solution)
+            +     sols = solution.split
+            +     subs = submitted_solution.split
+            +     if sols.length == subs.length
+            +       subs.length.times do |i|
+            +         return false if subs[i]!=sols[i]
               end
+            +       return true
+            +     else
+            +       return false
+            +     end
+            +   end
+            + end

app/views/main/_problem.html.erb ¶ +4 -4

                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
                 <td>
                   <span id="problem-form-<%= problem.id %>">
-            -       <% form_tag "new_input/#{problem.id}", :method => :post do -%>
+            +       <% form_tag({:action => 'new_input', :id => problem.id}, :method => :post) do -%>
               	<input type="submit" value="New input"/>
                     <% end -%>
-            -       <% form_tag "download/#{problem.id}", :method => :post do -%>
+            +       <% form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do -%>
                       <input type="submit" value="Download input"/>
                     <% end -%>
-            -       <% form_tag "submit_solution/#{problem.id}", :method => :post do -%>
-            - 	<input type="file">
+            +       <% form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do -%>
+            + 	<input type="file" name="file">
               	<input type="submit" value="Submit solution"/>
                     <% end -%>
                   </span>
                 </td>
               </tr>

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

r214:cdf8c2c3dce8 - Mon, 18 Jan 2010 23:36:23 - 3 files changed: 52 inserted, 7 deleted

Sign in to your account

Commit r214:cdf8c2c3dce8 public

Author

r214:cdf8c2c3dce8 - Mon, 18 Jan 2010 23:36:23 - 3 files changed: 52 inserted, 7 deleted

Commit `r214:cdf8c2c3dce8` public