spliner 1.0.3 → 1.0.4

data/lib/spliner.rb

@@ -1,5 +1,5 @@
 require 'spliner/spliner'
 
 module Spliner
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/spliner/spliner.rb

@@ -42,15 +42,17 @@ module Spliner
     # @overload initialize(key_points, options)
     #   @param key_points [Hash{Float => Float}] keys are X values in increasing order, values Y
     #   @param options [Hash]
-    #   @option options [Range,String] :extrapolate ('0%') either a range or percentage, eg '10.0%'
+    #   @option options [Range,String] :extrapolate ('0%') either a range or percentage, eg '10.0%', or float 0.1
     #   @option options [Symbol] :emethod (:linear) extrapolation method
+    #   @option options [Symbol] :fix_invalid_x (false) delete data points not in increasing order
     #
     # @overload initialize(x, y, options)
     #   @param x [Array(Float),Vector] the X values of the key points
     #   @param y [Array(Float),Vector] the Y values of the key points
     #   @param options [Hash]
-    #   @option options [Range,String] :extrapolate ('0%') either a range or percentage, eg '10.0%'
+    #   @option options [Range,String] :extrapolate ('0%') either a range or percentage, eg '10.0%', or float 0.1
     #   @option options [Symbol] :emethod (:linear) extrapolation method
+    #   @option options [Symbol] :fix_invalid_x (false) delete data points not in increasing order
     #
     def initialize(*param)
       # sort parameters from two alternative initializer signatures
@@ -67,6 +69,15 @@ module Spliner
       end
       options ||= {}
 
+      if options[:fix_invalid_x]
+        pp = Hash[x.zip y]
+        pp.keys.each_cons(2) do |a,b|
+          pp.delete b if b < a
+        end
+        x = pp.keys
+        y = pp.values
+      end
+
       @sections = split_at_duplicates(x).map {|slice| SplinerSection.new x[slice], y[slice] }
 
       # Handle extrapolation option parameter
@@ -79,6 +90,10 @@ module Spliner
           @range = (x.first - extra)..(x.last + extra)
         when Range
           @range = ex
+        when Float
+          span = x.last - x.first
+          extra = span * ex
+          @range = (x.first - extra)..(x.last + extra)
         when nil
           @range = x.first..x.last
         else

data/spec/spliner_spec.rb

@@ -99,6 +99,10 @@ describe Spliner::Spliner do
     s3 = Spliner::Spliner.new KEYS_0_100, :extrapolate => '10 %'
     expect(s3.range.first).to be_within(0.0001).of(-10.0)
     expect(s3.range.last).to be_within(0.0001).of(110.0)
+
+    s4 = Spliner::Spliner.new KEYS_0_100, :extrapolate => 0.1
+    expect(s3.range.first).to be_within(0.0001).of(-10.0)
+    expect(s3.range.last).to be_within(0.0001).of(110.0)
   end
 
   it 'splits data points with duplicate X values into separate sections' do
@@ -130,4 +134,10 @@ describe Spliner::Spliner do
     expect(Spliner::Spliner::interpolate(DATASET, 0..2, :extrapolate => '5%')).to eq(DATASET.values)
   end
 
+  it 'has the option :fix_invalid_x to delete invalid x values (not increasing)' do
+    s = Spliner::Spliner.new [0.0, -1.0, 1.0], [0.0, 1.0, 1.0], :extrapolate => '100%', :fix_invalid_x => true 
+    expect(s[0.5]).to be_within(0.001).of(0.5)
+    expect(s[-0.5]).to be_within(0.001).of(-0.5)
+  end
+
 end

metadata

@@ -1,85 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spliner
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  version: 1.0.3
 platform: ruby
-authors: 
-  - Tallak Tveide
+authors:
+- Tallak Tveide
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-24 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.11"
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "0.9"
-    type: :development
-    version_requirements: *id002
-description: Simple library to perform cubic spline interpolation based on key X,Y values
-email: 
-  - tallak@tveide.net
+date: 2012-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+description: Simple library to perform cubic spline interpolation based on key X,Y
+  values
+email:
+- tallak@tveide.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .travis.yml
-  - Gemfile
-  - README.markdown
-  - Rakefile
-  - lib/spliner.rb
-  - lib/spliner/spliner.rb
-  - lib/spliner/spliner_section.rb
-  - spec/spliner_spec.rb
-  - spliner.gemspec
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- README.markdown
+- Rakefile
+- lib/spliner.rb
+- lib/spliner/spliner.rb
+- lib/spliner/spliner_section.rb
+- spec/spliner_spec.rb
+- spliner.gemspec
 homepage: http://www.github.com/tallakt/spliner
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.1
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spliner
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cubic spline interpolation library
 test_files: []
-
+has_rdoc: