cafe-grader-web

Commit r384:7f104b042855 public

parent | child
Description:
checks solution by lines
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r384:7f104b042855 - - 1 file changed: 9 inserted, 3 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -290,32 +290,38
290 prepare_list_information
290 prepare_list_information
291 render :action => 'list' and return
291 render :action => 'list' and return
292 else
292 else
293 flash[:notice] = 'Error: output file errors'
293 flash[:notice] = 'Error: output file errors'
294 prepare_list_information
294 prepare_list_information
295 render :action => 'list' and return
295 render :action => 'list' and return
296 end
296 end
297 end
297 end
298
298
299 protected
299 protected
300
300
301 def grade(output, solution)
301 def grade(output, solution)
302 - out_items = output.split
302 + out_items = output.split("\n")
303 - sol_items = solution.split
303 + sol_items = solution.split("\n")
304 res = ''
304 res = ''
305 f = 0
305 f = 0
306 s = 0
306 s = 0
307 sol_items.length.times do |i|
307 sol_items.length.times do |i|
308 f += 1
308 f += 1
309 - if out_items[i] == sol_items[i]
309 + si = sol_items[i].chomp
310 + if out_items[i]
311 + oi = out_items[i].chomp
312 + else
313 + oi = ''
314 + end
315 + if oi == si
310 res = res + 'P'
316 res = res + 'P'
311 s += 1
317 s += 1
312 else
318 else
313 res = res + '-'
319 res = res + '-'
314 end
320 end
315 end
321 end
316 return { :score => s, :full_score => f, :msg => res }
322 return { :score => s, :full_score => f, :msg => res }
317 end
323 end
318
324
319 def prepare_announcements(recent=nil)
325 def prepare_announcements(recent=nil)
320 if GraderConfiguration.show_tasks_to?(@user)
326 if GraderConfiguration.show_tasks_to?(@user)
321 @announcements = Announcement.find_published(true)
327 @announcements = Announcement.find_published(true)
You need to be logged in to leave comments. Login now