picky 3.3.1 → 3.3.2

data/lib/picky/backends/memory/text.rb

@@ -49,7 +49,7 @@ module Picky
           ::File.open(cache_path, 'r:utf-8') do |file|
             file.each_line do |line|
               id, token = line.split ?,, 2
-              yield id, (token.chomp! || token).to_sym
+              yield id, (token.chomp! || token).to_sym # TODO to_sym
             end
           end
         end

data/lib/picky/backends/redis.rb

@@ -21,28 +21,28 @@ module Picky
       #   [:token] # => [id, id, id, id, id] (an array of ids)
       #
       def create_inverted bundle
-        extract_lambda_or(inverted, client, bundle) ||
+        extract_lambda_or(inverted, bundle, client) ||
         List.new(client, "#{bundle.identifier}:inverted")
       end
       # Returns an object that on #initial, #load returns an object that responds to:
       #   [:token] # => 1.23 (a weight)
       #
       def create_weights bundle
-        extract_lambda_or(weights, client, bundle) ||
+        extract_lambda_or(weights, bundle, client) ||
         Float.new(client, "#{bundle.identifier}:weights")
       end
       # Returns an object that on #initial, #load returns an object that responds to:
       #   [:encoded] # => [:original, :original] (an array of original symbols this similarity encoded thing maps to)
       #
       def create_similarity bundle
-        extract_lambda_or(similarity, client, bundle) ||
+        extract_lambda_or(similarity, bundle, client) ||
         List.new(client, "#{bundle.identifier}:similarity")
       end
       # Returns an object that on #initial, #load returns an object that responds to:
       #   [:key] # => value (a value for this config key)
       #
       def create_configuration bundle
-        extract_lambda_or(configuration, client, bundle) ||
+        extract_lambda_or(configuration, bundle, client) ||
         String.new(client, "#{bundle.identifier}:configuration")
       end
 

data/lib/picky/bundle_indexing.rb

@@ -112,13 +112,6 @@ module Picky
       end
     end
 
-    # Generates a new index (writes its index) using the
-    # partial caching strategy of this bundle.
-    #
-    def generate_partial
-      generator = Generators::PartialGenerator.new self.inverted
-      self.inverted = generator.generate self.partial_strategy
-    end
     # Generate a partial index from the given exact inverted index.
     #
     def generate_partial_from exact_inverted_index
@@ -127,19 +120,24 @@ module Picky
       self.generate_partial
       self
     end
+
+    # Generates a new index (writes its index) using the
+    # partial caching strategy of this bundle.
+    #
+    def generate_partial
+      self.inverted = partial_strategy.generate_from self.inverted
+    end
     # Generates a new weights index (writes its index) using the
     # given weight caching strategy.
     #
     def generate_weights
-      generator = Generators::WeightsGenerator.new self.inverted
-      self.weights = generator.generate self.weights_strategy
+      self.weights = weights_strategy.generate_from self.inverted
     end
     # Generates a new similarity index (writes its index) using the
     # given similarity caching strategy.
     #
     def generate_similarity
-      generator = Generators::SimilarityGenerator.new self.inverted
-      self.similarity = generator.generate self.similarity_strategy
+      self.similarity = similarity_strategy.generate_from self.inverted
     end
 
     # Saves the indexes in a dump file.

data/lib/picky/category_realtime.rb

@@ -32,7 +32,7 @@ module Picky
     def add_tokenized id, tokens
       tokens.each do |text|
         next unless text
-        text = text.to_sym
+        text = text.to_sym # TODO to_sym
         exact.add id, text
         partial.add_partialized id, text
       end

data/lib/picky/generators/strategy.rb

@@ -7,6 +7,8 @@ module Picky
       # By default, all caches are saved in a
       # storage (like a file).
       #
+      # TODO Move to the backends?
+      #
       def saved?
         true
       end

data/lib/picky/loader.rb

@@ -103,13 +103,6 @@ module Picky
       load_relative 'generators/similarity/soundex'
       load_relative 'generators/similarity/default'
 
-      # Index generators.
-      #
-      load_relative 'generators/base'
-      load_relative 'generators/partial_generator'
-      load_relative 'generators/weights_generator'
-      load_relative 'generators/similarity_generator'
-
       # Index store handling.
       #
       load_relative 'backends/helpers/file'

data/lib/picky/wrappers/category/exact_first.rb

@@ -4,48 +4,52 @@ module Picky
 
   module Wrappers
 
-    # This index combines an exact and partial index.
-    # It serves to order the results such that exact hits are found first.
-    #
-    class ExactFirst < Bundle
-
-      delegate :similar,
-               :identifier,
-               :name,
-               :to => :@exact
-      delegate :index,
-               :category,
-               :weight,
-               :generate_partial_from,
-               :generate_caches_from_memory,
-               :generate_derived,
-               :dump,
-               :load,
-               :to => :@partial
-
-      def initialize category
-        @exact   = category.exact
-        @partial = category.partial
-      end
+    module Category
+
+      # This index combines an exact and partial index.
+      # It serves to order the results such that exact hits are found first.
+      #
+      class ExactFirst
+
+        delegate :similar,
+                 :identifier,
+                 :name,
+                 :to => :@exact
+        delegate :index,
+                 :category,
+                 :weight,
+                 :generate_partial_from,
+                 :generate_caches_from_memory,
+                 :generate_derived,
+                 :dump,
+                 :load,
+                 :to => :@partial
+
+        def initialize category
+          @exact   = category.exact
+          @partial = category.partial
+        end
 
-      def self.wrap index_or_category
-        if index_or_category.respond_to? :categories
-          wrap_each_of index_or_category.categories
-          index_or_category
-        else
-          new index_or_category
+        def self.wrap index_or_category
+          if index_or_category.respond_to? :categories
+            wrap_each_of index_or_category.categories
+            index_or_category
+          else
+            new index_or_category
+          end
+        end
+        def self.wrap_each_of categories
+          categories.categories.collect! { |category| new(category) }
         end
-      end
-      def self.wrap_each_of categories
-        categories.categories.collect! { |category| new(category) }
-      end
 
-      def ids text
-        @exact.ids(text) + @partial.ids(text)
-      end
+        def ids text
+          @exact.ids(text) + @partial.ids(text)
+        end
+
+        def weight text
+          [@exact.weight(text) || 0, @partial.weight(text) || 0].max
+        end
 
-      def weight text
-        [@exact.weight(text) || 0, @partial.weight(text) || 0].max
       end
 
     end

data/spec/lib/adapters/rack/live_parameters_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 
 describe Picky::Adapters::Rack::LiveParameters do
-  
+
   let(:live_parameters) { stub :live_parameters }
   let(:adapter) { described_class.new live_parameters }
-  
+
   describe 'to_app' do
     it 'works' do
       lambda { adapter.to_app }.should_not raise_error
@@ -16,11 +16,11 @@ describe Picky::Adapters::Rack::LiveParameters do
     end
     it 'returned lambda should call parameters on the live parameters' do
       env = { 'rack.input' => 'some input' }
-      
-      live_parameters.should_receive(:parameters).once.with({})
-      
+
+      live_parameters.should_receive(:parameters).once.with({}).and_return Hash.new
+
       adapter.to_app.call env
     end
   end
-  
+
 end

data/spec/lib/backends/redis_spec.rb

@@ -11,7 +11,7 @@ describe Picky::Backends::Redis do
 
       @backend.stub! :timed_exclaim
     end
-  
+
     describe 'create_...' do
       [
         [:inverted,      Picky::Backends::Redis::Float],
@@ -27,17 +27,17 @@ describe Picky::Backends::Redis do
       end
     end
   end
-  
+
   context 'with lambda options' do
     before(:each) do
-      @backend = described_class.new inverted:      ->(client, bundle){ Picky::Backends::Redis::Float.new(client, bundle.identifier(:inverted)) },
-                                     weights:       ->(client, bundle){ Picky::Backends::Redis::String.new(client, bundle.identifier(:weights)) },
-                                     similarity:    ->(client, bundle){ Picky::Backends::Redis::Float.new(client, bundle.identifier(:similarity)) },
-                                     configuration: ->(client, bundle){ Picky::Backends::Redis::List.new(client, bundle.identifier(:configuration)) }
+      @backend = described_class.new inverted:      ->(bundle, client){ Picky::Backends::Redis::Float.new(client, bundle.identifier(:inverted)) },
+                                     weights:       ->(bundle, client){ Picky::Backends::Redis::String.new(client, bundle.identifier(:weights)) },
+                                     similarity:    ->(bundle, client){ Picky::Backends::Redis::Float.new(client, bundle.identifier(:similarity)) },
+                                     configuration: ->(bundle, client){ Picky::Backends::Redis::List.new(client, bundle.identifier(:configuration)) }
 
       @backend.stub! :timed_exclaim
     end
-  
+
     describe 'create_...' do
       [
         [:inverted,      Picky::Backends::Redis::Float],
@@ -60,7 +60,7 @@ describe Picky::Backends::Redis do
 
       @backend.stub! :timed_exclaim
     end
-  
+
     describe 'create_...' do
       [
         [:inverted,      Picky::Backends::Redis::List],
@@ -89,42 +89,42 @@ describe Picky::Backends::Redis do
     #     @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
     #     @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
     #     @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
-    # 
+    #
     #     @backend.ids(@combinations, :any, :thing).should == (1..10).to_a
     #   end
     #   it "should intersect symbol_keys correctly" do
     #     @combination1.should_receive(:ids).once.with.and_return (:'00001'..:'10000').to_a
     #     @combination2.should_receive(:ids).once.with.and_return (:'00001'..:'00100').to_a
     #     @combination3.should_receive(:ids).once.with.and_return (:'00001'..:'00010').to_a
-    # 
+    #
     #     @backend.ids(@combinations, :any, :thing).should == (:'00001'..:'0010').to_a
     #   end
     #   it "should intersect correctly when intermediate intersect result is empty" do
     #     @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
     #     @combination2.should_receive(:ids).once.with.and_return (11..100).to_a
     #     @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
-    # 
+    #
     #     @backend.ids(@combinations, :any, :thing).should == []
     #   end
     #   it "should be fast" do
     #     @combination1.should_receive(:ids).once.with.and_return (1..100_000).to_a
     #     @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
     #     @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
-    # 
+    #
     #     performance_of { @backend.ids(@combinations, :any, :thing) }.should < 0.004
     #   end
     #   it "should be fast" do
     #     @combination1.should_receive(:ids).once.with.and_return (1..1000).to_a
     #     @combination2.should_receive(:ids).once.with.and_return (1..100).to_a
     #     @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
-    # 
+    #
     #     performance_of { @backend.ids(@combinations, :any, :thing) }.should < 0.00015
     #   end
     #   it "should be fast" do
     #     @combination1.should_receive(:ids).once.with.and_return (1..1000).to_a
     #     @combination2.should_receive(:ids).once.with.and_return (901..1000).to_a
     #     @combination3.should_receive(:ids).once.with.and_return (1..10).to_a
-    # 
+    #
     #     performance_of { @backend.ids(@combinations, :any, :thing) }.should < 0.0001
     #   end
     # end

data/spec/lib/indexed/wrappers/exact_first_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Picky::Wrappers::ExactFirst do
+describe Picky::Wrappers::Category::ExactFirst do
 
   before(:each) do
     @exact    = stub :exact
@@ -16,10 +16,10 @@ describe Picky::Wrappers::ExactFirst do
         index = Picky::Index.new :some_index
         index.define_category :some_category
 
-        Picky::Wrappers::ExactFirst.wrap index
+        described_class.wrap index
 
         index.categories.categories.each do |category|
-          category.should be_kind_of(Picky::Wrappers::ExactFirst)
+          category.should be_kind_of(described_class)
         end
       end
       it "returns the index" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000 Z
+date: 2011-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70141614921940 !ruby/object:Gem::Requirement
+  requirement: &70176846773480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141614921940
+  version_requirements: *70176846773480
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70141614921380 !ruby/object:Gem::Requirement
+  requirement: &70176846773000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.2
   type: :development
   prerelease: false
-  version_requirements: *70141614921380
+  version_requirements: *70176846773000
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70141614920980 !ruby/object:Gem::Requirement
+  requirement: &70176846772620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614920980
+  version_requirements: *70176846772620
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70141614920560 !ruby/object:Gem::Requirement
+  requirement: &70176846772200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614920560
+  version_requirements: *70176846772200
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70141614920140 !ruby/object:Gem::Requirement
+  requirement: &70176846771780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614920140
+  version_requirements: *70176846771780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70141614919700 !ruby/object:Gem::Requirement
+  requirement: &70176846771360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614919700
+  version_requirements: *70176846771360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70141614918940 !ruby/object:Gem::Requirement
+  requirement: &70176846770860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614918940
+  version_requirements: *70176846770860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70141614916860 !ruby/object:Gem::Requirement
+  requirement: &70176846770360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614916860
+  version_requirements: *70176846770360
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70141614916340 !ruby/object:Gem::Requirement
+  requirement: &70176846769980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614916340
+  version_requirements: *70176846769980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70141614908600 !ruby/object:Gem::Requirement
+  requirement: &70176846769520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614908600
+  version_requirements: *70176846769520
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70141614908020 !ruby/object:Gem::Requirement
+  requirement: &70176846769100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614908020
+  version_requirements: *70176846769100
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70141614907420 !ruby/object:Gem::Requirement
+  requirement: &70176846768680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70141614907420
+  version_requirements: *70176846768680
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -208,7 +208,6 @@ files:
 - lib/picky/generators/partial/postfix.rb
 - lib/picky/generators/partial/strategy.rb
 - lib/picky/generators/partial/substring.rb
-- lib/picky/generators/partial_generator.rb
 - lib/picky/generators/similarity/default.rb
 - lib/picky/generators/similarity/double_metaphone.rb
 - lib/picky/generators/similarity/metaphone.rb
@@ -216,12 +215,10 @@ files:
 - lib/picky/generators/similarity/phonetic.rb
 - lib/picky/generators/similarity/soundex.rb
 - lib/picky/generators/similarity/strategy.rb
-- lib/picky/generators/similarity_generator.rb
 - lib/picky/generators/strategy.rb
 - lib/picky/generators/weights/default.rb
 - lib/picky/generators/weights/logarithmic.rb
 - lib/picky/generators/weights/strategy.rb
-- lib/picky/generators/weights_generator.rb
 - lib/picky/helpers/measuring.rb
 - lib/picky/index.rb
 - lib/picky/index_indexed.rb
@@ -325,15 +322,12 @@ files:
 - spec/lib/generators/partial/none_spec.rb
 - spec/lib/generators/partial/postfix_spec.rb
 - spec/lib/generators/partial/substring_spec.rb
-- spec/lib/generators/partial_generator_spec.rb
 - spec/lib/generators/similarity/double_metaphone_spec.rb
 - spec/lib/generators/similarity/metaphone_spec.rb
 - spec/lib/generators/similarity/none_spec.rb
 - spec/lib/generators/similarity/phonetic_spec.rb
 - spec/lib/generators/similarity/soundex_spec.rb
-- spec/lib/generators/similarity_generator_spec.rb
 - spec/lib/generators/weights/logarithmic_spec.rb
-- spec/lib/generators/weights_generator_spec.rb
 - spec/lib/helpers/measuring_spec.rb
 - spec/lib/index_indexed_spec.rb
 - spec/lib/index_indexing_spec.rb
@@ -404,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/picky
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! 'Picky: Semantic Search Engine. Clever Interface. Good Tools.'
@@ -451,15 +445,12 @@ test_files:
 - spec/lib/generators/partial/none_spec.rb
 - spec/lib/generators/partial/postfix_spec.rb
 - spec/lib/generators/partial/substring_spec.rb
-- spec/lib/generators/partial_generator_spec.rb
 - spec/lib/generators/similarity/double_metaphone_spec.rb
 - spec/lib/generators/similarity/metaphone_spec.rb
 - spec/lib/generators/similarity/none_spec.rb
 - spec/lib/generators/similarity/phonetic_spec.rb
 - spec/lib/generators/similarity/soundex_spec.rb
-- spec/lib/generators/similarity_generator_spec.rb
 - spec/lib/generators/weights/logarithmic_spec.rb
-- spec/lib/generators/weights_generator_spec.rb
 - spec/lib/helpers/measuring_spec.rb
 - spec/lib/index_indexed_spec.rb
 - spec/lib/index_indexing_spec.rb

data/lib/picky/generators/partial_generator.rb

@@ -1,19 +0,0 @@
-module Picky
-
-  module Generators
-
-    # The partial generator uses a subtoken(downto:1) generator as default.
-    #
-    class PartialGenerator < Base
-
-      # Generate a partial index based on the given inverted index.
-      #
-      def generate strategy = Partial::Substring.new(from: 1)
-        strategy.generate_from self.inverted
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/generators/similarity_generator.rb

@@ -1,19 +0,0 @@
-module Picky
-
-  module Generators
-
-    # Uses no similarity as default.
-    #
-    class SimilarityGenerator < Base
-
-      # Generate a similarity index based on the given inverted index.
-      #
-      def generate strategy = Similarity::None.new
-        strategy.generate_from self.inverted
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/generators/weights_generator.rb

@@ -1,19 +0,0 @@
-module Picky
-
-  module Generators
-
-    # Uses a logarithmic algorithm as default.
-    #
-    class WeightsGenerator < Base
-
-      # Generate a weights index based on the given inverted index.
-      #
-      def generate strategy = Weights::Logarithmic.new
-        strategy.generate_from self.inverted
-      end
-
-    end
-
-  end
-
-end

data/spec/lib/generators/partial_generator_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Generators::PartialGenerator do
-
-  context 'integration' do
-    it 'should generate the correct values with a given strategy' do
-      generator = described_class.new :meier => [1], :maier => [2]
-      
-      generator.generate(Picky::Generators::Partial::Substring.new).should == {
-        :meier => [1],
-        :meie => [1],
-        :mei => [1],
-        :me => [1],
-        :m => [1, 2],
-        :maier => [2],
-        :maie => [2],
-        :mai => [2],
-        :ma => [2]
-      }
-    end
-    it 'should generate the correct values with a given specific strategy' do
-      generator = described_class.new :meier => [1], :maier => [2]
-      
-      generator.generate(Picky::Generators::Partial::Substring.new(:from => 3)).should == {
-        :meier => [1],
-        :meie => [1],
-        :mei => [1],
-        :maier => [2],
-        :maie => [2],
-        :mai => [2]
-      }
-    end
-  end
-
-end

data/spec/lib/generators/similarity_generator_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Generators::SimilarityGenerator do
-
-  context 'integration' do
-    it 'should generate the correct values' do
-      generator = described_class.new :anything_really
-
-      generator.generate.should == {}
-    end
-    it 'should generate the correct values with a given strategy' do
-      generator = described_class.new :meier => nil,
-                                                  :maier => nil,
-                                                  :mayer => nil,
-                                                  :meyer => nil,
-                                                  :peter => nil
-
-      generator.generate(Picky::Generators::Similarity::DoubleMetaphone.new).should == { :MR => [:meier, :maier, :mayer, :meyer], :PTR => [:peter] }
-    end
-  end
-
-end

data/spec/lib/generators/weights_generator_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Generators::WeightsGenerator do
-
-  context 'integration' do
-    it 'should generate the correct values' do
-      generator = described_class.new :a => Array.new(0),
-                                      :b => Array.new(1),
-                                      :c => Array.new(10),
-                                      :d => Array.new(100),
-                                      :e => Array.new(1000)
-
-      result = generator.generate
-
-      result[:c].should be_within(0.011).of(2.3)
-      result[:d].should be_within(0.011).of(4.6)
-      result[:e].should be_within(0.011).of(6.9)
-    end
-  end
-
-end