polynomials 0.4.3 → 0.4.4

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "rake"
+script: "bundle exec rake"
 rvm:
   - 1.9.2
 

data/Gemfile

@@ -6,10 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "rake"
   gem "jeweler", "~> 1.6.0"
   gem "simplecov", ">= 0"
-  gem 'awesome_print'
 end
+
 gem "activesupport"
-gem 'i18n'
+gem "i18n"

data/Gemfile.lock

@@ -1,15 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
-    awesome_print (0.3.2)
+    activesupport (3.0.9)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    rake (0.9.2)
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
@@ -19,8 +18,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  awesome_print
-  bundler (~> 1.0.0)
   i18n
   jeweler (~> 1.6.0)
+  rake
   simplecov

data/README.markdown

@@ -1,6 +1,4 @@
-# Polynomials
-
-[![Build Status](http://travis-ci.org/mkorfmann/polynomials.png)](http://travis-ci.org/mkorfmann/polynomials)
+# Polynomials [![Build Status](http://travis-ci.org/mkorfmann/polynomials.png)](http://travis-ci.org/mkorfmann/polynomials)
 
 ## Example App
 
@@ -9,7 +7,7 @@ see the gem in action!
 
 ## Usage
 
-<pre><code>
+```ruby
 require 'polynomials'
 require 'gnuplot'
 include Polynomials
@@ -17,11 +15,10 @@ include Polynomials
 
 polynomial = Polynomial.parse(ARGV[0])
 
-points =  polynomial.roots | polynomial.local_extrema |
-polynomial.inflection_points
+points =  polynomial.roots | polynomial.local_extrema | polynomial.inflection_points
 
-max_x =  points.max_by(&amp;:x)
-min_x =  points.min_by(&amp;:x)
+max_x =  points.max_by(&:x)
+min_x =  points.min_by(&:x)
 max_x = max_x == 0 ? max_x.x : 1
 min_x = min_x == 0 ? min_x.x : -1
 
@@ -32,38 +29,34 @@ stop = max_x + difference/4.0
 step = (start-stop).abs/1000.0
 
 pointset = polynomial.pointset(start,stop,step)
-data_x=  pointset.map(&amp;:first)
-data_y = pointset.map(&amp;:last)
+data_x=  pointset.map(&:first)
+data_y = pointset.map(&:last)
 
 Gnuplot.open do |gp|
   Gnuplot::Plot.new(gp) do |plot|
-    plot.xrange &quot;[#{start}:#{stop}]&quot;
-    plot.title  &quot;Polynomial&quot;
-    plot.ylabel &quot;f(x)&quot;
-    plot.xlabel &quot;x&quot;
+    plot.xrange "[#{start}:#{stop}]"
+    plot.title  "Polynomial"
+    plot.ylabel "f(x)"
+    plot.xlabel "x"
     plot.grid
-    plot.data &lt;&lt; Gnuplot::DataSet.new( [data_x,data_y] ) do |ds|
-      ds.with = &quot;lines&quot;
+    plot.data << Gnuplot::DataSet.new( [data_x,data_y] ) do |ds|
+      ds.with = "lines"
       ds.linewidth = 0.2
-      ds.title =  &quot;f(x) = #{polynomial}&quot;
+      ds.title =  "f(x) = #{polynomial}"
       ds.smooth
     end
 
-    [:inflection_point,:root, :maximum, :minimum].each do
-|kind_of_point|
-      selected_points =
-points.select(&amp;:&quot;#{kind_of_point}?&quot;)
-      plot.data &lt;&lt;
-Gnuplot::DataSet.new([selected_points.map(&amp;:x),
-selected_points.map(&amp;:y)]) do |ds|
-        ds.with = &quot;points&quot;
+    [:inflection_point,:root, :maximum, :minimum].each do |kind_of_point|
+      selected_points = points.select(&:"#{kind_of_point}?")
+      plot.data << Gnuplot::DataSet.new([selected_points.map(&:x), selected_points.map(&:y)]) do |ds|
+        ds.with = "points"
         ds.linewidth = 2
         ds.title = kind_of_point.to_s.pluralize.titleize
       end
     end
   end
 end
-</code></pre>
+```
 
 ### Bash Command
 <pre><code> % ruby examples/plot_only_mutual_data.rb '20.432 x^4 - 17.75 x^3 - 20x^2 + 5 x -50'</code></pre>

data/Rakefile

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
-require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,9 +7,11 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
 require 'rake'
 
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "polynomials"
@@ -35,22 +35,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-#require 'rcov/rcovtask'
-#Rcov::RcovTask.new do |test|
-#  test.libs << 'test'
-#  test.pattern = 'test/**/*_test.rb'
-#  test.verbose = true
-#  test.rcov_opts << '--exclude "gems/*"'
-#end
-#
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "polynomials #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/polynomials.rb

@@ -13,6 +13,7 @@ require 'set'
 require 'point'
 require 'term'
 require 'analyzable'
+require 'plotable'
 require 'polynomial'
 
 

data/lib/polynomials/analyzable.rb

@@ -4,10 +4,13 @@ module Polynomials
     MinimumOrMaximum = {[1.0,-1.0] => :maximum,[-1.0,1.0] => :minimum}
 
     def strives_for
-      roots = self.roots.map(&:x)
-      local_extrema = self.local_extrema.map(&:x)
-      return nil if roots.empty? && local_extrema.empty?
-      [self.((roots.min || local_extrema.min) - 1).sign, self.((roots.max || local_extrema.max) + 1).sign].map { |d| d * Infinity }
+      points = self.roots.map(&:x) | self.local_extrema.map(&:x)
+      return nil if points.empty?
+      points.minmax.zip([-1,1])
+      .map do |point,direction|
+        sign = self.(point + direction).sign
+        Extremum.new(Infinity * direction, sign * Infinity, sign < 0 ? :minimum : :maximum)
+      end
     end
 
     def inflection_points
@@ -28,7 +31,7 @@ module Polynomials
       samples.push possible_extrema.last + 1
 
       possible_extrema.zip(samples.each_cons(2)).inject(Set[]) do |set,(pe,sample)|
-        directions = sample.map { |x| derivative.(x).sign}
+        directions = sample.map { |x| derivative.(x).sign }
         kind_of_extremum = MinimumOrMaximum[directions]
         next set unless kind_of_extremum
         set <<  Extremum.new(pe,self.calculate(pe), kind_of_extremum)
@@ -37,19 +40,14 @@ module Polynomials
 
     def curvature_behaviour
       hash = Hash.new {|h,k|h[k]=[]}
-
       dd = self.derivative.derivative
-      return nil if !(strives_for = derivative.strives_for) || dd.(dd.roots.sort.last.to_f + 1) == 0
-
-      ([[-Infinity,strives_for[0]]] + derivative.local_extrema.sort + [[Infinity,strives_for[-1]]]).each_cons(2).chunk do |b,_|
-        if b.is_a? Point
-          AfterExtremaCurvatureMapping[b.kind_of_extremum]
-        else
-          b.last < 0 ? :left : :right
-        end
-      end.with_index.inject(hash) do |hash,((curvature,values),i)|
-        hash.tap { |h| h[curvature].concat values.each {|a| a.map! { |p| (p.is_a? Point) ? p.x : p.first }}}
-      end
+      strives_for = derivative.strives_for
+      return nil if !strives_for
+
+      delimiter = [strives_for[0]] | derivative.local_extrema.to_a | [strives_for[1]]
+      delimiter.sort.each_cons(2).group_by do |b,_|
+        AfterExtremaCurvatureMapping[b.kind_of_extremum]
+      end.tap { |h| h.values.each { |a| a.each { |r| r.map!(&:x) }}}
     end
   end
 end

data/lib/polynomials/plotable.rb

@@ -0,0 +1,23 @@
+module Polynomials
+  module Plotable
+    def pointset(start,stop,step=0.1)
+      data = []
+      x = start
+      while x < stop
+        data << [x,self.(x)]
+        x += step
+      end
+      data << [stop,self.(stop)]
+    end
+
+    def grouped_pointset(start,stop,step=0.1,grouped)
+      Hash[grouped.map do |key,intervals|
+        intervals = intervals.reject { |s,e| e < start || s > stop }
+        intervals = intervals.map do |s,e|
+          self.pointset([s,start].max, [e,stop].min, step)
+        end
+        [key,intervals]
+      end]
+    end
+  end
+end

data/lib/polynomials/point.rb

@@ -4,13 +4,14 @@ module Polynomials
     attr_accessor :x, :y
     alias to_f x
 
-    def self.inherited(subclass)
-      self.class_eval do 
-        define_method :"#{subclass.name.demodulize.underscore}?" do
-          self.is_a? subclass
+    %w{Extremum Root InflectionPoint}.each do |special_point|
+      self.class_eval do
+        define_method :"#{special_point.underscore}?" do
+          self.is_a? Polynomials.const_get(special_point)
         end
       end
     end
+
     def initialize(x,y)
       @x,@y = x,y
     end
@@ -69,4 +70,12 @@ module Polynomials
 
   class InflectionPoint < Point
   end
+
+  [:maximum,:minimum].each do |kind_of_extremum|
+    const_set(kind_of_extremum.to_s.capitalize, Class.new(Extremum) do
+      def initialize(x,y)
+        super x,y,kind_of_extremum
+      end
+    end)
+  end
 end

data/lib/polynomials/polynomial.rb

@@ -1,6 +1,7 @@
 module Polynomials
   class Polynomial
     include Analyzable
+    include Plotable
 
     attr_accessor :terms
 
@@ -30,14 +31,13 @@ module Polynomials
     alias call calculate
 
     def derivative
-      new_function = self.alter do |nf, term|
-        (nf.terms[term.exponent - 1].coefficient += term.exponent * term.coefficient) unless term.exponent.zero?
+      new_function = self.alter do |new_function, term|
+        (new_function.terms[term.exponent - 1].coefficient += term.exponent * term.coefficient) unless term.exponent.zero?
       end
-
     end
 
     def roots
-      if !terms.empty? and (terms.keys.none?(&:zero?) || terms[0].coefficient.zero?)
+      if terms[0].coefficient.zero? and !terms.values.map(&:coefficient).all?(&:zero?)
         self.alter { |nf, term| nf.terms[term.exponent-self.lt.exponent].coefficient = term.coefficient }.roots << Root.new(0.0)
       else
         case self.degree
@@ -67,36 +67,21 @@ module Polynomials
     end
 
     def ==(other)
-      delete_zeros = proc{ |_,t| t.coefficient.zero? }
-      self.terms.delete_if(&delete_zeros) == other.terms.delete_if(&delete_zeros)
+      check_if_zero = proc { |_,t| t.coefficient.zero? }
+      self.terms.delete_if(&check_if_zero) == other.terms.delete_if(&check_if_zero)
     end
 
+    # greatest term
     def gt
       self.terms[self.degree]
     end
 
+    # lowest term
     def lt
-      self.terms[self.terms.reject { |_,t| t.coefficient.zero? }.min_by{ |_,t| t.exponent}.first]
-    end
-
-    def pointset(start,stop,step=0.1)
-      data = []
-      x = start
-      while x < stop
-        data << [x,self.(x)]
-        x += step
-      end
-      data << [stop,self.(stop)]
-    end
-
-    def grouped_pointset(start,stop,step=0.1,grouped)
-      Hash[grouped.map do |key,intervals|
-        intervals = intervals.reject { |s,e| e < start || s > stop }
-        intervals = intervals.map do |s,e|
-          self.pointset([s,start].max, [e,stop].min, step)
-        end
-        [key,intervals]
-      end]
+      self.terms[
+        self.terms.reject { |_,t| t.coefficient.zero? }
+        .min_by{ |_,t| t.exponent}.first
+      ]
     end
 
     def coefficients_till(n)
@@ -117,5 +102,4 @@ module Polynomials
     end
     protected :alter
   end
-
 end

data/polynomials.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{polynomials}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-06-30}
   s.description = %q{
 This is a gem dedicated to parsing, manipulating and finding roots,extrema and inflection points of polynomials.
 It can solve polynomial equations with a degree up to 4 by implementing formulas for solving quadratic, cubic and quartic functions.
@@ -33,6 +33,7 @@ It can solve polynomial equations with a degree up to 4 by implementing formulas
     "lib/polynomials/analyzable.rb",
     "lib/polynomials/exceptions.rb",
     "lib/polynomials/formulas.rb",
+    "lib/polynomials/plotable.rb",
     "lib/polynomials/point.rb",
     "lib/polynomials/polynomial.rb",
     "lib/polynomials/term.rb",
@@ -47,35 +48,31 @@ It can solve polynomial equations with a degree up to 4 by implementing formulas
   s.homepage = %q{http://github.com/mkorfmann/polynomials}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{parsing and computing data on polynomials}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
   end
 end
 

data/test/analyzable_test.rb

@@ -1,5 +1,4 @@
 require "#{File.dirname(File.expand_path(__FILE__))}/test_helper"
-Infinity = 1.0/0
 class TestAnalyzable < MiniTest::Unit::TestCase
   include Polynomials
 
@@ -60,18 +59,18 @@ class TestAnalyzable < MiniTest::Unit::TestCase
 
   def test_strives_for
     polynomial = Polynomial.new(2,0,0)
-    assert_equal [Infinity,Infinity], polynomial.strives_for
+    assert_equal [Maximum.new(-Infinity,Infinity),Maximum.new(Infinity,Infinity)], polynomial.strives_for
     polynomial = Polynomial.new(-2,0,0)
-    assert_equal [-Infinity,-Infinity], polynomial.strives_for
+    assert_equal [Minimum.new(-Infinity,-Infinity),Minimum.new(Infinity,-Infinity)], polynomial.strives_for
     polynomial = Polynomial.new(2,0,0,0)
-    assert_equal [-Infinity,Infinity], polynomial.strives_for
+    assert_equal [Minimum.new(-Infinity,-Infinity),Maximum.new(Infinity,Infinity)], polynomial.strives_for
     polynomial = Polynomial.new(-2,0,0,0)
-    assert_equal [Infinity,-Infinity], polynomial.strives_for
+    assert_equal [Maximum.new(-Infinity,Infinity),Minimum.new(Infinity,-Infinity)], polynomial.strives_for
     polynomial = Polynomial.new(2)
     assert_equal nil, polynomial.strives_for
 
     polynomial = Polynomial.parse('+ 1.0 x^4 + 5.0 x^3 - 1.0 x^2 + 3.0 x + 5.0').derivative
-    assert_equal [-Infinity,Infinity], polynomial.strives_for
+    assert_equal [Minimum.new(-Infinity,-Infinity),Maximum.new(Infinity,Infinity)], polynomial.strives_for
   end
 
   def test_inflection_points_some_coefficients_of_derivative2_zero
@@ -86,6 +85,6 @@ class TestAnalyzable < MiniTest::Unit::TestCase
 
   def test_strives_for_no_roots
     polynomial = Polynomial.new(1,0,0,0,0)
-    assert_equal [Infinity,Infinity], polynomial.strives_for
+    assert_equal [Maximum.new(-Infinity,Infinity),Maximum.new(Infinity,Infinity)], polynomial.strives_for
   end
 end

data/test/polynomial_test.rb

@@ -95,4 +95,10 @@ class TestPolynomial < MiniTest::Unit::TestCase
     polynomial = Polynomial.parse('5x + 2')
     assert_equal 7, polynomial.(1)
   end
+
+  def test_constant_zero_polynomial
+    constant_function = Polynomial.new(0)
+    assert_equal Set[], constant_function.roots
+    assert_equal nil, constant_function.curvature_behaviour
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
-require 'awesome_print'
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter 'test'
+end
 require 'minitest/autorun'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: polynomials
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,24 +31,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -65,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 0
         version: 1.6.0
   type: :development
   prerelease: false
@@ -80,25 +64,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
 description: "\n\
   This is a gem dedicated to parsing, manipulating and finding roots,extrema and inflection points of polynomials.\n\
   It can solve polynomial equations with a degree up to 4 by implementing formulas for solving quadratic, cubic and quartic functions.\n  "
@@ -124,6 +93,7 @@ files:
 - lib/polynomials/analyzable.rb
 - lib/polynomials/exceptions.rb
 - lib/polynomials/formulas.rb
+- lib/polynomials/plotable.rb
 - lib/polynomials/point.rb
 - lib/polynomials/polynomial.rb
 - lib/polynomials/term.rb
@@ -148,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2798926848061420980
+      hash: 3457251127404448824
       segments: 
       - 0
       version: "0"
@@ -157,13 +127,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: parsing and computing data on polynomials