dither 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1615f95c32d97e471ea43d8714dee5a9c9e4f1ad
-  data.tar.gz: 2284c90542966f2487969b68d35c30d372493a6c
+  metadata.gz: 84c66959b6921cffc06d9cac3b5bf925cff4e05d
+  data.tar.gz: c55fe4643b714ec9fb2e5a12e088c21576cc3b9c
 SHA512:
-  metadata.gz: 9f548f30dc8de6d28276fe42284451f01408bd1b86c4e627bd7f40651e62a2cddc872940007b840cf2653dfafeb3d92597726a587f2210e31f9be1cf7eb975d8
-  data.tar.gz: 5c8fb0bb33f372328275e2090821ffdfa8bba20dd7c20e054ae696acecffa114fb2b3416faceeb3985c971418c3269e394ee2f56b271fcc3f660b02fb2001ee0
+  metadata.gz: d2fafce619a3975a7836d6ee89bb26c486a7de41f36a5dfc6a0b8bc249ac3995976d860591c9de024a309f741b01dd76cea24705b6bacbd6475df26f74f200ee
+  data.tar.gz: c861ce9af750be22f8071c21d0939576b9885a3f08292375090e3c03393094b94db7cef2d1f58e9e4b0105f5a9c5166c7dd5a22b49c2f47d06efbcf14863839a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dither (0.0.5)
+    dither (0.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -45,6 +45,7 @@ GEM
     tins (1.3.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/dither/ipog_helper.rb

@@ -14,10 +14,10 @@ module Dither
                        .map(&:to_set)
       end
 
-      raise 't must be >= 2' if t < 2
-      raise 't must be <= params.length' if t > params.length
+      raise Dither::Error, 't must be >= 2' if t < 2
+      raise Dither::Error, 't must be <= params.length' if t > params.length
       params.each do |param|
-        raise 'param length must be > 1' if param.length < 2
+        raise Dither::Error, 'param length must be > 1' if param.length < 2
       end
     end
 
@@ -103,7 +103,7 @@ module Dither
                  .map(&:flatten)
                  .map { |a| TestCase.create(params, unbound_param_pool, a) }
       end
-      result
+      result.to_set
     end
 
 

data/lib/dither/test_case.rb

@@ -46,18 +46,6 @@ module Dither
       arr
     end
 
-    def self.from_array(arr)
-      test_case = TestCase.new
-      arr.each_with_index do |i, e|
-        if e.nil?
-          test_case << unbound_param_pool[i]
-        else
-          test_case << bound_param_pool[i][e]
-        end
-      end
-      test_case
-    end
-
     # return nil if there is a conflict
     # return self if no conflict
     def merge_without_conflict(i, test_case, &block)
@@ -66,9 +54,10 @@ module Dither
         .each_with_index do |arr, a|
         first, second = arr
 
-        next if (first == second) || second.nil?
         if first.nil? && second.nil?
           new_elements << unbound_param_pool[a]
+        elsif (first == second) || second.nil?
+          next
         elsif first.nil?
           new_elements << bound_param_pool[a][second]
         else
@@ -81,7 +70,10 @@ module Dither
 
       return nil if block_given? && block.call(new_self)
 
-      new_elements.each { |a| self << a }
+      new_elements.each do |a|
+        self.delete(unbound_param_pool[a.i]) unless a.unbound?
+        self << a
+      end
       self
     end
   end # TestCase

data/lib/dither/version.rb

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

data/lib/dither.rb

@@ -3,11 +3,14 @@ require 'set'
 
 module Dither
 
+  class Error < StandardError; end
+
   def self.all_pairs(params, t = 2, opts = {})
     IPOG.new(params, t, opts).run
   end
 
   def self.mipog(params, t = 2, opts = {})
+    raise Error, 'mipog does not support constraints' if opts.key?(:constraints)
     MIPOG.new(params, t, opts).run
   end
 end # Dither

data/spec/dither/dither_spec.rb

@@ -2,16 +2,20 @@ require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Dither do
 
+  it 'mipog does not support constraints' do
+    expect { Dither.mipog([[1,1],[1,2]], 2, :constraints => []) }.to raise_error(Dither::Error, 'mipog does not support constraints')
+  end
+
   it 't must be >= 2' do
-    expect { Dither.all_pairs([], 0) }.to raise_error('t must be >= 2')
+    expect { Dither.all_pairs([], 0) }.to raise_error(Dither::Error, 't must be >= 2')
   end
 
   it 't must be <= params.length' do
-    expect { Dither.all_pairs([(0...3).to_a], 4) }.to raise_error('t must be <= params.length')
+    expect { Dither.all_pairs([(0...3).to_a], 4) }.to raise_error(Dither::Error,'t must be <= params.length')
   end
 
   it 'param length must be > 1' do
-    expect { Dither.all_pairs([[], []], 2) }.to raise_error('param length must be > 1')
+    expect { Dither.all_pairs([[], []], 2) }.to raise_error(Dither::Error,'param length must be > 1')
   end
 
   it 'can compute 2-way ipog using symbols' do
@@ -158,6 +162,61 @@ describe Dither do
                                        [1, 1, 0, 3],
                                        [1, 0, 1, 3],
                                        [0, 1, 1, 3],
-                                       [0, 0, 0, 1]])
+                                       [0, 0, 0, 1],
+                                       [0, 1, 1, 1]])
+
+#           results = Dither.all_pairs([
+#                                     (0...10).to_a,
+#                                     (0...10).to_a,
+#                                     (0...4).to_a,
+#                                     (0...3).to_a,
+#                                     (0...3).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                     (0...2).to_a,
+#                                   ], 4)
+
+#        results = Dither.all_pairs([
+#                                 (0...4).to_a,
+#                                 (0...4).to_a,
+#                                 (0...4).to_a,
+#                                 (0...4).to_a,
+#                                 (0...4).to_a,
+#                                 (0...3).to_a,
+#                                 (0...3).to_a,
+#                                 (0...3).to_a,
+#                                 (0...3).to_a,
+#                               ], 2)
+
+
+        results = Dither.all_pairs([
+                                 (0...2).to_a, # user type
+                                 (0...2).to_a, # exists?
+                                 (0...2).to_a, # seats
+                                 (0...2).to_a, # seats
+                                 (0...3).to_a, # user region
+                                 (0...3).to_a, # currency
+                                 (0...3).to_a,
+                                 (0...4).to_a, # payment
+                                 (0...6).to_a, # delivery
+                                 (0...6).to_a,
+                               ], 3)
+
+        # mipog 2-way 36... ipog 36
+        # mipog 3-way 156... ipog 151
+        # mipog 4-way 592... ipog 511
+
+#    results = Dither.all_pairs( [[1,2],
+#                                  ['1','2'],
+#                                  [1.0,2.0],
+#                                  [true, false, 3]],3)
+            require 'csv'
+            results.each { |a| puts a.to_csv }
+            puts results.count
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec