quick-sampler 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce420572de6ae77e74e2736e3501d5e9daf2953
-  data.tar.gz: 1ab7c6e1c3c11277e105a47befad9fe974fe760c
+  metadata.gz: 35617377a366c985607e9bd8c955f2a51885625a
+  data.tar.gz: c2becb43c4867529b643533629c6c9256df079d6
 SHA512:
-  metadata.gz: dbb04b8b15840fcc0e12885d3b82e8757696b381acbbb787c80ce9953d818849d6d977873dc666e6f9757e605d9e01fb66992ac3ac24c3d7f845e8c4399a754b
-  data.tar.gz: 46d536fe6288ddfb8779b5b26131f4dfc813a61b6f9e76c24ccf37241e35b64aa008142f56eeab3b5c4fe7435adcc7da547f83bb3ad814dfc3518e20aa396d9c
+  metadata.gz: 8d2a1fe1f914b0a12fa11e2eb81ffb97b986d3b5ffc6049d4bf435f7cdd02f280f66be459fd1a6b59bb5d726445952d4b89b02709489ea19b53ba7729bc51c2c
+  data.tar.gz: cf867a49b484f43542de4353fb47f1408f9e8dce55e1681b971f2bf57dc29523364f2a919b9ac38200b056b13c6ff7c9313136759feea72dd5e1e79e5b45aae9

data/lib/quick/sampler/base.rb

@@ -79,7 +79,7 @@ module Quick
         case source
         when Enumerator::Lazy
           source
-        when Enumerator
+        when Enumerable
           source.lazy
         when ->(i) { i.respond_to? :call }
           Enumerator.new do |recipient|

data/lib/quick/sampler/dsl/simple_combinators.rb

@@ -32,8 +32,12 @@ module Quick
       def one_of_weighted expression_weights
         total_weight, expressions = expression_weights
           .reduce([0, {}]) { |(total_weight, expressions), (expression, weight)|
-            total_weight += weight
-            [total_weight, expressions.merge(total_weight => expression)]
+            if weight > 0
+              total_weight += weight
+              [total_weight, expressions.merge(total_weight => expression)]
+            else
+              [total_weight, expressions]
+            end
           }
 
         feed {
@@ -123,6 +127,36 @@ module Quick
         send_to(the_class, :new, *args)
       end
 
+      # Custom sampler combinator
+      #
+      # `combine` allows to implement a custom combination of samplers: the
+      # method expects individual samplers as arguments and the combination
+      # implementation as a block. The resulting sampler will sample each of
+      # the supplied sub-samplers, pass the sampled values to the block and emit
+      # block result as combined sample.
+      #
+      # @param [*Quick::Sampler] *samplers
+      #   samplers to combine
+      # @return [Quick::Sampler]
+      #   a combination sampler
+      # @yieldparam [*Anything] samples
+      #   sampled values from each of the combined samplers
+      # @yieldreturn [Anything]
+      #   combined sampled value
+      def combine *samplers, &block
+        list_like(*samplers).map(&block)
+      end
+
+      # Sampler of merged hashes
+      #
+      # @param [Hash, *Quick::Sampler<Hash>] *samplers
+      #   `Hash`es or samplers emitting `Hash` values to merge
+      # @return [Quick::Sampler<Hash>]
+      #   a sampler emitting merged hash
+      def merge *samplers
+        combine(*samplers) { |hashes| hashes.reduce(:merge) }
+      end
+
       private
 
       def recursive_sample value

data/lib/quick/sampler/dsl/simple_values.rb

@@ -92,6 +92,24 @@ module Quick
         send_to( send_to(repertoire, :sample, size), :join )
       end
 
+      # "Probability" sampler
+      #
+      # @return [Quick::Sampler<Float>]
+      #   a sampler emitting a float in range `0.0..1.0`
+      def probability
+        pick_from(0..1.0)
+      end
+
+      # Weighted truth sampler
+      #
+      # @param [Float] weight
+      #   probably of emitting `true`
+      # @return [Quick::Sampler<Boolean>]
+      #   a sampler emitting `true` with probability `weight` or false with probability `(1.0 - weight)`
+      def weighted_truth weight
+        one_of_weighted true => weight, false => (1 - weight)
+      end
+
     end
   end
 end

data/lib/quick/sampler/dsl.rb

@@ -35,15 +35,16 @@ module Quick
         "Quick Sampler DSL"
       end
 
-      # Wraps a block into a lazy enumerator which will become sampler.
+      # Sample an enumerable or block
       #
-      # I haven't decided yet if this is a private implementation detail
-      # or a powerful albeit confusing DSL verb
+      # The block is ignored if `enum` parameter isn't `nil`
       #
+      # @param [Enumerable] enum
+      #   an enumerable to sample values from
       # @yieldreturn [<Sample>] a sampled value
-      #
-      def feed &block
-        Fluidiom.new(Base.new(block))
+      def feed enum = nil, &block
+        enum ||= block if block_given?
+        Fluidiom.new(Base.new(enum))
       end
 
       private

data/lib/quick/sampler/version.rb

@@ -1,5 +1,5 @@
 module Quick
   module Sampler
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/spec/quick/sampler/dsl/combine_spec.rb

@@ -0,0 +1,11 @@
+describe Quick::Sampler::DSL do
+  it { is_expected.to have_method :combine }
+
+  describe "#combine" do
+    let(:dsl) { described_class.new }
+    let(:english) { dsl.feed(["one", "two"]) }
+    let(:dutch) { dsl.feed(["één", "twee"]) }
+    subject(:combined) { dsl.combine(english, dutch) {|e,d| "#{e} = #{d}"}.force }
+    it { is_expected.to eq ["one = één", "two = twee"] }
+  end
+end

data/spec/quick/sampler/dsl/merge_spec.rb

@@ -0,0 +1,19 @@
+describe Quick::Sampler::DSL do
+  it { is_expected.to have_method :merge }
+
+  describe "#merge" do
+    let(:dsl) { described_class.new }
+    let(:defaults_hash) { { prime: 7, negative: -42} }
+    let(:first_sampler) { dsl.feed( [{prime: 13}, {negative: -43}] ) }
+    let(:second_sampler) { dsl.feed( [{string: "one"}, {string: "two"}] ) }
+    subject(:merged) {
+      dsl.merge(defaults_hash, first_sampler, second_sampler).force
+    }
+    it {
+      is_expected.to contain_exactly(
+        { prime: 13, negative: -42, string: "one" },
+        { prime: 7, negative: -43, string: "two" },
+      )
+    }
+  end
+end

data/spec/quick/sampler/dsl/simple_values_spec.rb

@@ -32,4 +32,26 @@ describe Quick::Sampler::DSL do
       it { is_expected.to all match /^[a-z]{1,10}$/ }
     end
   end
+
+  describe "#probability" do
+    subject(:samples) { dsl.probability.first(5) }
+    it { is_expected.to all (be >= 0.0).and be <= 1.0 }
+  end
+
+  describe "#weighted_truth" do
+    describe "improbable truth" do
+      subject(:samples) { dsl.weighted_truth(0.0).first(5) }
+      it { is_expected.to all be false }
+    end
+
+    describe "certain truth" do
+      subject(:samples) { dsl.weighted_truth(1.0).first(5) }
+      it { is_expected.to all be true }
+    end
+
+    describe "maybe" do
+      subject(:samples) { dsl.weighted_truth(0.5).first(5) }
+      it { is_expected.to all be(true).or be(false) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quick-sampler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Artem Baguinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,8 +123,10 @@ files:
 - lib/quick/sampler/version.rb
 - quick-sampler.gemspec
 - spec/quick/sampler/compile_spec.rb
+- spec/quick/sampler/dsl/combine_spec.rb
 - spec/quick/sampler/dsl/hash_like_spec.rb
 - spec/quick/sampler/dsl/list_like_spec.rb
+- spec/quick/sampler/dsl/merge_spec.rb
 - spec/quick/sampler/dsl/send_to_spec.rb
 - spec/quick/sampler/dsl/simple_values_spec.rb
 - spec/spec_helper.rb
@@ -154,8 +156,10 @@ specification_version: 4
 summary: Composable samplers of random data
 test_files:
 - spec/quick/sampler/compile_spec.rb
+- spec/quick/sampler/dsl/combine_spec.rb
 - spec/quick/sampler/dsl/hash_like_spec.rb
 - spec/quick/sampler/dsl/list_like_spec.rb
+- spec/quick/sampler/dsl/merge_spec.rb
 - spec/quick/sampler/dsl/send_to_spec.rb
 - spec/quick/sampler/dsl/simple_values_spec.rb
 - spec/spec_helper.rb