davidrichards-just_enumerable_stats 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 2
+:patch: 3

data/lib/just_enumerable_stats.rb

@@ -1,3 +1,7 @@
+# Need the FixedRange
+$:.unshift File.dirname(__FILE__)
+require 'fixed_range'
+
 # Borrowed this from my own gem, sirb
 
 class Object
@@ -200,6 +204,28 @@ module Enumerable
   end
   protected :iterate_midway
 
+  # Takes the range_class and returns its map.
+  # Example:
+  # require 'mathn'
+  # a = [1,2,3]
+  # a
+  # range_class = FixedRange, a.min, a.max, 1/4
+  # a.categories
+  # => [1, 5/4, 3/2, 7/4, 2, 9/4, 5/2, 11/4, 3]
+  # For non-numeric values, returns a unique set, 
+  # ordered if possible.
+  def categories
+    if self.is_numeric?
+      self.range_instance.map
+    else
+      self.uniq.sort rescue self.uniq
+    end
+  end
+  
+  def is_numeric?
+    self.all? {|e| e.is_a?(Numeric)}
+  end
+  
   # Just an array of [min, max] to comply with R uses of the work.  Use
   # range_as_range if you want a real Range. 
   def range(&block)
@@ -207,9 +233,13 @@ module Enumerable
   end
 
   # Useful for setting a real range class (FixedRange).
-  def range_class=(klass)
+  def set_range_class(klass, *args)
     @range_class = klass
+    @range_class_args = args
+    self.range_class
   end
+  
+  attr_reader :range_class_args
 
   # When creating a range, what class will it be?  Defaults to Range, but
   # other classes are sometimes useful. 
@@ -219,8 +249,13 @@ module Enumerable
 
   # Actually instantiates the range, instead of producing a min and max array.
   def range_as_range(&block)
-    range_class.new(min(&block), max(&block))
+    if @range_class_args and not @range_class_args.empty?
+      self.range_class.new(*@range_class_args)
+    else
+      self.range_class.new(min(&block), max(&block))
+    end
   end
+  alias :range_instance :range_as_range
 
   # I don't pass the block to the sort, because a sort block needs to look
   # something like: {|x,y| x <=> y}.  To get around this, set the default 

data/lib/just_enumerable_stats/stats.rb

@@ -199,6 +199,28 @@ module JustEnumerableStats #:nodoc:
     end
     protected :iterate_midway
 
+    # Takes the range_class and returns its map.
+    # Example:
+    # require 'mathn'
+    # a = [1,2,3]
+    # a
+    # range_class = FixedRange, a.min, a.max, 1/4
+    # a.categories
+    # => [1, 5/4, 3/2, 7/4, 2, 9/4, 5/2, 11/4, 3]
+    # For non-numeric values, returns a unique set, 
+    # ordered if possible.
+    def categories
+      if self.is_numeric?
+        self.range_instance.map
+      else
+        self.uniq.sort rescue self.uniq
+      end
+    end
+
+    def is_numeric?
+      self.all? {|e| e.is_a?(Numeric)}
+    end
+
     # Just an array of [min, max] to comply with R uses of the work.  Use
     # range_as_range if you want a real Range. 
     def range(&block)
@@ -206,10 +228,14 @@ module JustEnumerableStats #:nodoc:
     end
 
     # Useful for setting a real range class (FixedRange).
-    def range_class=(klass)
+    def set_range_class(klass, *args)
       @range_class = klass
+      @range_class_args = args
+      self.range_class
     end
 
+    attr_reader :range_class_args
+
     # When creating a range, what class will it be?  Defaults to Range, but
     # other classes are sometimes useful. 
     def range_class
@@ -218,8 +244,13 @@ module JustEnumerableStats #:nodoc:
 
     # Actually instantiates the range, instead of producing a min and max array.
     def range_as_range(&block)
-      range_class.new(min(&block), max(&block))
+      if @range_class_args and not @range_class_args.empty?
+        self.range_class.new(*@range_class_args)
+      else
+        self.range_class.new(min(&block), max(&block))
+      end
     end
+    alias :range_instance :range_as_range
 
     # I don't pass the block to the sort, because a sort block needs to look
     # something like: {|x,y| x <=> y}.  To get around this, set the default 

data/spec/just_enumerable_stats/stats_spec.rb

@@ -207,10 +207,42 @@ describe JustEnumerableStats::Stats do
   end
 
   it "should have a getter and a setter on the range class" do
-    @a.range_class = Array
+    @a.set_range_class Array
     @a.range_class.should eql(Array)
   end
   
+  it "should be able to send extra arguments for the range class" do
+    @a.set_range_class FixedRange, 1, 3, 0.25
+    @a.range_as_range.should be_is_a(FixedRange)
+    @a.range_instance.should be_is_a(FixedRange)
+  end
+  
+  it "should use the range arguments when instantiating a range" do
+    @a.set_range_class FixedRange, 1, 3, 0.5
+    @a.range_instance.should be_is_a(FixedRange)
+    @a.range_instance.min.should eql(1)
+    @a.range_instance.max.should eql(3)
+    @a.range_instance.step_size.should eql(0.5)
+  end
+
+  it "should be able to instantiate a range" do
+    @a.range_as_range.should eql(Range.new(1, 3))
+  end
+  
+  it "should know its categories, based on its range" do
+    @a.categories.should eql([1,2,3])
+  end
+  
+  it "should know its categories with a different range class" do
+    @a.set_range_class FixedRange, 1, 3, 0.5
+    @a.categories.should eql([1.0, 1.5, 2.0, 2.5, 3.0])
+  end
+  
+  it "should know its categories from non-numeric values" do
+    a = [:this, :and, :that]
+    a.categories.should eql(a)
+  end
+  
   it "should be able to instantiate a range" do
     @a.range_as_range.should eql(Range.new(1, 3))
   end

data/spec/just_enumerable_stats_spec.rb

@@ -197,14 +197,42 @@ describe "JustEnumerableStats" do
   end
 
   it "should have a getter and a setter on the range class" do
-    @a.range_class = Array
+    @a.set_range_class Array
     @a.range_class.should eql(Array)
   end
   
+  it "should be able to send extra arguments for the range class" do
+    @a.set_range_class FixedRange, 1, 3, 0.25
+    @a.range_as_range.should be_is_a(FixedRange)
+    @a.range_instance.should be_is_a(FixedRange)
+  end
+  
+  it "should use the range arguments when instantiating a range" do
+    @a.set_range_class FixedRange, 1, 3, 0.5
+    @a.range_instance.should be_is_a(FixedRange)
+    @a.range_instance.min.should eql(1)
+    @a.range_instance.max.should eql(3)
+    @a.range_instance.step_size.should eql(0.5)
+  end
+
   it "should be able to instantiate a range" do
     @a.range_as_range.should eql(Range.new(1, 3))
   end
   
+  it "should know its categories, based on its range" do
+    @a.categories.should eql([1,2,3])
+  end
+  
+  it "should know its categories with a different range class" do
+    @a.set_range_class FixedRange, 1, 3, 0.5
+    @a.categories.should eql([1.0, 1.5, 2.0, 2.5, 3.0])
+  end
+  
+  it "should know its categories from non-numeric values" do
+    a = [:this, :and, :that]
+    a.categories.should eql(a)
+  end
+  
   it "should be able to instantiate a range with a block" do
     @a.range_as_range(&@inverse_matcher).should eql(Range.new(3, 1))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davidrichards-just_enumerable_stats
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Richards
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-08-03 00:00:00 -07:00
 default_executable: jes
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/davidrichards/just_enumerable_stats
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Basic statistics on Ruby enumerables