polynomials 0.1.7 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/lib/polynomials.rb

@@ -19,8 +19,13 @@ class Polynomial
     return polynomial
   end
 
-  def initialize
+  def initialize(*args)
     self.terms = Hash.new { |hash, key| hash[key] = Term.new(key) }
+    unless args.empty?
+      args.reverse.each.with_index do |coefficient,exponent|
+        self.terms[exponent].coefficient += coefficient
+      end
+    end
   end
 
   def calculate(x)
@@ -30,16 +35,16 @@ class Polynomial
   end
 
   def derivative
-      new_function = self.alter do |nf, term|
-        nf.terms[term.exponent - 1].coefficient += term.exponent * term.coefficient
-      end
-      new_function.terms.reject! { |_,t| t.coefficient == 0 }
+    new_function = self.alter do |nf, term|
+      nf.terms[term.exponent - 1].coefficient += term.exponent * term.coefficient
+    end
+    new_function.terms.reject! { |_,t| t.coefficient == 0 }
     return new_function
   end
 
   def roots
     if !terms.empty? and terms.keys.none?(&:zero?)
-      self.alter { |nf, term| nf.terms[term.exponent-1].coefficient = term.coefficient }.roots << 0.0
+      self.alter { |nf, term| nf.terms[term.exponent-self.lt.exponent].coefficient = term.coefficient }.roots << 0.0
     else
       case self.degree
       when 1
@@ -67,9 +72,9 @@ class Polynomial
 
       possible_extrema.zip(samples.each_cons(2)).each do |pe,(after,before)|
         yafter = derivative.calculate(after)
-        ybefore = derivative.calculate(before)
-        kind_of_extremum = NegPosMinMaxExtremumMapping[[yafter/yafter.abs,ybefore/ybefore.abs]]
-        max_min_extremum[kind_of_extremum] << pe if kind_of_extremum
+      ybefore = derivative.calculate(before)
+      kind_of_extremum = NegPosMinMaxExtremumMapping[[yafter/yafter.abs,ybefore/ybefore.abs]]
+      max_min_extremum[kind_of_extremum] << pe if kind_of_extremum
       end
     end
     return max_min_extremum
@@ -77,11 +82,11 @@ class Polynomial
 
   def curvature_behaviour
     hash = Hash.new {|h,k|h[k]=Set.new}
+    return hash if self.degree > 5
     extrema = self.derivative.extrema
-    extrema.values.inject(Set[],&:|).sort.each_cons(2).inject(hash) do |curvature_behaviour,(start_point,end_point)|
-      kind_of_curvature = AfterextremaCurvatureMapping[extrema.find { |k,v| v.include?(start_point) }.first]
-      curvature_behaviour[kind_of_curvature] << Range.new(start_point,end_point)
-      curvature_behaviour
+    all_extremas = extrema.values.inject(Set[],&:|).sort
+    all_extremas.each_cons(2).map { |s,e| Range.new(s,e) }.group_by do |range|
+      kind_of_curvature = AfterextremaCurvatureMapping[extrema.find { |k,v| v.include?(range.begin) }.first]
     end
   end
 
@@ -90,9 +95,10 @@ class Polynomial
   end
 
   def to_s
-    terms.delete_if { |_,t| t.coefficient.zero? }.sort_by { |_,t| -t.exponent }.inject("") do |string,(_,term)|
-      string << term.to_s
-    end.strip
+    terms.sort_by { |_,t| -t.exponent }.inject("") do |string,(_,term)|
+      string << term.to_s unless term.coefficient.zero? && !term.exponent.zero?
+      string
+    end.strip.sub(/\A\+\s/, '')
   end
 
   def ==(other)
@@ -102,16 +108,22 @@ class Polynomial
 
   def extrema
     extrema = local_extrema
-    a = self.terms[self.degree].coefficient
     unless self.degree == 0
-      max_or_min = (self.degree.even? ? [1,1] : [-1,1]).map { |n| (n * a)/a.abs  }
+      a = self.gt.coefficient
+      max_or_min = (self.degree.even? ? [1.0,1.0] : [-1.0,1.0]).map { |n| (n * a)/a.abs  }
       extrema[MinMaxMapping[max_or_min.first]] << -1.0/0
       extrema[MinMaxMapping[max_or_min.last]] << 1.0/0
     end
     return extrema
   end
 
- private
+  def gt
+    self.terms[self.degree]
+  end
+
+  def lt
+    self.terms[self.terms.min_by{ |_,t| t.exponent}.first]
+  end
 
   def coefficients_till(n)
     coefficients = []
@@ -120,8 +132,7 @@ class Polynomial
     end
     return coefficients.reverse
   end
-
- protected
+  private :coefficients_till
 
   def alter
     new_function = self.class.new
@@ -130,4 +141,5 @@ class Polynomial
     end
     return new_function
   end
+  protected :alter
 end

data/lib/term.rb

@@ -1,3 +1,4 @@
+class NotParsableError < ArgumentError;end
 class Term
   attr_accessor :coefficient, :exponent
 
@@ -7,16 +8,30 @@ class Term
 
   def self.parse(string)
     term = self.new
-    float = /\d*(?:\.\d*)?/
-    integer = /\d*/
-    raw_data = string.match(/(?<algebraic_sign>[-+]?)\s*(?<coefficient>#{float})?\s*(?<power>x.*)?\s*\Z/)
-    term.coefficient = (raw_data[:algebraic_sign] + (!raw_data[:coefficient].empty? ? raw_data[:coefficient] : "1")).to_f
-    term.exponent = (raw_data[:power] ? (raw_data[:power] =~ /x\^(#{integer})/ ?  $1.to_i : 1) : 0)
+    float = /\d+(?:\.\d+)?/
+    integer = /\d+/
+    polynomial_regex = /
+      \A\s*
+        (?<algebraic_sign>[-+]?)
+      \s*
+        (?<coefficient>#{float})?
+      \s*
+        (?<power>x(?:\^(?<exponent>#{integer}))?)?
+      \s*\Z
+    /x
+
+    raw_data = string.match(polynomial_regex)
+    raise NotParsableError unless raw_data
+    term.coefficient = (raw_data[:algebraic_sign] + ( raw_data[:coefficient] || "1")).to_f
+    term.exponent = raw_data[:power] ? (raw_data[:exponent] || 1).to_i : 0
     term
   end
 
   def to_s
-    "#{ (coefficient < 0) ? '-' : '+' } #{coefficient.abs} #{ "x#{"^#{exponent}" unless exponent == 1}" unless exponent.zero?} "
+    pretty_coeffiecent = coefficient.denominator == 1 ? coefficient.abs.to_i : coefficient.abs
+    algebraic_sign =  coefficient < 0 ? '-' : '+'
+    power = "x#{"^#{exponent}" unless exponent == 1}"
+    "#{algebraic_sign} #{pretty_coeffiecent}#{ power unless exponent.zero?} "
   end
 
   def dup

data/polynomials.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{polynomials}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]
-  s.date = %q{2011-05-13}
+  s.date = %q{2011-05-14}
   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.
@@ -31,7 +31,6 @@ It can solve polynomial equations with a degree up to 4 by implementing formulas
     "lib/polynomials.rb",
     "lib/term.rb",
     "polynomials.gemspec",
-    "tags",
     "test/helper.rb",
     "test/math_test.rb",
     "test/polynomial_test.rb",

data/test/math_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative 'test_helper'
 class TestMath < MiniTest::Unit::TestCase
   def test_roots_for_constant_functions
     polynomial = Polynomial.parse('5')

data/test/polynomial_test.rb

@@ -1,9 +1,14 @@
 require_relative 'test_helper'
 
+Infinity = 1.0/0
 class TestPolynomial < MiniTest::Unit::TestCase
   def test_to_s
     polynomial = Polynomial.parse('5x + 2x^2 + 20')
-    assert_equal '+ 2.0 x^2 + 5.0 x + 20.0', polynomial.to_s
+    assert_equal '2x^2 + 5x + 20', polynomial.to_s
+    polynomial = Polynomial.parse('6.5435x^234 + 5.0 + 20x')
+    assert_equal '6.5435x^234 + 20x + 5', polynomial.to_s
+    polynomial = Polynomial.parse('0x^0')
+    assert_equal "0", polynomial.to_s
   end
 
   def test_derivative_of_linear_functions
@@ -58,13 +63,13 @@ class TestPolynomial < MiniTest::Unit::TestCase
 
   def test_no_inflection_points
     polynomial = Polynomial.parse('1 x^4')
-    assert_equal({ left: Set[-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
+    assert_equal({ left: [-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
 
     polynomial = Polynomial.parse('-1 x^4')
-    assert_equal({ right: Set[-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
+    assert_equal({ right: [-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
 
     polynomial = Polynomial.parse('5x^2')
-    assert_equal({ left: Set[-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
+    assert_equal({ left: [-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)
   end
 
   def test_no_extremums
@@ -72,7 +77,7 @@ class TestPolynomial < MiniTest::Unit::TestCase
     assert_equal({}, polynomial.extrema)
   end
 
-  def test_no_curve_and_no_inflection_points
+  def test_no_curvature
     polynomials = []
     polynomials << Polynomial.parse('5 x + 4')
     polynomials << Polynomial.parse('4')
@@ -81,8 +86,39 @@ class TestPolynomial < MiniTest::Unit::TestCase
     end
   end
 
+  def test_local_extrema_of_derivative_leads_to_no_curvature
+    polynomial = Polynomial.parse('50x^10 - 20x^2')
+    assert_equal({}, polynomial.curvature_behaviour)
+  end
+
   def test_two_inflection_points
     polynomial = Polynomial.parse('+ 1.0 x^4 + 5.0 x^3 - 1.0 x^2 + 3.0 x + 5.0')
-    assert_equal({left:Set[-1.0/0..-2.5649778198, 0.0649778198..1.0/0], right: Set[-2.5649778198..0.0649778198] } , polynomial.curvature_behaviour)
+    assert_equal({left:[-1.0/0..-2.5649778198, 0.0649778198..1.0/0], right: [-2.5649778198..0.0649778198] } , polynomial.curvature_behaviour)
+  end
+
+  def test_three_inflection_points
+    polynomial = Polynomial.new(20,4,0,-1,-200)
+    assert_equal( {:right=>[(-1/10)..0.0], :left=>[-Infinity..(-1/10), 0.0..Infinity]}, polynomial.curvature_behaviour)
+  end
+
+
+  def test_efficient_roots_calculation
+    polynomial = Polynomial.parse('200x^2342435 + 6x^20')
+    assert_equal(Set[0.0], polynomial.roots)
+  end
+
+  def test_lt
+    polynomial = Polynomial.parse('1x^2342435 + 5x')
+    assert_euqal Term.new(5,1), polynomial.lt
+  end
+
+  def test_lt
+    polynomial = Polynomial.parse('1x^2342435 + 5x')
+    assert_equal Term.new(2342435,1), polynomial.gt
+  end
+
+  def test_initalizer
+    polynomial = Polynomial.new(5,0,2,-1)
+    assert_equal '5x^3 + 2x - 1', polynomial.to_s
   end
 end

data/test/term_test.rb

@@ -24,4 +24,16 @@ class TestTerm < MiniTest::Unit::TestCase
     assert_equal 6, Term.parse('6').coefficient
     assert_equal 0, Term.parse('6').exponent
   end
+
+  def test_invalid_string_raises_not_parsable_error
+    ['6x^ -5', '6^20',  '2 2', 'xx', '2 ^ x'].each do |not_parsable_string|
+      assert_raises NotParsableError do
+        term = Term.parse not_parsable_string
+      end
+    end
+  end
+
+  def testing_to_s
+    assert_equal "+ 6 ", Term.parse('6').to_s
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +02:00
+date: 2011-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,6 @@ files:
 - lib/polynomials.rb
 - lib/term.rb
 - polynomials.gemspec
-- tags
 - test/helper.rb
 - test/math_test.rb
 - test/polynomial_test.rb
@@ -116,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2463697157255217048
+      hash: -2290630464224354984
       segments: 
       - 0
       version: "0"

data/tags

@@ -1,91 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.8	//
-==	lib/polynomials.rb	/^  def ==(other)$/;"	f	class:Polynomial
-==	lib/term.rb	/^  def ==(other)$/;"	f	class:Term
-AfterExtremumsCurvatureMapping	rdoc/Polynomial.html	/^				<dt><a name="AfterExtremumsCurvatureMapping">AfterExtremumsCurvatureMapping<\/a><\/dt>$/;"	a
-Math	lib/core_ext/math.rb	/^module Math$/;"	m
-MinMaxMapping	rdoc/Polynomial.html	/^				<dt><a name="MinMaxMapping">MinMaxMapping<\/a><\/dt>$/;"	a
-NegPosMinMaxExtremumMapping	rdoc/Polynomial.html	/^				<dt><a name="NegPosMinMaxExtremumMapping">NegPosMinMaxExtremumMapping<\/a><\/dt>$/;"	a
-Polynomial	lib/polynomials.rb	/^class Polynomial$/;"	c
-Term	lib/term.rb	/^class Term$/;"	c
-Test	test/helper.rb	/^class Test::Unit::TestCase$/;"	c
-TestMath	test/math_test.rb	/^class TestMath < MiniTest::Unit::TestCase$/;"	c
-TestPolynomial	test/polynomial_test.rb	/^class TestPolynomial < MiniTest::Unit::TestCase$/;"	c
-TestTerm	test/term_test.rb	/^class TestTerm < MiniTest::Unit::TestCase$/;"	c
-alter	lib/polynomials.rb	/^  def alter$/;"	f	class:Polynomial
-calculate	lib/polynomials.rb	/^  def calculate(x)$/;"	f	class:Polynomial
-coefficient	rdoc/Term.html	/^				<a name="coefficient"><\/a>$/;"	a
-coefficient=	rdoc/Term.html	/^				<a name="coefficient="><\/a>$/;"	a
-coefficients_till	lib/polynomials.rb	/^  def coefficients_till(n)$/;"	f	class:Polynomial
-curvature_behaviour	lib/polynomials.rb	/^  def curvature_behaviour$/;"	f	class:Polynomial
-degree	lib/polynomials.rb	/^  def degree$/;"	f	class:Polynomial
-derivative	lib/polynomials.rb	/^  def derivative$/;"	f	class:Polynomial
-dup	lib/term.rb	/^  def dup$/;"	f	class:Term
-exponent	rdoc/Term.html	/^				<a name="exponent"><\/a>$/;"	a
-exponent=	rdoc/Term.html	/^				<a name="exponent="><\/a>$/;"	a
-extrema	lib/polynomials.rb	/^  def extrema$/;"	f	class:Polynomial
-initialize	lib/polynomials.rb	/^  def initialize$/;"	f	class:Polynomial
-initialize	lib/term.rb	/^  def initialize(exponent = 0, coefficient = 0)$/;"	f	class:Term
-local_extrema	lib/polynomials.rb	/^  def local_extrema$/;"	f	class:Polynomial
-method-c-new	rdoc/Polynomial.html	/^				<a name="method-c-new"><\/a>$/;"	a
-method-c-new	rdoc/Term.html	/^				<a name="method-c-new"><\/a>$/;"	a
-method-c-parse	rdoc/Polynomial.html	/^				<a name="method-c-parse"><\/a>$/;"	a
-method-c-parse	rdoc/Term.html	/^				<a name="method-c-parse"><\/a>$/;"	a
-method-c-roots_of_cubic_function	rdoc/Math.html	/^				<a name="method-c-roots_of_cubic_function"><\/a>$/;"	a
-method-c-roots_of_quadratic_function	rdoc/Math.html	/^				<a name="method-c-roots_of_quadratic_function"><\/a>$/;"	a
-method-c-roots_of_quartic_function	rdoc/Math.html	/^				<a name="method-c-roots_of_quartic_function"><\/a>$/;"	a
-method-i-%3D%3D	rdoc/Polynomial.html	/^				<a name="method-i-%3D%3D"><\/a>$/;"	a
-method-i-%3D%3D	rdoc/Term.html	/^				<a name="method-i-%3D%3D"><\/a>$/;"	a
-method-i-alter	rdoc/Polynomial.html	/^				<a name="method-i-alter"><\/a>$/;"	a
-method-i-calculate	rdoc/Polynomial.html	/^				<a name="method-i-calculate"><\/a>$/;"	a
-method-i-coefficients_till	rdoc/Polynomial.html	/^				<a name="method-i-coefficients_till"><\/a>$/;"	a
-method-i-curvature_behaviour	rdoc/Polynomial.html	/^				<a name="method-i-curvature_behaviour"><\/a>$/;"	a
-method-i-degree	rdoc/Polynomial.html	/^				<a name="method-i-degree"><\/a>$/;"	a
-method-i-derivative	rdoc/Polynomial.html	/^				<a name="method-i-derivative"><\/a>$/;"	a
-method-i-dup	rdoc/Term.html	/^				<a name="method-i-dup"><\/a>$/;"	a
-method-i-extremums	rdoc/Polynomial.html	/^				<a name="method-i-extremums"><\/a>$/;"	a
-method-i-local_extremums	rdoc/Polynomial.html	/^				<a name="method-i-local_extremums"><\/a>$/;"	a
-method-i-nulls	rdoc/Polynomial.html	/^				<a name="method-i-nulls"><\/a>$/;"	a
-method-i-to_s	rdoc/Polynomial.html	/^				<a name="method-i-to_s"><\/a>$/;"	a
-method-i-to_s	rdoc/Term.html	/^				<a name="method-i-to_s"><\/a>$/;"	a
-parse	lib/polynomials.rb	/^  def self.parse(string)$/;"	F	class:Polynomial
-parse	lib/term.rb	/^  def self.parse(string)$/;"	F	class:Term
-roots	lib/polynomials.rb	/^  def roots$/;"	f	class:Polynomial
-roots_of_cubic_function	lib/core_ext/math.rb	/^  def self.roots_of_cubic_function(a,b,c,d,with_complex = false)$/;"	F	class:Math
-roots_of_quadratic_function	lib/core_ext/math.rb	/^  def self.roots_of_quadratic_function(a,b,c)$/;"	F	class:Math.roots_of_cubic_function
-roots_of_quartic_function	lib/core_ext/math.rb	/^  def self.roots_of_quartic_function(*args)$/;"	F	class:Math.roots_of_cubic_function
-terms	rdoc/Polynomial.html	/^				<a name="terms"><\/a>$/;"	a
-terms=	rdoc/Polynomial.html	/^				<a name="terms="><\/a>$/;"	a
-test_calculation	test/polynomial_test.rb	/^  def test_calculation$/;"	f	class:TestPolynomial
-test_degree	test/polynomial_test.rb	/^  def test_degree$/;"	f	class:TestPolynomial
-test_derivative_functions_with_higher_degree	test/polynomial_test.rb	/^  def test_derivative_functions_with_higher_degree$/;"	f	class:TestPolynomial
-test_derivative_of_linear_functions	test/polynomial_test.rb	/^  def test_derivative_of_linear_functions$/;"	f	class:TestPolynomial
-test_equality	test/polynomial_test.rb	/^  def test_equality$/;"	f	class:TestPolynomial
-test_extrema	test/polynomial_test.rb	/^  def test_extrema$/;"	f	class:TestPolynomial
-test_extrema_with_slope_of_derivative_equal_to_zero	test/polynomial_test.rb	/^  def test_extrema_with_slope_of_derivative_equal_to_zero$/;"	f	class:TestPolynomial
-test_initializer	test/term_test.rb	/^  def test_initializer$/;"	f	class:TestTerm
-test_no_curve_and_no_inflection_points	test/polynomial_test.rb	/^  def test_no_curve_and_no_inflection_points$/;"	f	class:TestPolynomial
-test_no_inflection_points	test/polynomial_test.rb	/^  def test_no_inflection_points$/;"	f	class:TestPolynomial
-test_no_local_extrema	test/polynomial_test.rb	/^  def test_no_local_extrema$/;"	f	class:TestPolynomial
-test_parsing	test/polynomial_test.rb	/^  def test_parsing$/;"	f	class:TestPolynomial
-test_parsing_variable_omitted	test/term_test.rb	/^  def  test_parsing_variable_omitted$/;"	f	class:TestTerm
-test_parsing_with_default_coefficient_equal_to_one	test/term_test.rb	/^  def test_parsing_with_default_coefficient_equal_to_one$/;"	f	class:TestTerm
-test_parsing_with_default_exponent_equal_to_one	test/term_test.rb	/^  def test_parsing_with_default_exponent_equal_to_one$/;"	f	class:TestTerm
-test_parsing_with_standard_format	test/term_test.rb	/^  def test_parsing_with_standard_format$/;"	f	class:TestTerm
-test_roots_biquadratic_equation	test/math_test.rb	/^  def test_roots_biquadratic_equation$/;"	f	class:TestMath
-test_roots_for_constant_functions	test/math_test.rb	/^  def test_roots_for_constant_functions$/;"	f	class:TestMath
-test_roots_for_cubic_functions	test/math_test.rb	/^  def test_roots_for_cubic_functions$/;"	f	class:TestMath
-test_roots_for_cubic_functions_one_real_all_equal	test/math_test.rb	/^  def test_roots_for_cubic_functions_one_real_all_equal$/;"	f	class:TestMath
-test_roots_for_cubic_functions_with_complex	test/math_test.rb	/^  def test_roots_for_cubic_functions_with_complex$/;"	f	class:TestMath
-test_roots_for_linear_functions	test/math_test.rb	/^  def test_roots_for_linear_functions$/;"	f	class:TestMath
-test_roots_for_quartic_functions	test/math_test.rb	/^  def test_roots_for_quartic_functions$/;"	f	class:TestMath
-test_roots_quadratic_functions	test/math_test.rb	/^  def test_roots_quadratic_functions$/;"	f	class:TestMath
-test_roots_without_term_with_exponent_of_zero	test/math_test.rb	/^  def test_roots_without_term_with_exponent_of_zero$/;"	f	class:TestMath
-test_to_s	test/polynomial_test.rb	/^  def test_to_s$/;"	f	class:TestPolynomial
-test_two_inflection_points	test/polynomial_test.rb	/^  def test_two_inflection_points$/;"	f	class:TestPolynomial
-to_s	lib/polynomials.rb	/^  def to_s$/;"	f	class:Polynomial
-to_s	lib/term.rb	/^  def to_s$/;"	f	class:Term