dither 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c66959b6921cffc06d9cac3b5bf925cff4e05d
-  data.tar.gz: c55fe4643b714ec9fb2e5a12e088c21576cc3b9c
+  metadata.gz: 271a9f006b9084c1217f28558119aec7a8d0f412
+  data.tar.gz: 40f2427cfda6ba58f77f92f5fcab155a84dcf9a4
 SHA512:
-  metadata.gz: d2fafce619a3975a7836d6ee89bb26c486a7de41f36a5dfc6a0b8bc249ac3995976d860591c9de024a309f741b01dd76cea24705b6bacbd6475df26f74f200ee
-  data.tar.gz: c861ce9af750be22f8071c21d0939576b9885a3f08292375090e3c03393094b94db7cef2d1f58e9e4b0105f5a9c5166c7dd5a22b49c2f47d06efbcf14863839a
+  metadata.gz: d5629757b14b9431935a9dc8042e5703e16ae5fd0c90eacfa49ffd3ff5c97ce66f06f42ab14dd4b095ec9a4463a8940e34018131d78f2a9dc76f81ff9774373a
+  data.tar.gz: 59087c6e94f32b69dff2c9efd13763548e6ff8c8cb37fe83d26ba8c620bd08ad13fd8a31db6b5a480e7745c3f02ca1fe139421e5817ab53fc3a01b2a360bd1a0

data/README.md

@@ -52,4 +52,6 @@ results.each { |a| puts "#{a}" }
 * Send me a pull request. Bonus points for topic branches
 
 # Copyright
+includes [dither-java](https://github.com/jesg/dither-java) Apache License, Version 2.0
+
 Copyright (c) 2015 Jason Gowan See LICENSE for details.

data/dither.gemspec

@@ -18,7 +18,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "coveralls"
 
-  s.files         = `git ls-files`.split("\n")
+  files         = `git ls-files`.split("\n")
+
+  if RUBY_PLATFORM =~ /java/
+    s.platform = "java"
+    # compile dither-java on jdk 7
+    files << "lib/dither.jar"
+  end
+  s.files = files
+
   s.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/dither/ipog_helper.rb

@@ -64,8 +64,8 @@ module Dither
         test_case.delete(current_param)
       end
 
-      test_case << params[i][current_max_j]
       return nil if violates_constraints?(test_case)
+      test_case << params[i][current_max_j]
 
       current_matches
     end
@@ -127,6 +127,7 @@ module Dither
             next
           else
             arr[i] = orig_param[j]
+            break
           end
         end
         return nil if arr[i].nil?

data/lib/dither/java_ext/dither.rb

@@ -0,0 +1,29 @@
+
+module Dither
+
+  def self.all_pairs(params, t = 2, opts = {})
+    constraints = constraints_to_java(params.length, opts[:constraints])
+    com.github.jesg.dither.Dither.ipog(
+      t.to_java(:int),
+      params.map(&:to_java).to_java,
+      constraints).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)
+    return [].to_java if constraints.nil?
+    result = []
+    constraints.each do |constraint|
+      new_constraint = Array.new(param_length)
+      constraint.each do |k, v|
+        new_constraint[k] = v
+        puts "#{k} => #{v}"
+      end
+      result << new_constraint
+    end
+    result.map { |a| a.to_java(java.lang.Integer) }.to_java
+  end
+end

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/dither.rb

@@ -21,3 +21,10 @@ require 'dither/test_case'
 require 'dither/ipog_helper'
 require 'dither/ipog'
 require 'dither/mipog'
+
+if RUBY_PLATFORM =~ /java/
+  require 'java'
+  require 'dither.jar'
+
+  require 'dither/java_ext/dither'
+end

data/spec/dither/dither_spec.rb

@@ -54,7 +54,7 @@ describe Dither do
 
   it 'can compute 2-way mipog using symbols' do
     params = [[:a, :b, :c], [:d, :e, :f], [:h, :i]]
-    expect(Dither.mipog(params)).to eq([[:a, :d, :h],
+    expect(Dither.mipog(params).to_set).to eq([[:a, :d, :h],
                                         [:a, :e, :i],
                                         [:a, :f, :h],
                                         [:b, :d, :i],
@@ -62,7 +62,7 @@ describe Dither do
                                         [:b, :f, :i],
                                         [:c, :d, :h],
                                         [:c, :e, :i],
-                                        [:c, :f, :h]])
+                                        [:c, :f, :h]].to_set)
   end
 
   it 'can compute 2-way mipog' do
@@ -95,7 +95,7 @@ describe Dither do
 
   it 'can compute 3-way ipog' do
     params = [(0...2).to_a, (0...2).to_a, (0..3).to_a]
-    expect(Dither.all_pairs(params, 3)).to eq([[0, 0, 0],
+    expect(Dither.all_pairs(params, 3).to_set).to eq([[0, 0, 0],
                                                [1, 0, 0],
                                                [0, 1, 0],
                                                [1, 1, 0],
@@ -111,7 +111,7 @@ describe Dither do
                                                [1, 0, 3],
                                                [0, 1, 3],
                                                [1, 1, 3],
-                                              ])
+                                              ].to_set)
   end
 
   it 'can compute 3-way ipog with constraints' do
@@ -123,7 +123,7 @@ describe Dither do
                               {0 => 0,
                                1 => 1,
                                2 => 0}
-                            ])).to eq([[0, 0, 0],
+                            ]).to_set).to eq([[0, 0, 0],
                                        [1, 0, 0],
                                        [1, 1, 0],
                                        [0, 0, 1],
@@ -136,7 +136,7 @@ describe Dither do
                                        [1, 0, 3],
                                        [0, 1, 3],
                                        [1, 1, 3],
-                                      ])
+                                      ].to_set)
   end
 
   it 'another 3-way ipog with constraints' do
@@ -146,7 +146,7 @@ describe Dither do
                               {0 => 0,
                                1 => 1,
                                2 => 0}
-                            ])).to eq([[0, 0, 0, 0],
+                            ]).to_set).to eq([[0, 0, 0, 0],
                                        [1, 1, 0, 0],
                                        [1, 0, 1, 0],
                                        [0, 1, 1, 0],
@@ -163,7 +163,7 @@ describe Dither do
                                        [1, 0, 1, 3],
                                        [0, 1, 1, 3],
                                        [0, 0, 0, 1],
-                                       [0, 1, 1, 1]])
+                                       [0, 1, 1, 1]].to_set)
 
 #           results = Dither.all_pairs([
 #                                     (0...10).to_a,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,6 +71,7 @@ files:
 - lib/dither.rb
 - lib/dither/ipog.rb
 - lib/dither/ipog_helper.rb
+- lib/dither/java_ext/dither.rb
 - lib/dither/mipog.rb
 - lib/dither/param.rb
 - lib/dither/test_case.rb