polynomials 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/polynomials.rb

@@ -1,7 +1,9 @@
 require 'set'
 require_relative 'term'
 require_relative 'core_ext/math'
+
 class Polynomial
+
   MinMaxMapping = { 1.0 => :max, -1.0  => :min }
   AfterextremaCurvatureMapping = { max: :right, min: :left }
   NegPosMinMaxExtremumMapping = {[1.0,-1.0] => :max,[-1.0,1.0] => :min}
@@ -35,14 +37,6 @@ class Polynomial
     return new_function
   end
 
-  def alter
-    new_function = self.class.new
-    self.terms.values.each do |term|
-      yield new_function, term
-    end
-    return new_function
-  end
-
   def roots
     if terms.keys.none?(&:zero?)
       self.alter { |nf, term| nf.terms[term.exponent-1].coefficient = term.coefficient }.roots << 0.0
@@ -65,8 +59,8 @@ class Polynomial
   def local_extrema
     derivative = self.derivative
     max_min_extremum =  Hash.new { |hash,key| hash[key] = Set.new }
-    unless derivative.degree == 0 
-      possible_extrema = derivative.roots.sort
+    possible_extrema = derivative.roots.sort
+    unless possible_extrema.empty?
 
       samples = ([possible_extrema.first - 1] + possible_extrema.sort + [possible_extrema.last + 1]).each_cons(2).map do |before,after|
         (before + after)/2
@@ -120,6 +114,7 @@ class Polynomial
   end
 
  private
+
   def coefficients_till(n)
     coefficients = []
     (0..n).each do |e|
@@ -127,4 +122,14 @@ class Polynomial
     end
     return coefficients.reverse
   end
+
+ protected
+
+  def alter
+    new_function = self.class.new
+    self.terms.values.each do |term|
+      yield new_function, term
+    end
+    return new_function
+  end
 end

data/lib/term.rb

@@ -7,11 +7,11 @@ class Term
 
   def self.parse(string)
     term = self.new
-    float = /(\d*(?:\.\d*)?)/
-    integer = /(\d*)/
-    raw_data = string.match(/([-+]?)\s*#{float}\s*(x.*)?\s*\Z/)
-    term.coefficient = (raw_data[1] + raw_data[2]).to_f
-    term.exponent = (raw_data[3] ? (raw_data[3] =~ /x\^#{integer}/ ?  $1.to_i : 1) : 0)
+    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)
     term
   end
 

data/polynomials.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{polynomials}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]

data/test/polynomial_test.rb

@@ -50,6 +50,12 @@ class TestPolynomial < MiniTest::Unit::TestCase
     assert_equal({ max: Set[1.0/0, -1.0/0], min: Set[0.0]}, polynomial.extrema)
   end
 
+  def test_no_local_extrema
+    polynomial = Polynomial.parse('6x^6 - 5x + 50')
+    assert_equal({}, polynomial.local_extrema)
+    assert_equal({max: Set[ -1.0/0, 1.0/0 ]}, polynomial.extrema)
+  end
+
   def test_no_inflection_points
     polynomial = Polynomial.parse('1 x^4')
     assert_equal({ left: Set[-1.0/0..+1.0/0] }, polynomial.curvature_behaviour)

data/test/term_test.rb

@@ -5,8 +5,23 @@ class TestTerm < MiniTest::Unit::TestCase
     assert_equal 0, Term.new.exponent
   end
 
-  def test_parsing
+  def test_parsing_with_standard_format
     assert_equal 4, Term.parse('4x^2').coefficient
     assert_equal 2, Term.parse('4x^2').exponent
   end
+
+  def test_parsing_with_default_exponent_equal_to_one
+    assert_equal 1, Term.parse('1x').coefficient
+    assert_equal 1, Term.parse('1x').exponent
+  end
+
+  def test_parsing_with_default_coefficient_equal_to_one
+    assert_equal 1.0, Term.parse('x^6').coefficient
+    assert_equal 6, Term.parse('x^6').exponent
+  end
+
+  def  test_parsing_variable_omitted
+    assert_equal 6, Term.parse('6').coefficient
+    assert_equal 0, Term.parse('6').exponent
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -856232510255966388
+      hash: 1846189921572599385
       segments: 
       - 0
       version: "0"