cafe-grader-judge-scripts

Commit r248:617a22a897aa public

parent | child
Description:
import_problem now remove carriage return from the input file
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r248:617a22a897aa - - 2 files changed: 8 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -29,14 +29,17
29 File.basename((/(.*)\.in/.match(filename))[1])
29 File.basename((/(.*)\.in/.match(filename))[1])
30 end
30 end
31 build_testrun_info(num_testruns,filenames,raw_prefix)
31 build_testrun_info(num_testruns,filenames,raw_prefix)
32 end
32 end
33
33
34 def copy_testcase(importing_test_dir,fname,dir,i)
34 def copy_testcase(importing_test_dir,fname,dir,i)
35 - FileUtils.cp("#{importing_test_dir}/#{fname}.in", "#{input_filename(dir,i)}")
35 + #copy the file from importing dir and also remove carriage return
36 - FileUtils.cp("#{importing_test_dir}/#{fname}.sol", "#{answer_filename(dir,i)}")
36 + a = File.read("#{importing_test_dir}/#{fname}.in").gsub(/\r\n?/,"\n")
37 + File.write("#{input_filename(dir,i)}",a)
38 + b = File.read("#{importing_test_dir}/#{fname}.sol").gsub(/\r\n?/,"\n")
39 + File.write("#{answer_filename(dir,i)}",b)
37 end
40 end
38
41
39 def process_options(options)
42 def process_options(options)
40 i = 3
43 i = 3
41 while i<ARGV.length
44 while i<ARGV.length
42 if ARGV[i]=='-t'
45 if ARGV[i]=='-t'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -44,12 +44,15
44 loop do
44 loop do
45 file_root = testcases_root + "/#{num}/"
45 file_root = testcases_root + "/#{num}/"
46 puts " checking file #{file_root}"
46 puts " checking file #{file_root}"
47 break unless File.exists? file_root
47 break unless File.exists? file_root
48 input = File.read(file_root + "/input-#{num}.txt")
48 input = File.read(file_root + "/input-#{num}.txt")
49 answer = File.read(file_root + "/answer-#{num}.txt")
49 answer = File.read(file_root + "/answer-#{num}.txt")
50 + #we also remove carraige return
51 + input.gsub!(/\r\n?/,"\n")
52 + answer.gsub!(/\r\n?/,"\n")
50 puts " got test case ##{num} of size #{input.size} and #{answer.size}"
53 puts " got test case ##{num} of size #{input.size} and #{answer.size}"
51
54
52 #THIS IS JUST A PLACE HOLDER
55 #THIS IS JUST A PLACE HOLDER
53 group = num #this is wrong!!! fix it!!
56 group = num #this is wrong!!! fix it!!
54 score = 10
57 score = 10
55 #BEWARE
58 #BEWARE
You need to be logged in to leave comments. Login now