Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r241:19abb7c667e3 - - 7 files changed: 124 inserted, 4 deleted
@@ -0,0 +1,93 | |||
|
1 | + #!/usr/bin/env ruby | |
|
2 | + | |
|
3 | + def config | |
|
4 | + Grader::Configuration.get_instance | |
|
5 | + end | |
|
6 | + | |
|
7 | + def display_manual | |
|
8 | + puts <<USAGE | |
|
9 | + Check similarity between submission | |
|
10 | + using: check_similar sub1 sub2 | |
|
11 | + -- or -- | |
|
12 | + check_similar problem_name | |
|
13 | + sub1 and sub2 are submission IDs to be checked | |
|
14 | + problem_name will check all submissions of the problem wit problem short name is 'problem_name' | |
|
15 | + | |
|
16 | + The output are given as | |
|
17 | + sub1.login, sub1.id, sub1.point, sub2.login, sub2.id, sub2.point, similarity | |
|
18 | + | |
|
19 | + USAGE | |
|
20 | + end | |
|
21 | + | |
|
22 | + def process_options_and_stop_file | |
|
23 | + | |
|
24 | + # Process 'help' option | |
|
25 | + if (ARGV.length == 0) or ((ARGV.length==1) and (/help/.match(ARGV[0]))) | |
|
26 | + display_manual | |
|
27 | + exit(0) | |
|
28 | + end | |
|
29 | + | |
|
30 | + #default options | |
|
31 | + options = { | |
|
32 | + :dry_run => false, | |
|
33 | + } | |
|
34 | + | |
|
35 | + | |
|
36 | + if ARGV.length == 2 | |
|
37 | + options[:sub1] = ARGV[0].to_i | |
|
38 | + options[:sub2] = ARGV[1].to_i | |
|
39 | + elsif ARGV.length == 1 | |
|
40 | + options[:problem] = ARGV[0] | |
|
41 | + end | |
|
42 | + | |
|
43 | + | |
|
44 | + return options | |
|
45 | + end | |
|
46 | + | |
|
47 | + def compare(sub1,sub2,full = sub1.problem.full_score) | |
|
48 | + dis = @jarow.getDistance(sub1.source, sub2.source) | |
|
49 | + puts [sub1.user.login,"##{sub1.id}",(sub1.points * 100.0 / full).to_i, | |
|
50 | + sub2.user.login,"##{sub2.id}",(sub2.points * 100.0 / full).to_i, | |
|
51 | + "#{dis * 100}%"].join(',') | |
|
52 | + end | |
|
53 | + | |
|
54 | + ######################################### | |
|
55 | + # main program | |
|
56 | + ######################################### | |
|
57 | + | |
|
58 | + options = process_options_and_stop_file | |
|
59 | + | |
|
60 | + # load grader environment | |
|
61 | + GRADER_ENV = 'grading' | |
|
62 | + require File.join(File.dirname(__FILE__),'config/environment') | |
|
63 | + | |
|
64 | + # boot rails, to be able to use the active record | |
|
65 | + RAILS_ENV = config.rails_env | |
|
66 | + require RAILS_ROOT + '/config/environment' | |
|
67 | + | |
|
68 | + # load comparator | |
|
69 | + require 'fuzzystringmatch' | |
|
70 | + @jarow = FuzzyStringMatch::JaroWinkler.create( :native ) | |
|
71 | + | |
|
72 | + if options[:problem] | |
|
73 | + p = Problem.where(name: options[:problem]).first | |
|
74 | + unless p | |
|
75 | + puts "cannot find problem #{options[:problem]}" | |
|
76 | + exit(0) | |
|
77 | + end | |
|
78 | + subs = Submission.where(problem: p) | |
|
79 | + full_score = p.full_score.to_i | |
|
80 | + subs.each.with_index do |s1,i| | |
|
81 | + puts "processing #{i+1} out of #{subs.length}" | |
|
82 | + subs.each do |s2| | |
|
83 | + if s1.user != s2.user | |
|
84 | + compare(s1,s2,full_score) | |
|
85 | + end | |
|
86 | + end | |
|
87 | + end | |
|
88 | + else | |
|
89 | + sub1 = Submission.find(options[:sub1]) | |
|
90 | + sub2 = Submission.find(options[:sub2]) | |
|
91 | + compare(sub1,sub2) | |
|
92 | + end | |
|
93 | + |
@@ -0,0 +1,6 | |||
|
1 | + #!/bin/bash | |
|
2 | + count=`ps aux | grep "cafe_grader" | grep "grader grading queue" | wc -l` | |
|
3 | + if [ $count -lt 1 ]; then | |
|
4 | + cd /home/dae/cafe_grader/judge | |
|
5 | + /home/dae/.rvm/wrappers/ruby-2.3.0/ruby /home/dae/cafe_grader/judge/scripts/grader grading queue > /home/dae/grading.log & | |
|
6 | + fi |
@@ -145,6 +145,12 | |||
|
145 | 145 | end |
|
146 | 146 | end |
|
147 | 147 | |
|
148 | + #also include any .txt files | |
|
149 | + Dir.glob("#{testcase_dir}/*.txt") do |file| | |
|
150 | + puts "copy data file #{file}" | |
|
151 | + FileUtils.cp(file,"#{problem_dir}") | |
|
152 | + end | |
|
153 | + | |
|
148 | 154 | # generating all_tests.cfg |
|
149 | 155 | puts "generating testcase config file" |
|
150 | 156 |
@@ -20,7 +20,7 | |||
|
20 | 20 | def process_options_and_stop_file |
|
21 | 21 | |
|
22 | 22 | # Process 'help' option |
|
23 | - if (ARGV.length==1) and (/help/.match(ARGV[0])) | |
|
23 | + if (ARGV.length == 0) or ((ARGV.length==1) and (/help/.match(ARGV[0]))) | |
|
24 | 24 | display_manual |
|
25 | 25 | exit(0) |
|
26 | 26 | end |
@@ -74,7 +74,7 | |||
|
74 | 74 | require RAILS_ROOT + '/config/environment' |
|
75 | 75 | |
|
76 | 76 | if options[:all] |
|
77 |
- Problem.all.each { |prob| process_problem(prob,options[: |
|
|
77 | + Problem.all.each { |prob| process_problem(prob,options[:dry_run]) } | |
|
78 | 78 | else |
|
79 | 79 | ARGV.each do |name| |
|
80 | 80 | prob = Problem.find_by(name: name) |
@@ -8,7 +8,7 | |||
|
8 | 8 | |
|
9 | 9 | def rename_problem(old_problem_name, new_problem_name) |
|
10 | 10 | |
|
11 |
- |
|
|
11 | + unless valid_problem_name(new_problem_name) | |
|
12 | 12 | puts "Bad new problem name: #{new_problem_name}" |
|
13 | 13 | return |
|
14 | 14 | end |
@@ -60,7 +60,7 | |||
|
60 | 60 | if name.length==0: |
|
61 | 61 | return false |
|
62 | 62 | else |
|
63 |
- return |
|
|
63 | + return (/^[a-zA-Z0-9_\-]+$/ === name) | |
|
64 | 64 | end |
|
65 | 65 | end |
|
66 | 66 |
@@ -140,6 +140,12 | |||
|
140 | 140 | if language == "python" then Dir["#{test_result_dir}/*.pyc"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
141 | 141 | } |
|
142 | 142 | |
|
143 | + #additionally copy any extra .txt file | |
|
144 | + data_files = Dir[problem_home + '/*.txt'] | |
|
145 | + data_files.each do |file| | |
|
146 | + FileUtils.cp(file,sandbox_dir) | |
|
147 | + end | |
|
148 | + | |
|
143 | 149 | begin |
|
144 | 150 | execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script") |
|
145 | 151 | rescue |
@@ -47,6 +47,11 | |||
|
47 | 47 | |
|
48 | 48 | ########### THIS IS FOR CHECKING FLOAT with EPSILON error ########## |
|
49 | 49 | |
|
50 | + | |
|
51 | + def is_float?(fl) | |
|
52 | + !!Float(fl) rescue false | |
|
53 | + end | |
|
54 | + | |
|
50 | 55 | EPSILON = 0.000001 |
|
51 | 56 | |
|
52 | 57 | out_items = output_file_content.split |
@@ -56,11 +61,15 | |||
|
56 | 61 | report_wrong.call |
|
57 | 62 | else |
|
58 | 63 | out_items.length.times do |i| |
|
64 | + if is_float?(out_items[i]) && is_float?(ans_items[i]) | |
|
59 | 65 | out_value = out_items[i].to_f |
|
60 | 66 | ans_value = ans_items[i].to_f |
|
61 | 67 | if (out_value - ans_value).abs > EPSILON * [out_value.abs,ans_value.abs].max |
|
62 | 68 | report_wrong.call |
|
63 | 69 | end |
|
70 | + else | |
|
71 | + report_wrong.call if out_items[i] != ans_items[i] | |
|
72 | + end | |
|
64 | 73 | end |
|
65 | 74 | report_correct.call |
|
66 | 75 | end |
You need to be logged in to leave comments.
Login now