dither 0.0.13-java → 0.0.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09eb8f9c172f2c8272ce2ecebfca696fb3f0bd96
-  data.tar.gz: 8fe24e47535703bfcdbf0d7b89d98057f5b7f58b
+  metadata.gz: d5b7420519739680db03d3fe61fde5b2dbfdd232
+  data.tar.gz: 9040ba82bca618ecef442c9d57ee22dfc480cd44
 SHA512:
-  metadata.gz: 264f35c17cd6cb3b438b16f203d6b1ecf080eff713311c20d84c0bb98205ebeb2a8732bd62753df961ee45c27bd95981f91cbea667ed990f109f113cc0a41cef
-  data.tar.gz: 70ab8e5682939a65c83eb0672de26fc8adfdee41207b7093e7815f7533508219cf1beb61544674f8cc45482a337eaa7a6c8ec66504e58c94be4e8981cf1ec3b9
+  metadata.gz: 0190ae6f58bd9e8859936724014184f553ad56dc8873a68c72c1971d4d767b30d093e5d98d475c9bc1d6ccea76d0e887053844f22583e705f9c3067b12b8e68b
+  data.tar.gz: 4fd98411e58f744ac2ec6e862e7bc7cf99d30bcacbdea419dfd8a204bdd38cc0fb22b8aab42c326f0f1cfc23381cd3d5b42ce1c058dc5e96af850885ef3bbdd6

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,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: java
 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
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: coveralls
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -59,15 +59,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - dither.gemspec
+- lib/dither-0.0.3.jar
 - lib/dither.rb
 - lib/dither/ateg.rb
 - lib/dither/ateg_pairwise.rb
@@ -83,7 +84,6 @@ 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
@@ -94,17 +94,17 @@ 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.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Collection of test generation strategies