dither 0.0.12-java → 0.0.13-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebd1c192f8d6b59c19a05e69fca456794c19dd7f
-  data.tar.gz: 2d31494b532b2050bd1fa8662f7882080a8f5202
+  metadata.gz: 09eb8f9c172f2c8272ce2ecebfca696fb3f0bd96
+  data.tar.gz: 8fe24e47535703bfcdbf0d7b89d98057f5b7f58b
 SHA512:
-  metadata.gz: beca214f99e4581f1aa285dff9bbf037078d6ef83035a15f254af6f69ef9a3971c9ad00cc6aab65dd973d075b1e78f100ddf98012860358224ccc6a204752cdd
-  data.tar.gz: b37a58fe3bb90490f3d15e5823640f6454156eff35e543f2f3863ef75a6cc979521df14c53b46157205e2c9b8f0ed7c3d82362d025ce0d5078cd9ea8df4e5bd8
+  metadata.gz: 264f35c17cd6cb3b438b16f203d6b1ecf080eff713311c20d84c0bb98205ebeb2a8732bd62753df961ee45c27bd95981f91cbea667ed990f109f113cc0a41cef
+  data.tar.gz: 70ab8e5682939a65c83eb0672de26fc8adfdee41207b7093e7815f7533508219cf1beb61544674f8cc45482a337eaa7a6c8ec66504e58c94be4e8981cf1ec3b9

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: java
 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
@@ -68,7 +68,6 @@ files:
 - README.md
 - Rakefile
 - dither.gemspec
-- lib/dither.jar
 - lib/dither.rb
 - lib/dither/ateg.rb
 - lib/dither/ateg_pairwise.rb
@@ -84,6 +83,7 @@ files:
 - spec/dither/chinese_postman_problem_spec.rb
 - spec/dither/dither_spec.rb
 - spec/spec_helper.rb
+- lib/dither.jar
 homepage: https://github.com/jesg/dither
 licenses:
 - MIT
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dither
-rubygems_version: 2.4.6
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Collection of test generation strategies