dither 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6663991d2d97eeed8b4ab2c42ce24e1c191aa05
-  data.tar.gz: 5a6f9d1128e72e2891a03f4651a95a3497730cf7
+  metadata.gz: b1a1dd2b611fde7eca72c6f9a9b859e8b38d15eb
+  data.tar.gz: f6c9f9b7783fc64ad0603bdcf0cadd1d56729e50
 SHA512:
-  metadata.gz: 89ae91395e9fb79d6590acc667c86e667f76e9643d1a47f96752451c0c2eb36e8ffe3b3a9ab82c25b03cf0a43b067bf95cf9b597c4c7e98a129c7acdbacbc687
-  data.tar.gz: 2733499b976c74b037ef5653cca1e729be2e1ddd8f21fc318ab66fec6fe89392169553dfa27b8c7343074dd7f55b554d0aa3b25ab44c4c7ed2d68ced55e05056
+  metadata.gz: b8fb409da9c6ba2699ce18c64ab4d18ec4ab6a31644323f66af0f38466dfe8810cf689f34f1ff001dec747d6475658439f466adea0adaa3c57c222d5eb09b8dd
+  data.tar.gz: 341b6f7240542c9697e3f18876fe1619ad39f2c53f4155e1149cfe77f5fa05804eb59b61c06d14bc0139331416f25033e1f08c2021088e329fb5a2283a95ee18

data/Gemfile.lock

@@ -23,6 +23,7 @@ GEM
     rspec-support (3.2.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/dither/ipog.rb

@@ -1,12 +1,18 @@
 
 module Dither
   class IPOG
-    attr_reader :params, :t, :prng
-    private :params, :t, :prng
+    attr_reader :params, :t, :prng, :constraints
+    private :params, :t, :prng, :constraints
 
-    def initialize(params, t)
+    def initialize(params, t, opts = {})
       @params = params
       @t = t
+      @constraints = opts[:constraints]
+      unless constraints.nil?
+        @constraints = constraints.map(&:to_a)
+                       .map { |a| a.map { |b| Param.new(*b) } }
+                       .map(&:to_set)
+      end
       @prng = Random.new
       raise 't must be >= 2' if t < 2
       raise 't must be <= params.length' if t > params.length
@@ -16,14 +22,16 @@ module Dither
     end
 
     def run
-      ts = comb((0...t))
+      ts = comb
       (t...params.length).each do |i|
-        ts = ts.zip(params[i].cycle).map { |a| a[0] << Param.new(i, a[1]) }
+        ts = ts.zip((0...params[i].length).cycle)
+             .map { |a| a[0] << Param.new(i, a[1]) }
+             .delete_if { |a| violates_constraints?(a) }
 
         comb_i(i).each do |a|
-          in_ts = ts.any? { |test| a.subset?(test) }
+          next if violates_constraints?(a)
+          next if ts.any? { |test| a.subset?(test) }
 
-          next if in_ts
           existing_test = false
           ts.select { |c| c.length <= i }
             .each do |b|
@@ -42,15 +50,25 @@ module Dither
       end
 
       ts.map { |a| fill_unbound(a) }
+        .delete_if(&:nil?)
     end
 
-    def comb(range)
-      range.to_a.combination(t).to_a.inject([]) do |result, a|
-        result + a[1..-1]
-                 .inject((0...params[a[0]].length).map { |b| Param.new(0, b) }) { |p, i| p.product((0...params[i].length).to_a.map { |b| Param.new(i, b) }) }
-                 .map(&:flatten)
-                 .map(&:to_set)
+    def violates_constraints?(params)
+      return false if constraints.nil?
+      constraints.any? { |b| b.subset?(params) }
+    end
+
+    def comb
+      ranges = (0...t).to_a.inject([]) do |a, i|
+        a << (0...params[i].length).map { |j| Param.new(i, j) }
+      end
+
+      products = ranges[1..-1].inject(ranges[0]) do |a, b|
+        a = a.product(b)
       end
+
+      products.map(&:flatten)
+        .map(&:to_set)
     end
 
     def comb_i(param_i)
@@ -77,8 +95,13 @@ module Dither
       end
 
       arr.each_with_index do |e, i|
-        arr[i] = params[i][prng.rand(0...params[i].length)] if e.nil?
+        if e.nil?
+          j = prng.rand(0...params[i].length)
+          arr[i] = params[i][j]
+          data << Param.new(i,j)
+        end
       end
+      return nil if violates_constraints?(data)
       arr
     end
 

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/dither.rb

@@ -3,8 +3,8 @@ require 'set'
 
 module Dither
 
-  def self.all_pairs(params, t = 2)
-    IPOG.new(params, t).run
+  def self.all_pairs(params, t = 2, opts = {})
+    IPOG.new(params, t, opts).run
   end
 end
 

data/spec/dither/dither_spec.rb

@@ -14,6 +14,19 @@ describe Dither do
     expect { Dither.all_pairs([[], []], 2) }.to raise_error('param length must be > 1')
   end
 
+  it 'can compute 2-way ipog using symbols' do
+    params = [[:a, :b, :c], [:d, :e, :f], [:h, :i]]
+    expect(Dither.all_pairs(params)).to eq([[:a, :d, :h],
+                                            [:a, :e, :i],
+                                            [:a, :f, :h],
+                                            [:b, :d, :i],
+                                            [:b, :e, :h],
+                                            [:b, :f, :i],
+                                            [:c, :d, :h],
+                                            [:c, :e, :i],
+                                            [:c, :f, :h]])
+  end
+
   it 'can compute 2-way ipog' do
     params = [(0...2).to_a, (0..3).to_a]
     expect(Dither.all_pairs(params)).to eq([
@@ -46,20 +59,55 @@ describe Dither do
                                                [1, 1, 1],
                                                [1, 1, 2],
                                                [1, 1, 3]])
-    results = Dither.all_pairs([[true, false],
-                                [true, false],
-                                [:cat, :dog, :mouse],
-                                (0...5).to_a], 3)
-puts
-results.each { |a| puts "#{a}" }
-[true,  :cat, 0]
-[true,  :dog, 1]
-[true,  :mouse, 2]
-[false, :cat, 0]
-[false, :dog, 1]
-[false, :mouse, 2]
-[true,  :cat, 0]
-[true,  :dog, 1]
-[true,  :mouse, 2]
+  end
+
+  it 'can compute 3-way ipog with constraints' do
+    params = [(0...2).to_a, (0...2).to_a, (0..3).to_a]
+    expect(Dither.all_pairs(params, 3,
+                            :constraints => [
+                              {0 => 0,
+                               2 => 2},
+                              {0 => 0,
+                               1 => 1,
+                               2 => 0}
+                            ])).to eq([[0, 0, 0],
+                                       [0, 0, 1],
+                                       [0, 0, 3],
+                                       [0, 1, 1],
+                                       [0, 1, 3],
+                                       [1, 0, 0],
+                                       [1, 0, 1],
+                                       [1, 0, 2],
+                                       [1, 0, 3],
+                                       [1, 1, 0],
+                                       [1, 1, 1],
+                                       [1, 1, 2],
+                                       [1, 1, 3]])
+  end
+
+  it 'another 3-way ipog with constraints' do
+    params = [(0...2).to_a, (0...2).to_a, (0...2).to_a, (0..3).to_a]
+    expect(Dither.all_pairs(params, 3,
+                            :constraints => [
+                              {0 => 0,
+                               2 => 2},
+                              {0 => 0,
+                               1 => 1,
+                               2 => 0}
+                            ])).to eq([[0, 0, 0, 0],
+                                       [0, 0, 1, 1],
+                                       [0, 1, 1, 3],
+                                       [1, 0, 0, 0],
+                                       [1, 0, 1, 1],
+                                       [1, 1, 0, 2],
+                                       [1, 1, 1, 3],
+                                       [0, 0, 0, 2],
+                                       [0, 0, 0, 3],
+                                       [0, 1, 1, 0],
+                                       [0, 1, 1, 2],
+                                       [1, 0, 1, 2],
+                                       [1, 0, 0, 3],
+                                       [1, 1, 1, 0],
+                                       [1, 1, 0, 1]])
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jason Gowan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Efficient test generation strategies
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -64,24 +64,24 @@ homepage: https://github.com/jesg/dither
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dither
-rubygems_version: 2.4.5
-signing_key:
+rubygems_version: 2.2.0
+signing_key: 
 specification_version: 4
 summary: Collection of test generation strategies
 test_files: