gettc 1.8 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13ea9a48db98416575bd26b1280e0b50e00813fd
-  data.tar.gz: fd1bedf6f9f2ccef304249223ffec8b31ac87ce3
+  metadata.gz: b8f0620456e7f47a3b78dac16f5340db69b2708e
+  data.tar.gz: 9d58a132c8a69a0ead8997ba48fea763bff87d4f
 SHA512:
-  metadata.gz: 6fa57ef95644085a280927ec69edcc6fedec7e65b875c998a89c3bcbf8bbf6a757e99dca0506869b9fc48723906767a487a739de65a9d671a378a850d7888b47
-  data.tar.gz: deadbb5bb05c3b74c1a709f9303992c2182a46fa4cf825f5c747188a2bd31a67123c78de8557d1451fa98c0bbb7ee7e412f628b4058f6b13485ee624c7b8d0b3
+  metadata.gz: 5a93b2e574f63014b36b17c9d26386f36294db624833d9b88cd47549c3376b7739b0caf98698ba948bc2ab79bcfb10bef6babb8a715aaaf4150fe66b4603bec9
+  data.tar.gz: 6d2316fc246ac269ead57fa88448f3a8a8a1013cef1bb9c5c033ced8c414507859f136d55a1ad56c66b7825f0f7a767ad831cf6cf6fc3c1b10c174ed804e5e64

data/bin/gettc

@@ -75,7 +75,7 @@ gettc reset: Bring all settings to default state.
         prob = parser.parse html
         puts "Done"
         
-        print "Generating problem diectory for #{prob.name} ... "
+        print "Generating problem directory for #{prob.name} ... "
         generator.generate prob
         puts "Done"
     rescue TemplateError => terr

data/core/lib/version.rb

@@ -1,3 +1,3 @@
 module Gettc
-    VERSION = "1.8"
+    VERSION = "1.8.1"
 end

data/dist/config.yml

@@ -1,3 +1,3 @@
 username: gettc
 password: algorithm
-version: 1.7.5.2
+version: 1.8.1

data/dist/include/cpp/topcoder

@@ -108,12 +108,12 @@ namespace TopCoder {
     }
 
     void read(std::istream &is, char &c) {
-        _expect(is, '\'');
-        is.get(c);
-        if (c == '\'') {
-            c = 0;
-        } else {
+        _spaces(is); char ch; is.get(ch);
+        if (ch == '\'') {
+            is.get(c);
             _expect(is, '\'');
+        } else {
+            c = ch;
         }
     }
 

data/dist/include/go/src/topcoder/errors.go

@@ -1,3 +1,7 @@
+// I hope to migrate this codebase to this style soon, to avoid the error
+// checking madness: http://blog.golang.org/errors-are-values. However, it
+// will break compatibility so I'll wait for a timely chance.
+
 package topcoder
 
 import (
@@ -38,4 +42,4 @@ func (me ErrExpect) Error() string {
 
 func NewErrExpect(r io.Reader, what string) ErrExpect {
     return ErrExpect(fmt.Sprintf("Expect %s at <%s>", what, rest(r)))
-}
+}

data/dist/include/go/src/topcoder/reader.go

@@ -12,8 +12,6 @@ import (
 func spaces(br *bufio.Reader) error {
     for {
         switch b, err := br.ReadByte(); {
-        case err == io.EOF:
-            return nil
         case err != nil:
             return err
         case !unicode.IsSpace(rune(b)):
@@ -26,8 +24,6 @@ func spaces(br *bufio.Reader) error {
 
 func genericExpect(br *bufio.Reader, what string, predicate func(byte) bool) error {
     switch b, err := br.ReadByte(); {
-    case err == io.EOF:
-        return io.ErrUnexpectedEOF
     case err != nil:
         return err
     case !predicate(b):
@@ -64,19 +60,20 @@ func readChar(br *bufio.Reader, pChar *byte) error {
     if err = spaces(br); err != nil {
         return err
     }
-    if err = expect(br, '\''); err != nil {
-        return err
-    }
     switch b, err = br.ReadByte(); {
-    case err == io.EOF:
-        return io.ErrUnexpectedEOF
     case err != nil:
         return err
+	case b == '\'':
+		switch ret, errInside := br.ReadByte(); {
+		case errInside != nil:
+			return errInside
+		default:
+			*pChar = ret
+			return expect(br, '\'')
+		}
+	default:
+		*pChar = b
     }
-    if err = expect(br, '\''); err != nil {
-        return err
-    }
-    *pChar = b
     return nil
 }
 
@@ -124,8 +121,6 @@ func readString(br *bufio.Reader, pString *string) error {
     w := bytes.NewBufferString("")
     for {
         switch b, err = br.ReadByte(); {
-        case err == io.EOF:
-            return io.ErrUnexpectedEOF
         case err != nil:
             return err
         case b != '"':

data/dist/include/go/src/topcoder/reader_test.go

@@ -157,8 +157,9 @@ func TestReadByte(t *testing.T) {
     var (
         xs = []aTest {
             aTest{"'H'ello", 'H', true},
-            aTest{"\n\t 'H'23", 'H', true},
-            aTest{"Hello", 'H', false},
+            aTest{"\n\t 'A'23", 'A', true},
+            aTest{"Bello", 'B', true},
+            aTest{"'C", 'C', false},
         }
         got byte
     )
@@ -320,14 +321,15 @@ func TestReadAll(t *testing.T) {
         age int
         gender byte
         average float32
+		grade byte
         courses []string
         grades [][]float64
     )
-    in := "\"Joe\", 20, 'M', 7.5, [\"Math\", \"Computer \"Science\"\"], [[7, 8], []]"
+    in := "\"Joe\", 20, 'M', 7.5, C, [\"Math\", \"Computer \"Science\"\"], [[7, 8], []]"
     br := newReader(in)
     f := fmt.Sprintf("Read(%v)", in)
-    Read(br, &name, &age, &gender, &average, &courses, &grades)
-    if name != "Joe" || age != 20 || average != 7.5 || gender != 'M' ||
+    Read(br, &name, &age, &gender, &average, &grade, &courses, &grades)
+    if name != "Joe" || age != 20 || average != 7.5 || gender != 'M' || grade != 'C' ||
         !reflect.DeepEqual(courses, []string{"Math", "Computer \"Science\""}) ||
         !reflect.DeepEqual(grades, [][]float64{{7, 8}, {}}) {
         t.Errorf(f + " produces (%q, %d, &q, %f, %v, %v)", name, age, gender, average, courses, grades)

data/dist/include/haskell/TopCoder.hs

@@ -25,13 +25,17 @@ next = do
     return ()
 
 
-parseChar :: Parser Char
-parseChar = do 
+parseQuotedChar :: Parser Char
+parseQuotedChar = do 
     char '\''
     ret <- anyChar
     char '\''
     return ret
 
+parseChar :: Parser Char
+parseChar = parseQuotedChar <|> anyChar
+
+
 parseBool :: Parser Bool
 parseBool = do 
     s <- many1 letter
@@ -97,4 +101,4 @@ parseList parser = do
     spaces >> char '[' >> spaces
     xs <- parseElems parser
     spaces >> char ']'
-    return xs
+    return xs

data/dist/include/python/topcoder/reader.py

@@ -101,10 +101,14 @@ class ReaderInternal(object):
 
     def next_char(self):
         self.spaces()
-        self.expect("'")
         c = self.token()
+        if c == "'":
+            self.pos += 1
+            ret = self.token()
+            self.pos += 1
+            self.expect("'")
+            return ret
         self.pos += 1
-        self.expect("'")
         return c
 
     def next_boolean(self):
@@ -157,4 +161,4 @@ class ReaderInternal(object):
             return result
         result.append(self.next(elem_type))
         self.next_elems(elem_type, result)
-        return result
+        return result

data/dist/template/bin/runner.rb

@@ -1,173 +1,178 @@
-require "fileutils"
-require "logger"
-
-class SysUtil
-    def self.with_dir dir
-        saved = FileUtils.pwd
-        FileUtils.chdir dir
-        yield
-        FileUtils.chdir saved
-    end
-end
-
-class StopWatch
-    def self.measure
-        before = Time.now
-        yield
-        after = Time.now
-        return ((after - before) * 1000).round
-    end
-end
-
-class GettcRunner
-    def initialize mode, solver, data_d, output_d
-        @verbose = (mode == "verbose")
-        @solver = solver
-        @data_d = data_d
-        @output_d = output_d
-
-        @dir = File.dirname __FILE__
-
-        FileUtils.mkdir_p @output_d
-
-        @log = Logger.new STDOUT
-        @log.formatter = proc do |severity, datetime, progname, message|
-            message
-        end
-        @log.level = Logger::INFO
-        if @verbose
-            @log.level = Logger::DEBUG
-        end 
-    end
-
-    def compile_checker
-        puts "[gettc] Compile checker"
-        @checker = File.join @dir, "../build/check"
-        unless File.exists? @checker
-            checker_src = File.join @dir, "../util/check"
-            SysUtil::with_dir checker_src do 
-                system "make"
-            end
-        end
-    end
-
-    def populate_filenames n
-        input = File.join @data_d, "#{n}.in"
-        expected = File.join @data_d, "#{n}.out"
-        received = File.join @output_d, "#{n}.out"
-        return input, expected, received
-    end
-
-    def print_file_content label, filename
-        print "    #{label}: <"
-        print File.read(filename)
-        puts ">"
-    end
-
-    def print_case n
-        input, expected, received = populate_filenames n
-        print_file_content "Input", input
-        print_file_content "Expected", expected
-        print_file_content "Received", received
-    end
-
-    def run_case n
-        input, expected, received = populate_filenames n
-
-        @log.debug "Case #{n} ... "
-        ret = true
-
-        elapsed = StopWatch::measure do
-            ret = system "#{@solver} #{input} #{received}"
-        end
-        @elapsed << elapsed
-        @log.debug "#{elapsed}ms "
-
-        if ret != true
-            @errors << n
-            @log.debug "Error\n"
-        else
-            system "#{@checker} #{expected} #{received}"
-            ret = $?.exitstatus
-            case ret
-            when 0
-                @log.debug "Passed\n"
-            when 1
-                @log.debug "Failed\n"
-                @failures << n
-                print_case n if @verbose
-            when 2
-                @log.debug "Error\n"
-                @errors << n
-            end
-        end 
-    end
-
-    def run_all_cases
-        puts "[gettc] Run test cases"
-
-        inputs = Dir.glob "#{@data_d}/*.in"
-
-        @total = inputs.size
-        @elapsed = Array.new
-        @failures = Array.new
-        @errors = Array.new
-
-        @total.times do |n|
-            run_case n
-        end
-    end
-
-    def print_array label, arr
-        if arr.size > 0
-            print "#{label}: "
-            puts arr.join(", ")
-        end 
-    end
-
-    def summarize
-        puts "[gettc] Summary"
-        puts "#{@total} cases checked, #{@failures.size} failures, #{@errors.size} errors"
-        print_array "Failures", @failures
-        print_array " Errors", @errors
-
-        if @total > 0
-            sum = @elapsed.inject 0, :+
-            avg = sum / @elapsed.size
-            puts "    Total time taken: #{sum} ms"
-            puts "    Average time taken: #{avg} ms"
-
-            i, j = 0, 0
-            @elapsed.size.times do |k|
-                if @elapsed[k] > j
-                    i, j = k, @elapsed[k]
-                end 
-            end
-            puts "    Slowest running case: #{j} ms (case #{i})"
-        end 
-    end
-
-    def print_failures
-        if @failures.empty? || @verbose
-            return
-        end 
-        puts "Here are a few failed case for your debugging purposes"
-
-        n = [5, @failures.size].min
-        n.times do |i|
-            j = @failures[i]
-            puts "Case #{j}:"
-            print_case j
-        end
-    end
-
-    def run
-        compile_checker
-        run_all_cases
-        print_failures
-        summarize
-    end
-end
-
-runner = GettcRunner.new ARGV[0], ARGV[1], ARGV[2], ARGV[3]
-runner.run
+require "fileutils"
+require "logger"
+
+class SysUtil
+    def self.with_dir dir
+        saved = FileUtils.pwd
+        FileUtils.chdir dir
+        yield
+        FileUtils.chdir saved
+    end
+end
+
+class StopWatch
+    def self.measure
+        before = Time.now
+        yield
+        after = Time.now
+        return ((after - before) * 1000).round
+    end
+end
+
+class GettcRunner
+    def initialize mode, solver, data_d, output_d
+        @verbose = (mode == "verbose")
+        @solver = solver
+        @data_d = data_d
+        @output_d = output_d
+
+        @dir = File.dirname __FILE__
+
+        FileUtils.mkdir_p @output_d
+
+        @log = Logger.new STDOUT
+        @log.formatter = proc do |severity, datetime, progname, message|
+            message
+        end
+        @log.level = Logger::INFO
+        if @verbose
+            @log.level = Logger::DEBUG
+        end 
+    end
+
+    def compile_checker
+        puts "[gettc] Compile checker"
+        @checker = File.join @dir, "../build/check"
+        unless File.exists? @checker
+            checker_src = File.join @dir, "../util/check"
+            SysUtil::with_dir checker_src do 
+                system "make"
+            end
+        end
+    end
+
+    def populate_filenames n
+        input = File.join @data_d, "#{n}.in"
+        expected = File.join @data_d, "#{n}.out"
+        received = File.join @output_d, "#{n}.out"
+        return input, expected, received
+    end
+
+    def print_file_content label, filename
+        print "    #{label}: <"
+        print File.read(filename)
+        puts ">"
+    end
+
+    def print_case n
+        input, expected, received = populate_filenames n
+        print_file_content "Input", input
+        print_file_content "Expected", expected
+        print_file_content "Received", received
+    end
+
+    def run_case n
+        input, expected, received = populate_filenames n
+
+        @log.debug "Case #{n} ... "
+        ret = true
+
+        elapsed = StopWatch::measure do
+            ret = system "#{@solver} #{input} #{received}"
+        end
+        @elapsed << elapsed
+        @log.debug "#{elapsed}ms "
+
+        if ret != true
+            @errors << n
+            @log.debug "Error (cannot execute solver)\n"
+        else
+            ret = system "#{@checker} #{expected} #{received}"
+            if ret != true
+                @errors << n 
+                @log.debug "Error (cannot execute checker)\n"
+            else
+                ret = $?.exitstatus
+                case ret
+                when 0
+                    @log.debug "Passed\n"
+                when 1
+                    @log.debug "Failed\n"
+                    @failures << n
+                    print_case n if @verbose
+                when 2
+                    @log.debug "Error (checker reported error)\n"
+                    @errors << n
+                end
+            end
+        end 
+    end
+
+    def run_all_cases
+        puts "[gettc] Run test cases"
+
+        inputs = Dir.glob "#{@data_d}/*.in"
+
+        @total = inputs.size
+        @elapsed = Array.new
+        @failures = Array.new
+        @errors = Array.new
+
+        @total.times do |n|
+            run_case n
+        end
+    end
+
+    def print_array label, arr
+        if arr.size > 0
+            print "#{label}: "
+            puts arr.join(", ")
+        end 
+    end
+
+    def summarize
+        puts "[gettc] Summary"
+        puts "#{@total} cases checked, #{@failures.size} failures, #{@errors.size} errors"
+        print_array "Failures", @failures
+        print_array "Errors", @errors
+
+        if @total > 0
+            sum = @elapsed.inject 0, :+
+            avg = sum / @elapsed.size
+            puts "    Total time taken: #{sum} ms"
+            puts "    Average time taken: #{avg} ms"
+
+            i, j = 0, 0
+            @elapsed.size.times do |k|
+                if @elapsed[k] > j
+                    i, j = k, @elapsed[k]
+                end 
+            end
+            puts "    Slowest running case: #{j} ms (case #{i})"
+        end 
+    end
+
+    def print_failures
+        if @failures.empty? || @verbose
+            return
+        end 
+        puts "Here are a few failed case for your debugging purposes"
+
+        n = [5, @failures.size].min
+        n.times do |i|
+            j = @failures[i]
+            puts "Case #{j}:"
+            print_case j
+        end
+    end
+
+    def run
+        compile_checker
+        run_all_cases
+        print_failures
+        summarize
+    end
+end
+
+runner = GettcRunner.new ARGV[0], ARGV[1], ARGV[2], ARGV[3]
+runner.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettc
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: 1.8.1
 platform: ruby
 authors:
 - Seri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
@@ -78,13 +78,13 @@ files:
 - dist/include/java/engine.rb
 - dist/include/python/engine.rb
 - dist/include/python/topcoder/__init__.py
-- dist/include/python/topcoder/__pycache__/__init__.cpython-32.pyc
-- dist/include/python/topcoder/__pycache__/errors.cpython-32.pyc
-- dist/include/python/topcoder/__pycache__/reader.cpython-32.pyc
-- dist/include/python/topcoder/__pycache__/writer.cpython-32.pyc
+- dist/include/python/topcoder/__init__.pyc
 - dist/include/python/topcoder/errors.py
+- dist/include/python/topcoder/errors.pyc
 - dist/include/python/topcoder/reader.py
+- dist/include/python/topcoder/reader.pyc
 - dist/include/python/topcoder/writer.py
+- dist/include/python/topcoder/writer.pyc
 - dist/template/bin/runner.rb
 - dist/template/bin/runner.sh
 - dist/template/data/demo/{examples_d}