dither 0.0.12 → 0.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9829bb305420c2e6fb9cbd6da97d6acdd2bed25f
+  data.tar.gz: 6a8d1840275f51bc12248eeab6b1fc1b7f567373
+SHA512:
+  metadata.gz: 0953062cebd3d188febf90eec51f5007b64d37fb6ce37662dd0a9cde9cc41ba80457cbc9afbc3369ccfcb7ec251da6244390c2227da88bed64e7003cfed25bb3
+  data.tar.gz: edc6ad4837848718ee1ff1f3c030aa5dcfcf08f7aeca64d25d6eb6f7734afb779b49025c6a913185d5f8516ad9667adaf3ae8652fa6a1b616c080a8602233080

data/README.md

@@ -48,8 +48,12 @@ Dither.ateg([[true, false],
              [:cat, :dog, :mouse],
              (0...5).to_a],
             :t => 3,
-            :seed => 0 # set the seed on the random number generator
-)
+            :seed => 0, # set the seed on the random number generator
+            :constraints => [
+              { 1 => 0, 2 => 0 }, # exclude true and cat
+              { 1 => 0, 2 => 1, 3 => 4 }, # exclude true :dog 4 combinations
+            ],
+			:previously_tested => [[true, true, :cat, 0]])
 ```
 
 ## Graph Models (Experimental)

data/lib/dither/ateg_pairwise.rb

@@ -13,19 +13,7 @@ module Dither
         def in_test_case?(test_case)
           self.all? { |pair| pair.j == test_case[pair.i] }
         end
-
-        alias_method :orig_method_missing, :method_missing
-
-        def method_missing(method, *args, &block)
-          if method == :cached_hash
-            orig_hash = hash
-            self.class.define_method(:cached_hash) do
-              orig_hash
-            end
-          end
-          orig_method_missing(method, *args, &block)
-        end
-      end
+      end # Pairs
 
       def initialize(params, opts = {})
 
@@ -39,16 +27,36 @@ module Dither
         @scratch = Array.new(@n)
         seed = opts[:seed] || Random.new.seed
         @random = Random.new(seed)
-        @constraints = nil
+
         @pair_cache = Array.new(params.length)
         params.each_with_index do |param, i|
           pair_cache[i] = (0...param.length).map { |j| Pair.new(i, j).freeze }
         end
+        if opts[:previously_tested]
+          opts[:constraints] = [] unless opts[:constraints]
+          opts[:previously_tested].each do |a|
+            arr = []
+            a.each_with_index { |b,i| arr << [i, b] }
+            opts[:constraints] << Hash[arr]
+          end
+        end
+        @constraints = nil
+				if opts[:constraints]
+					@constraints = []
+					opts[:constraints].each do |a|
+						constraint = a.map { |k, v| pair_cache[k][v] }
+						constraint.extend(Pairs)
+						@constraints << constraint
+					end
+				end
         @comb = []
         @t = opts[:t]
         (0...params.length).to_a.combination(t).each do |a|
-          car, *cdr = a.map { |b| pair_cache[b] }
-          @comb.push(*car.product(*cdr).each { |b| b.extend(Pairs) })
+					car, *cdr = a.map { |b| pair_cache[b] }
+					tmp = car.product(*cdr)
+					tmp.each { |b| b.extend(Pairs) }
+          tmp.reject! { |b| constraints.any? { |c| c.all? { |d| b.include?(d)} } } if constraints
+					@comb.push(*tmp)
         end
       end
 
@@ -60,10 +68,14 @@ module Dither
 
       def filter
         return unless constraints
+				scratch.each_with_index do |e, i|
+					scratch[i] = nil if constraints.any? { |a| a.in_test_case?(e) }
+				end
       end
 
       def best_fit
-        max, _ = scratch.map { |a| [a, comb.count { |b| b.in_test_case?(a) }] }
+				max, _ = scratch.compact
+					.map { |a| [a, comb.count { |b| b.in_test_case?(a) }] }
           .max { |a, b| a[1] <=> b[1] }
         comb.delete_if { |a| a.in_test_case?(max) }
         max

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/dither/dither_spec.rb

@@ -173,6 +173,8 @@ describe Dither do
 
   it 'can run 4-way ateg with seed' do
     params = [(0...2).to_a, (0...2).to_a, (0...2).to_a, (0..3).to_a]
-    expect(Dither.ateg(params, :t => 4, :seed => 0).length).to eq 32
+    expect(Dither.ateg(params, :t => 4, :seed => 0, :constraints => [
+			{ 0 => 1, 1 => 1, 2 => 1, 3 => 1 },
+		], :previously_tested => [[1,1,1,2]]).length).to eq 30
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Efficient test generation strategies
@@ -66,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -93,27 +86,26 @@ files:
 homepage: https://github.com/jesg/dither
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dither
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Collection of test generation strategies
 test_files:
 - spec/dither/chinese_postman_problem_spec.rb