From 00bf4e8a84c59f051b87c1a613fe8544b86c5aa6 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 1 Mar 2008 04:12:13 +0000 Subject: * test/ruby/allpairs.rb: new file for all pairs method. * test/ruby/test_m17n_comb.rb: use allpairs.rb to reduce test cases. * test/ruby/test_sprintf_comb.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/allpairs.rb | 103 +++++++++++++++++++++++++++++++++++++++++ test/ruby/test_m17n_comb.rb | 18 ++----- test/ruby/test_sprintf_comb.rb | 18 ++----- 3 files changed, 111 insertions(+), 28 deletions(-) create mode 100644 test/ruby/allpairs.rb (limited to 'test') diff --git a/test/ruby/allpairs.rb b/test/ruby/allpairs.rb new file mode 100644 index 0000000000..393d0c3288 --- /dev/null +++ b/test/ruby/allpairs.rb @@ -0,0 +1,103 @@ +module AllPairs + module_function + + def make_prime(v) + return 2 if v < 2 + ary = [true] * (v*2) + 2.upto(Math.sqrt(ary.length).ceil) {|i| + return i if ary[i] && v <= i + (i*2).step(ary.length, i) {|j| + ary[j] = false + } + } + v.upto(ary.length-1) {|i| + return i if ary[i] + } + raise "[bug] prime not found greater than #{v}" + end + + def make_basic_block(prime) + prime.times {|i| + prime.times {|j| + row = [i] + 0.upto(prime-1) {|m| + row << (i*m + j) % prime + } + yield row + } + } + end + + def combine_block(tbl1, tbl2) + result = [] + tbl2.each {|row| + result << row * tbl1.first.length + } + tbl1.each_with_index {|row, k| + next if k == 0 + result << row.map {|i| [i] * tbl2.first.length }.flatten + } + result + end + + def make_large_block(v, prime) + if prime <= v+1 + make_basic_block(v) {|row| + yield row + } + else + tbl = [] + make_basic_block(v) {|row| + tbl << row + } + tbls = [tbl] + while tbl.first.length ** 2 < prime + tbl = combine_block(tbl, tbl) + tbls << tbl + end + tbl1 = tbls.find {|t| prime <= t.first.length * tbl.first.length } + tbl = combine_block(tbl, tbl1) + tbl.each {|row| + yield row + } + end + end + + def each_index(*vs) + n = vs.length + max_v = vs.max + prime = make_prime(max_v) + h = {} + make_large_block(max_v, n) {|row| + row = vs.zip(row).map {|v, i| i % v } + next if h[row] + h[row] = true + yield row + } + end + + # generate all pairs test. + def each(*args) + args.map! {|a| a.to_a } + each_index(*args.map {|a| a.length}) {|is| + yield is.zip(args).map {|i, a| a[i] } + } + end + + # generate all combination in cartesian product. (not all-pairs test) + def exhaustive_each(*args) + args = args.map {|a| a.to_a } + i = 0 + while true + n = i + as = [] + args.reverse_each {|a| + n, m = n.divmod(a.length) + as.unshift a[m] + } + break if 0 < n + yield as + i += 1 + end + end +end diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index a3dcde3283..e69d6fadc8 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -1,5 +1,7 @@ require 'test/unit' require 'stringio' +require 'require_relative' +require_relative 'allpairs' class TestM17NComb < Test::Unit::TestCase def assert_encoding(encname, actual, message=nil) @@ -113,20 +115,8 @@ class TestM17NComb < Test::Unit::TestCase #"aaa".force_encoding("utf-32be"), ] - def combination(*args) - args = args.map {|a| a.to_a } - i = 0 - while true - n = i - as = [] - args.reverse_each {|a| - n, m = n.divmod(a.length) - as.unshift a[m] - } - break if 0 < n - yield as - i += 1 - end + def combination(*args, &b) + AllPairs.each(*args, &b) end def encdump(str) diff --git a/test/ruby/test_sprintf_comb.rb b/test/ruby/test_sprintf_comb.rb index 644a1dd0f4..3a7b65a7e3 100644 --- a/test/ruby/test_sprintf_comb.rb +++ b/test/ruby/test_sprintf_comb.rb @@ -1,4 +1,6 @@ require 'test/unit' +require 'require_relative' +require_relative 'allpairs' class TestSprintfComb < Test::Unit::TestCase VS = [ @@ -106,20 +108,8 @@ class TestSprintfComb < Test::Unit::TestCase ] VS.reverse! - def combination(*args) - args = args.map {|a| a.to_a } - i = 0 - while true - n = i - as = [] - args.reverse_each {|a| - n, m = n.divmod(a.length) - as.unshift a[m] - } - break if 0 < n - yield as - i += 1 - end + def combination(*args, &b) + AllPairs.each(*args, &b) end def emu(format, v) -- cgit v1.2.3