gettc 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f0620456e7f47a3b78dac16f5340db69b2708e
-  data.tar.gz: 9d58a132c8a69a0ead8997ba48fea763bff87d4f
+  metadata.gz: 248e85dd98ec679999209b8148373b71ca96b70c
+  data.tar.gz: e9cd8061bf69f561a8f2945f8fa47de2a48b53b0
 SHA512:
-  metadata.gz: 5a93b2e574f63014b36b17c9d26386f36294db624833d9b88cd47549c3376b7739b0caf98698ba948bc2ab79bcfb10bef6babb8a715aaaf4150fe66b4603bec9
-  data.tar.gz: 6d2316fc246ac269ead57fa88448f3a8a8a1013cef1bb9c5c033ced8c414507859f136d55a1ad56c66b7825f0f7a767ad831cf6cf6fc3c1b10c174ed804e5e64
+  metadata.gz: 97383359ec7189209c3d88be0de62d2ba73106e6abdb75eb164d3d17a4b68e020eccdb2d7e9c800fe57bc5f51f4e533482cf550da59dfaa219c448da3a97fe4d
+  data.tar.gz: 134603c5baca851d3248b55a16014625ce74c52569187adb383c589d5f762e5d7484aaf091c3a2156355a8136944f3b1d56aea950a53af6d292905cc93dc69fe

data/core/lib/version.rb

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

data/dist/config.yml

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

data/dist/template/bin/runner.rb

@@ -1,178 +1,184 @@
-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
+require "fileutils"
+require "logger"
+require "pathname"
+
+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[n] = elapsed
+        @log.debug "#{elapsed}ms "
+
+        if ret != true
+            @errors << n
+            @log.debug "Error (cannot execute solver)\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 (checker reported error)\n"
+                @errors << n
+            else
+                @log.debug "Error (error executing checker)\n"
+                @errors << n
+            end
+        end 
+    end
+
+    def run_all_cases
+        puts "[gettc] Run test cases"
+
+        inputs = Dir.glob "#{@data_d}/*.in"
+        inputs.sort!
+
+        @total = inputs.size
+        @elapsed = Hash.new
+        @failures = Array.new
+        @errors = Array.new
+
+        inputs.each do |input|
+            basename = Pathname.new(input).basename.to_s
+            run_case basename[0..-4]
+        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 = 0
+            maxv = 0
+            maxk = nil
+            @elapsed.each do |key, value|
+                sum += value
+                if value > maxv
+                    maxv = value
+                    maxk = key
+                end 
+            end
+            avg = sum / @total
+
+            puts "    Total time taken: #{sum} ms"
+            puts "    Average time taken: #{avg} ms"
+            puts "    Slowest running case: #{maxv} ms (case #{maxk})"
+        end 
+    end
+
+    def print_failures
+        if @failures.empty? || @verbose
+            return
+        end 
+        n =  @failures.size
+        if n > 5
+            puts "Here are a few failed case for your debugging purposes"
+            n = 5
+        end
+        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

data/dist/template/solve/Makefile.common

@@ -0,0 +1,40 @@
+run = \
+	@if [ -n "$(case)" ] ; then \
+		if [ ! -f "$(DATA_D)/$2/$(case).in" ] ; then \
+			echo "Error: Your test case $(case) does not exist" ; \
+			exit ; \
+		fi ; \
+		mv $(DATA_D)/$2 $(DATA_D)/$2_backup ; \
+		mkdir $(DATA_D)/$2 ; \
+		cp $(DATA_D)/$2_backup/$(case).* $(DATA_D)/$2 ; \
+		$(RUNNER) $1 $(SOLVER) $(DATA_D)/$2 $(OUTPUT_D)/$2 ; \
+		rm -rf $(DATA_D)/$2 ; \
+		mv $(DATA_D)/$2_backup $(DATA_D)/$2 ; \
+	else \
+		$(RUNNER) $1 $(SOLVER) $(DATA_D)/$2 $(OUTPUT_D)/$2 ; \
+	fi
+
+GETTC_HOME ?= $(HOME)/.gettc
+DATA_D = ../../data
+RUNNER = sh ../../bin/runner.sh
+
+default : usage
+
+usage :
+	@cat $(GETTC_HOME)/usage
+
+setup :
+	@if [ ! -d $(OUTPUT_D) ]; then mkdir -p $(OUTPUT_D); fi
+	@echo "[gettc] Compile solver"
+
+demo : main
+	$(call run,verbose,demo) 
+
+sys : main
+	$(call run,quiet,sys)
+
+sysv : main
+	$(call run,verbose,sys)
+
+clean :
+	@rm -rf $(OUTPUT_D)

data/dist/template/solve/cpp/Makefile

@@ -1,33 +1,10 @@
-GETTC_HOME ?= $(HOME)/.gettc
+include ../Makefile.common
+
 OUTPUT_D =../../build/cpp
-DATA_D = ../../data
+SOLVER = $(OUTPUT_D)/<%= prob.name %>Solver
 COMPILER = g++ -std=gnu++0x -I$(GETTC_HOME)/include/cpp
-RUNNER = sh ../../bin/runner.sh
-
-run = @$(RUNNER) $1 $(OUTPUT_D)/<%= prob.name %>Runner $(DATA_D)/$2 $(OUTPUT_D)/$2
-
-default : usage
-
-usage :
-	@cat $(GETTC_HOME)/usage
-
-setup :
-	@if [ ! -d $(OUTPUT_D) ]; then mkdir -p $(OUTPUT_D); fi
-	@echo "[gettc] Compile solver"
-
-$(OUTPUT_D)/<%= prob.name %>Runner: <%= prob.name %>Runner.cpp <%= prob.name %>.cpp
-	$(COMPILER) -o $(OUTPUT_D)/<%= prob.name %>Runner $<
-
-main: setup $(OUTPUT_D)/<%= prob.name %>Runner
-
-demo : main
-	$(call run,verbose,demo) 
-
-sys : main
-	$(call run,quiet,sys)
 
-sysv : main
-	$(call run,verbose,sys)
+$(SOLVER): <%= prob.name %>Solver.cpp <%= prob.name %>.cpp
+	$(COMPILER) -o $(SOLVER) $<
 
-clean :
-	@rm -rf $(OUTPUT_D)
+main: setup $(SOLVER)

data/dist/template/solve/go/Makefile

@@ -1,32 +1,10 @@
-GETTC_HOME ?= <%= File.expand_path "~/.gettc" %>
-OUTPUT_D =../../build/go
-DATA_D = ../../data
-RUNNER = sh ../../bin/runner.sh
-
-run = @$(RUNNER) $1 $(OUTPUT_D)/<%= prob.name %>Runner $(DATA_D)/$2 $(OUTPUT_D)/$2
-
-default : usage
-
-usage :
-	@cat $(GETTC_HOME)/usage
-
-setup :
-	@if [ ! -d $(OUTPUT_D) ]; then mkdir -p $(OUTPUT_D); fi
-	@echo "[gettc] Compile solver"
+include ../Makefile.common
 
-$(OUTPUT_D)/<%= prob.name %>Runner: <%= prob.name %>Runner.go <%= prob.name %>/<%= prob.name %>.go
-	export GOPATH="$$GOPATH<%= File::PATH_SEPARATOR %>$(GETTC_HOME)/include/go" && go build -o $(OUTPUT_D)/<%= prob.name %>Runner <%= prob.name %>Runner.go 
-
-main: setup $(OUTPUT_D)/<%= prob.name %>Runner
-
-demo : main
-	$(call run,verbose,demo) 
-
-sys : main
-	$(call run,quiet,sys)
+OUTPUT_D =../../build/go
+SOLVER = $(OUTPUT_D)/<%= prob.name %>Solver
 
-sysv : main
-	$(call run,verbose,sys)
+$(SOLVER): <%= prob.name %>Solver.go <%= prob.name %>/<%= prob.name %>.go
+	export GOPATH="$$GOPATH<%= File::PATH_SEPARATOR %>$(GETTC_HOME)/include/go" \
+		&& go build -o $(SOLVER) <%= prob.name %>Solver.go 
 
-clean :
-	@rm -rf $(OUTPUT_D)
+main: setup $(SOLVER)

data/dist/template/solve/haskell/Makefile

@@ -1,33 +1,11 @@
-GETTC_HOME ?= $(HOME)/.gettc
+include ../Makefile.common
+
 OUTPUT_D = ../../build/haskell
-DATA_D = ../../data
+SOLVER = $(OUTPUT_D)/<%= prob.name %>Solver
 COMPILER = ghc -i$(GETTC_HOME)/include/haskell -outputdir $(OUTPUT_D)
-RUNNER = sh ../../bin/runner.sh
-
-run = @$(RUNNER) $1 $(OUTPUT_D)/<%= prob.name %>Runner $(DATA_D)/$2 $(OUTPUT_D)/$2
-
-default : usage
-
-usage :
-	@cat $(GETTC_HOME)/usage
-
-setup :
-	@if [ ! -d $(OUTPUT_D) ]; then mkdir -p $(OUTPUT_D); fi
-	@echo "[gettc] Compile solver"
-
-$(OUTPUT_D)/<%= prob.name %>Runner: <%= prob.name %>Runner.hs <%= prob.name %>.hs
-	$(COMPILER) -o $(OUTPUT_D)/<%= prob.name %>Runner $<
-
-main: setup $(OUTPUT_D)/<%= prob.name %>Runner
-
-demo : main
-	$(call run,verbose,demo) 
 
-sys : main
-	$(call run,quiet,sys)
+$(SOLVER): <%= prob.name %>Solver.hs <%= prob.name %>.hs
+	$(COMPILER) -o $(SOLVER) $<
 
-sysv : main
-	$(call run,verbose,sys)
+main: setup $(SOLVER)
 
-clean :
-	@rm -rf $(OUTPUT_D)

data/dist/template/solve/java/build.xml

@@ -18,7 +18,7 @@
 
     <target name="runner">
         <echo file="${java.sh}" append="no">#! /bin/sh
-java -cp "`dirname $0`${path.separator}${lib}" <%= prob.name %>Runner $$*
+java -cp "`dirname $0`${path.separator}${lib}" <%= prob.name %>Solver $$*
         </echo>
         <chmod file="${java.sh}" perm="+x"/>
     </target>
@@ -26,7 +26,7 @@ java -cp "`dirname $0`${path.separator}${lib}" <%= prob.name %>Runner $$*
     <target name="compile-main">
         <mkdir dir="${output.dir}"/>
         <javac srcdir="." destdir="${output.dir}" 
-               includes="<%= prob.name %>.java,<%= prob.name %>Runner.java"
+               includes="<%= prob.name %>.java,<%= prob.name %>Solver.java"
                includeantruntime="no">
             <classpath refid="classpath"/>
         </javac>
@@ -63,4 +63,4 @@ java -cp "`dirname $0`${path.separator}${lib}" <%= prob.name %>Runner $$*
     <target name="clean">
         <delete dir="${output.dir}"/>
     </target>
-</project>
+</project>

data/dist/template/solve/java/{{name}Runner.java → {name}Solver.java}

@@ -10,7 +10,7 @@ import org.topcoder.TypeRef;
 <%
     engine = JavaEngine.new func, vars 
 %>
-public class <%= prob.name %>Runner {
+public class <%= prob.name %>Solver {
     public static void main(String[] args) {
     try {
         TopcoderReader reader = new TopcoderReader(new FileReader(args[0]));
@@ -29,4 +29,4 @@ public class <%= prob.name %>Runner {
         err.printStackTrace(System.err);
     }
     }    
-}
+}

data/dist/template/solve/python/Makefile

@@ -1,27 +1,8 @@
-GETTC_HOME ?= $(HOME)/.gettc
-OUTPUT_D = ../../build/python
-DATA_D = ../../data
-RUNNER = sh ../../bin/runner.sh
-
-run = @$(RUNNER) $1 ./<%= prob.name %>Runner.py $(DATA_D)/$2 $(OUTPUT_D)/$2
-
-default : usage
-
-setup :
-	@if [ ! -d $(OUTPUT_D) ]; then mkdir -p $(OUTPUT_D); fi
-	@chmod +x <%= prob.name %>Runner.py
+include ../Makefile.common
 
-usage :
-	@cat $(GETTC_HOME)/usage
-
-demo : setup
-	$(call run,verbose,demo) 
-
-sys : setup
-	$(call run,quiet,sys)
+OUTPUT_D = ../../build/python
+SOLVER = ./<%= prob.name %>Solver.py
 
-sysv : setup
-	$(call run,verbose,sys)
+main: setup
+	chmod +x $(SOLVER)
 
-clean :
-	@rm -rf $(OUTPUT_D)

data/dist/usage

@@ -3,3 +3,4 @@ Hello from gettc! The following commands are available:
     make sys: Run the solution against the system tests
     make sysv: Like make sys but in verbose mode to debug
     make clean: Delete all temporary files
+To run a single case, use something like: make sys case=99

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettc
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Seri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
@@ -92,22 +92,23 @@ files:
 - dist/template/prob/images/{images_d}
 - dist/template/prob/{name}.html
 - dist/template/prob/{name}.md
+- dist/template/solve/Makefile.common
 - dist/template/solve/cpp/Makefile
 - dist/template/solve/cpp/{name}.cpp
-- dist/template/solve/cpp/{name}Runner.cpp
+- dist/template/solve/cpp/{name}Solver.cpp
 - dist/template/solve/go/Makefile
 - dist/template/solve/go/{name}/{name}.go
-- dist/template/solve/go/{name}Runner.go
+- dist/template/solve/go/{name}Solver.go
 - dist/template/solve/haskell/Makefile
 - dist/template/solve/haskell/{name}.hs
-- dist/template/solve/haskell/{name}Runner.hs
+- dist/template/solve/haskell/{name}Solver.hs
 - dist/template/solve/java/Makefile
 - dist/template/solve/java/build.xml
 - dist/template/solve/java/{name}.java
-- dist/template/solve/java/{name}Runner.java
+- dist/template/solve/java/{name}Solver.java
 - dist/template/solve/python/Makefile
 - dist/template/solve/python/{name}.py
-- dist/template/solve/python/{name}Runner.py
+- dist/template/solve/python/{name}Solver.py
 - dist/template/util/check/Makefile
 - dist/template/util/check/check.cpp
 - dist/usage