frequency_enumerator 1.0.1 → 1.1.0

data/README.md

@@ -26,7 +26,7 @@ You might discover, that in fact, almost no one drinks tea and everyone loves bi
 { :tea => 25, :coffee => 60, :biscuit => 115 }
 ```
 
-It'd be nice if we could brute-force the problem, but be more intelligent about the order in which we do so. We should use make use of our valuable, newfound knowledge.
+It'd be nice if we could brute-force the problem, but be more intelligent about the order in which we do so. We should make use of our valuable, newfound knowledge.
 
 And that's exactly what Frequency Enumerator does. (I got there in the end!)
 
@@ -50,7 +50,7 @@ end
 The first 10 attempts yielded to the block are:
 
 ```ruby
-{ :tea => 1, :coffee => 1, :biscuit => 1 }
+{ :tea => 0, :coffee => 0, :biscuit => 0 }
 { :tea => 0, :coffee => 0, :biscuit => 1 }
 { :tea => 0, :coffee => 0, :biscuit => 2 }
 { :tea => 0, :coffee => 0, :biscuit => 3 }
@@ -62,7 +62,7 @@ The first 10 attempts yielded to the block are:
 { :tea => 0, :coffee => 0, :biscuit => 5 }
 ```
 
-As you can see, most of attempts change the number of biscuits, whilst we haven't even explored the possibility that tea might be in the solution yet.
+As you can see, most of the attempts change the number of biscuits, whilst we haven't even explored the possibility that tea might be in the solution yet.
 
 ## Limit
 
@@ -85,6 +85,13 @@ You can set 'from' and 'to' to explore different portions of the search space:
 
 This might be useful for multi-threading, map-reduce, or carrying on from where you left off if you're exploring a large search space.
 
+You can specify an offset that affects all frequencies:
+
+```ruby
+  FrequencyEnumerator.new(distribution, :offset => 3).first
+  #=> { 'a' => 3, 'b' => 3 }
+```
+
 ## Real-world example
 
 My motivation for building this gem is to more intelligently brute-force the problem of finding [self-enumerating pangrams](http://en.wikipedia.org/wiki/Pangram#Self-enumerating_pangrams) by using classical literature to build a frequency distribution of English text.

data/lib/frequency_enumerator/base.rb

@@ -8,6 +8,7 @@ class FrequencyEnumerator < Enumerable::Enumerator
     @bit_count  = params[:bit_count]  || 6
     @from       = params[:from]       || 0
     @to         = params[:to]         || limit
+    @offset     = params[:offset]     || 0
 
     raise_if_either_boundary_is_out_of_range
 
@@ -20,7 +21,8 @@ class FrequencyEnumerator < Enumerable::Enumerator
     (from..to).each do |i|
       binary = decomposer.decompose(i)
       bitmap = fragmented_bitmap(binary)
-      yield composition(bitmap)
+      result = composition(bitmap)
+      yield offset(result)
     end
 
     self
@@ -50,6 +52,12 @@ class FrequencyEnumerator < Enumerable::Enumerator
     end
   end
 
+  def offset(result)
+    result.inject({}) do |h, (k, v)|
+      h.merge(k => (v + @offset))
+    end
+  end
+
   def sorted_keys
     return @sorted_keys if @sorted_keys
     sorter = @sorter.new(:bit_count => @bit_count)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frequency_enumerator
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Christopher Patuzzo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 Z
+date: 2012-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec