borel 0.1.1 → 0.2.0

data/.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://www.rubygems.org"
+
+gemspec
+
+group :development do
+  gem 'rspec', '~> 2.8.0'
+  gem 'guard', '~> 1.0.0'
+end

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/borel/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')    { "spec" }
+end
+

data/{MIT-LICENSE → LICENSE}

@@ -1,3 +1,5 @@
+(The MIT License)
+
 Copyright (c) 2012 Amadeus Folego
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -12,8 +12,8 @@ Borelian sets are formed by enumerable union, intersection or
 
 [1]: http://intervals.rubyforge.org
 
-Installation
-------------
+Install
+-------
 
 You may install it traditionally, for interactive sessions:
 
@@ -111,7 +111,46 @@ Interval['a','c'] ^ Interval['b','d'] # -> Interval['b','c']
 Interval['a','c'] | Interval['b','d'] # -> Interval['a','d']
 ```
 
-### Remarks
+Math Extensions
+---------------
 
-* There is no distinction between **open** and **closed** intervals
-* Complement and Minus operations are not supported on any class
+By requiring `borel/math_extensions` you are provided with some natural
+math-related interval methods:
+
+```ruby
+Interval[1,5].rand  # -> Random.new.rand 1..5
+Interval[1,5].width # -> 5-1 or 4
+```
+
+It's supported only for Numeric Comparable and arithmetic supported classes
+
+Remarks
+-------
+
+* There is no distinction between **open** and **closed**intervals
+* Complement and Minus operations have limited support for
+non numeric-comparable classes
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2012 Amadeus Folego
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/borel.gemspec

@@ -8,7 +8,9 @@ Gem::Specification.new do |s|
   s.email = ["amadeusfolego@gmail.com"]
   s.homepage = "http://github.com/amadeusfolego/borel"
   s.summary = "Generic ordered set's operations"
-  s.description = "Borel sets are made of enumerable union and intersection of intervals. Borel performs regular set operations on any interval of a Comparable class."
+  s.description = "Borel sets are made of enumerable union and intersection of
+intervals. Borel performs regular operations on any interval of any
+Comparable class."
   s.rubyforge_project = s.name
   s.required_ruby_version = ">= 1.9.3"
   s.required_rubygems_version = ">= 1.3.6"

data/lib/borel/errors.rb

@@ -0,0 +1,36 @@
+module Borel
+  class Construction < ArgumentError
+    def initialize(array)
+      super(
+        "An interval can only be constructed either from at most two " \
+        "numbers or from a sequence of arrays of at most two numbers: " +
+        array.inspect)
+    end
+  end
+
+  class NonDegenerate < ArgumentError
+    def initialize(i)
+      super("#{i.inspect} is not degenerate.")
+    end
+  end
+
+  class NonSimple < ArgumentError
+    def initialize(i)
+      super("#{i.inspect} is not simple.")
+    end
+  end
+
+  class EmptyInterval < ArgumentError
+    def initialize
+      super("The interval is empty.")
+    end
+  end
+
+  class OpenRight < ArgumentError
+    def initialize(range)
+      super(
+        "Cannot construct an interval from a three-dot range " \
+        "with end-value #{range.last.inspect}.")
+    end
+  end
+end

data/lib/borel/interval.rb

@@ -1,3 +1,5 @@
+require 'borel/errors'
+
 Infinity = 1/0.0
 
 class Interval
@@ -200,34 +202,3 @@ class Interval::Multiple < Interval
     self
   end
 end
-
-module Borel
-  class Construction < ArgumentError
-    def initialize(array)
-      super(
-        "An interval can only be constructed either from at most two " \
-        "numbers or from a sequence of arrays of at most two numbers: " +
-        array.inspect)
-    end
-  end
-
-  class NonDegenerate < ArgumentError
-    def initialize(i)
-      super("#{i.inspect} is not degenerate.")
-    end
-  end
-
-  class NonSimple < ArgumentError
-    def initialize(i)
-      super("#{i.inspect} is not simple.")
-    end
-  end
-
-  class OpenRight < ArgumentError
-    def initialize(range)
-      super(
-        "Cannot construct an interval from a three-dot range " \
-        "with end-value #{range.last.inspect}.")
-    end
-  end
-end

data/lib/borel/math_extensions.rb

@@ -0,0 +1,2 @@
+require 'borel/math_extensions/randomizable'
+require 'borel/math_extensions/interval_arithmetic'

data/lib/borel/math_extensions/interval_arithmetic.rb

@@ -0,0 +1,13 @@
+require 'borel'
+
+module Borel
+  module IntervalArithmetic
+    def width
+      raise NonSimple, self unless self.respond_to?(:simple?) and self.simple?
+      self.extrema.last - self.extrema.first
+    end
+
+    Interval.send(:include, self)
+  end
+end
+

data/lib/borel/math_extensions/randomizable.rb

@@ -0,0 +1,20 @@
+require 'borel/math_extensions/interval_arithmetic'
+
+module Borel
+  module Randomizable
+    def rand
+      raise EmptyInterval if self.respond_to?(:empty?) and self.empty?
+
+      if self.simple?
+        Random.new.rand Range.new *self.extrema
+      else
+        total_weight = self.map(&:width).reduce(:+)
+        selected_weight = Random.new.rand 0..total_weight
+        rand_interval = self.find{|c| (selected_weight -= c.width) <= 0}
+        Random.new.rand Range.new *rand_interval.extrema
+      end
+    end
+
+    Interval.send(:include, self)
+  end
+end

data/lib/borel/version.rb

@@ -1,7 +1,7 @@
 module Borel
   MAJOR = 0
-  MINOR = 1
-  TINY = 1
+  MINOR = 2
+  TINY = 0
 
   VERSION = [MAJOR, MINOR, TINY].join('.')
 

data/spec/math_extensions/interval_arithmetic_spec.rb

@@ -0,0 +1,33 @@
+require 'borel/math_extensions/interval_arithmetic'
+
+describe Borel::IntervalArithmetic do
+  it "should include #width" do
+    class Foo
+      include Borel::IntervalArithmetic
+    end
+
+    Foo.instance_methods.should include :width
+  end
+
+  context "#width" do
+    specify "Interval[1,2] -> 1" do
+      Interval[1,2].width.should be 1
+    end
+
+    specify "Interval[-1,2] -> 3" do
+      Interval[-1,2].width.should be 3
+    end
+
+    specify "Interval[1] -> 0" do
+      Interval[1].width.should be 0
+    end
+
+    it "should raise error if not simple" do
+      expect{Interval[].width}.
+        to raise_error Borel::NonSimple
+
+      expect{Interval[[1,2],[3,4]].width}.
+        to raise_error Borel::NonSimple
+    end
+  end
+end

data/spec/math_extensions/randomizable_spec.rb

@@ -0,0 +1,54 @@
+require 'borel/math_extensions/randomizable'
+
+describe Borel::Randomizable do
+  it 'should include #rand' do
+    class Foo
+      include Borel::Randomizable
+    end
+
+    Foo.instance_methods.should include :rand
+  end
+
+  context '#random' do
+    let(:interval){ Interval[1,10] }
+    let(:rand_mock) { mock }
+
+    it 'should be a point inside the interval' do
+      interval.should include interval.rand
+    end
+
+    it 'should be itself if degenerate' do
+      Interval[5].rand.should be 5
+    end
+
+    it 'should be a random number on simple intervals' do
+      random_number = 3
+      Random.should_receive(:new).and_return(rand_mock)
+      rand_mock.should_receive(:rand).with(1..10).and_return(random_number)
+
+      interval.rand.should be random_number
+    end
+
+    it 'should run on multiple intervals by weight' do
+      interval = Interval[[1,5],[6,8]]
+
+      Random.should_receive(:new).exactly(2).times.and_return(rand_mock)
+      rand_mock.should_receive(:rand).with(0..6).and_return(4)
+      rand_mock.should_receive(:rand).with(1..5).and_return(3)
+
+      interval.rand.should be 3
+
+      Random.should_receive(:new).exactly(2).times.and_return(rand_mock)
+      rand_mock.should_receive(:rand).with(0..6).and_return(6)
+      rand_mock.should_receive(:rand).with(6..8).and_return(7)
+
+      interval.rand.should be 7
+    end
+
+    it 'should raise error if empty' do
+      expect{Interval[].rand}.
+        to raise_error Borel::EmptyInterval
+    end
+  end
+
+end

data/spec/math_extensions_spec.rb

@@ -0,0 +1,11 @@
+require 'borel/math_extensions'
+
+describe "Intervals Math Extensions" do
+  specify do
+    Interval.should include Borel::Randomizable
+  end
+
+  specify do
+    Interval.should include Borel::IntervalArithmetic
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies: []
-description: Borel sets are made of enumerable union and intersection of intervals.
-  Borel performs regular set operations on any interval of a Comparable class.
+description: ! 'Borel sets are made of enumerable union and intersection of
+
+  intervals. Borel performs regular operations on any interval of any
+
+  Comparable class.'
 email:
 - amadeusfolego@gmail.com
 executables: []
@@ -21,17 +24,26 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- MIT-LICENSE
+- Gemfile
+- Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - borel.gemspec
 - lib/borel.rb
+- lib/borel/errors.rb
 - lib/borel/interval.rb
+- lib/borel/math_extensions.rb
+- lib/borel/math_extensions/interval_arithmetic.rb
+- lib/borel/math_extensions/randomizable.rb
 - lib/borel/nil_class.rb
 - lib/borel/numeric.rb
 - lib/borel/range.rb
 - lib/borel/version.rb
 - spec/interval_spec.rb
+- spec/math_extensions/interval_arithmetic_spec.rb
+- spec/math_extensions/randomizable_spec.rb
+- spec/math_extensions_spec.rb
 - spec/nil_class_spec.rb
 - spec/numeric_spec.rb
 - spec/range_spec.rb
@@ -57,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: borel
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generic ordered set's operations