dither 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9829bb305420c2e6fb9cbd6da97d6acdd2bed25f
-  data.tar.gz: 6a8d1840275f51bc12248eeab6b1fc1b7f567373
+  metadata.gz: f2101991f7e2d91e73b8e8ceba02ac57bb040d02
+  data.tar.gz: e8db83997558c3553b76e0b7058aa95f2870553c
 SHA512:
-  metadata.gz: 0953062cebd3d188febf90eec51f5007b64d37fb6ce37662dd0a9cde9cc41ba80457cbc9afbc3369ccfcb7ec251da6244390c2227da88bed64e7003cfed25bb3
-  data.tar.gz: edc6ad4837848718ee1ff1f3c030aa5dcfcf08f7aeca64d25d6eb6f7734afb779b49025c6a913185d5f8516ad9667adaf3ae8652fa6a1b616c080a8602233080
+  metadata.gz: 200f11225a3af395164e40329b3f992833fc4da90f7357e3f2ff031bfcc95f0c9e24aa4da0181e8b702a2bba8c453c8f240474fc7e6ad61630fa33ea73aae7b3
+  data.tar.gz: 5f982c50511d7241f52af2c490746421024a53404ccf6f2ab2b71f8311db7556c89d3873c9a649e00611c0f84eb6e7bce94535f2a659a66ad5c07d6f7eefd2c0

data/dither.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   if RUBY_PLATFORM =~ /java/
     s.platform = "java"
     # compile dither-java on jdk 7
-    files << "lib/dither.jar"
+    files << "lib/dither-0.0.3.jar"
   end
   s.files = files
 

data/lib/dither/ateg_pairwise.rb

@@ -41,22 +41,22 @@ module Dither
           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
+        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] }
-					tmp = car.product(*cdr)
-					tmp.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)
+          @comb.push(*tmp)
         end
       end
 
@@ -68,14 +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
+        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.compact
-					.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/java_ext/dither.rb

@@ -13,6 +13,19 @@ module Dither
     raise Dither::Error.new(e.message)
   end
 
+  def self.ateg(params, opts = {})
+    opts = DEFUALT_OPTS.dup.merge(opts)
+    constraints = constraints_to_java(params.length, opts[:constraints])
+    com.github.jesg.dither.Dither.ateg(
+      opts[:t].to_java(:int),
+      opts[:seed].to_java(:Integer),
+      params.map(&:to_java).to_java,
+      constraints,
+      (opts[:previously_tested] || []).map(&:to_java).to_java).to_a
+  rescue com.github.jesg.dither.DitherError => e
+    raise Dither::Error.new(e.message)
+  end
+
   private
 
   def self.constraints_to_java(param_length, constraints)

data/lib/dither/version.rb

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

data/lib/dither.rb

@@ -44,7 +44,7 @@ require 'dither/ateg_pairwise'
 
 if RUBY_PLATFORM =~ /java/
   require 'java'
-  require 'dither.jar'
+  require 'dither-0.0.3.jar'
 
   require 'dither/java_ext/dither'
 end

data/spec/dither/dither_spec.rb

@@ -174,7 +174,7 @@ 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, :constraints => [
-			{ 0 => 1, 1 => 1, 2 => 1, 3 => 1 },
-		], :previously_tested => [[1,1,1,2]]).length).to eq 30
+      { 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.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec