spliner 1.0.5 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 89acfd040767f4ec8454074bf05af816d222218e5f64a6045cee9edf1b11d926
+  data.tar.gz: fe8c8212c6230bf61a768eaf399f509487b60211a3bddb0405180ad9df93b81e
+SHA512:
+  metadata.gz: 7d7a5dee2684e3b17c870832e68e2ba71b05e6b724298aaf679dc9ae313dc254cad3631dc7a462ec8785f991501302703a375db6f192907c7aad55f259237427
+  data.tar.gz: 1b44da03e4022c8fd11de4015709b0195aac38626767a95742bb826b38dbd78c2400f6efbc30352dc63562781b7ee981ff402499855facb87ead35413e0ced05

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Tallak Tveide
+
+MIT License
+
+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/README.markdown

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/tallakt/spliner.png?branch=master)](http://travis-ci.org/tallakt/spliner)
+[![CI](https://github.com/tallakt/spliner/actions/workflows/ci.yml/badge.svg)](https://github.com/tallakt/spliner/actions/workflows/ci.yml)
 
 Spliner
 =======
@@ -12,7 +12,7 @@ values.
 Installation
 ------------
 
-Spliner requires Ruby 1.9 or later. Install with rubygems:
+Spliner requires Ruby 3.0 or later. Install with rubygems:
 
     gem install spliner
 
@@ -63,9 +63,9 @@ try to have each feature separated in commits.
 Home page
 ---------
 
-http://www.github.com/tallakt/spliner
+https://github.com/tallakt/spliner
 
-http://rubygems.org/gems/spliner
+https://rubygems.org/gems/spliner
 
 License
 -------

data/lib/spliner/spliner.rb

@@ -170,10 +170,10 @@ module Spliner
            end
 
       get_func = lambda do |v|
-        i = @sections.find_index {|section| section.range.member? v }
+        i = @sections.find_index {|section| section.range.cover? v }
         if i
           @sections[i].get v
-        elsif range.member? v
+        elsif range.cover? v
           extrapolate(v)
         else
           nil

data/lib/spliner/spliner_section.rb

@@ -24,10 +24,10 @@ module Spliner
 
     def calculate_a_k
       if @x.size > 1
-        inv_diff = @x.each_cons(2).map {|x1, x2| 1 / (x2 - x1) }
+        inv_diff = @x.each_cons(2).map {|x1, x2| 1.0 / (x2 - x1) }
         a_diag = 2.0 * Matrix::diagonal(*vector_helper(inv_diff))
         a_non_diag = Matrix::build(@x.size) do |row, col|
-          if row == col+ 1
+          if row == col + 1
             inv_diff[col]
           elsif col == row + 1
             inv_diff[row]
@@ -41,11 +41,16 @@ module Spliner
         tmp = @x.zip(@y).each_cons(2).map do |p1, p2|
           x1, y1 = p1
           x2, y2 = p2
-          3.0 * (y2 - y1) / (x2 - x1) ** 2.0
+          delta_x = (x2 - x1)
+          3.0 * (y2 - y1) / (delta_x * delta_x)
         end
         b = vector_helper(tmp)
 
-        @k = a.inv * b
+        if RUBY_VERSION < "1.9.3"
+          @k = a.inv * b
+        else
+          @k = a.lup_decomposition.solve b
+        end
       else
         @k = Vector[0.0]
       end
@@ -54,14 +59,19 @@ module Spliner
 
     # returns an interpolated value
     def get(v)
-      i = @x_pairs.find_index {|pair| pair.member? v }
+      i = @x_pairs.find_index {|pair| pair.cover? v }
       if i
-        dx = @x[i + 1] - @x[i]
-        dy = @y[i + 1] - @y[i]
-        t = (v - @x[i]) / dx
-        a = @k[i] * dx - dy
-        b = -(@k[i + 1] * dx - dy)
-        (1 - t) * @y[i] + t * @y[i + 1] + t * (1 - t) * (a * (1 - t) + b * t)
+        x_pair = @x_pairs[i]
+        x_min = x_pair.min
+        dx = x_pair.max - x_min
+        y_max = @y[i + 1]
+        y_min = @y[i]
+        dy = y_max - y_min
+        t = (v - x_min) / dx
+        a =      @k[i] * dx - dy
+        b = -@k[i + 1] * dx + dy
+        one_minus_t = 1 - t
+        t * y_max + one_minus_t * ( y_min + t * ( a * one_minus_t + b * t ) )
       elsif @x.size == 1 && @x.first == v
         @y.first
       else

data/lib/spliner/version.rb

@@ -0,0 +1,3 @@
+module Spliner
+  VERSION = '1.1.0'
+end

data/lib/spliner.rb

@@ -1,5 +1,2 @@
+require 'spliner/version'
 require 'spliner/spliner'
-
-module Spliner
-  VERSION = '1.0.5'
-end

metadata

@@ -1,48 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spliner
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Tallak Tveide
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2026-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: matrix
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
+        version: '0'
+  type: :runtime
   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'
+        version: '0'
 description: Simple library to perform cubic spline interpolation based on key X,Y
   values
 email:
@@ -51,39 +32,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
+- LICENSE.txt
 - 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: 
+- lib/spliner/version.rb
+homepage: https://github.com/tallakt/spliner
+licenses:
+- MIT
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: spliner
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.4.20
+signing_key:
+specification_version: 4
 summary: Cubic spline interpolation library
 test_files: []
-has_rdoc: 

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-Gemfile.lock

data/.travis.yml

@@ -1,8 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - jruby
-  - rbx-19mode
-  - ruby-head
-
-

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-gemspec
-
-

data/Rakefile

@@ -1,6 +0,0 @@
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-

data/spec/spliner_spec.rb

@@ -1,148 +0,0 @@
-require 'spliner'
-
-describe Spliner::Spliner do
-  DATASET = {0.0 => 0.0, 1.0 => 1.0, 2.0 => 0.5}
-  DATASET_X = [0.0, 1.0, 2.0]
-  DATASET_Y = [0.0, 1.0, 0.5]
-  KEYS_0_100 = {0.0 => 0.0, 100.0 => 100.0}
-
-
-  it 'should not accept x values that are not increasing' do
-    expect(lambda { Spliner::Spliner.new [0.0, -1.0], [0.0, 1.0] }).to raise_exception
-  end
-
-  it 'should support key points with a single value' do
-    s1 = Spliner::Spliner.new Hash[0.0, 0.0]
-    expect(s1.get 0.0).to be_within(0.0001).of(0.0)
-    expect(s1.get 1.5).to be_nil
-
-    s2 = Spliner::Spliner.new Hash[0.0, 0.0], :extrapolate => -1..1
-    expect(s2.get 0.0).to be_within(0.0001).of(0.0)
-    expect(s2.get 0.5).to be_within(0.0001).of(0.0)
-  end
-
-  it 'supports the Hash initializer' do
-    s1 = Spliner::Spliner.new Hash[0.0, 0.0, 1.0, 1.0]
-    expect(s1[0.5]).to be_within(0.0001).of(0.5)
-
-    s2 = Spliner::Spliner.new Hash[0.0, 0.0, 1.0, 1.0], :extrapolate => '100%'
-    expect(s2[0.5]).to be_within(0.0001).of(0.5)
-    expect(s2.range.first).to be_within(0.0001).of(-1.0)
-  end
-
-  it 'supports the x-y array/vector initializer' do
-    s1 = Spliner::Spliner.new [0.0, 1.0], [0.0, 1.0]
-    expect(s1[0.5]).to be_within(0.0001).of(0.5)
-
-    s2= Spliner::Spliner.new [0.0, 1.0], [0.0, 1.0], :extrapolate => '100%'
-    expect(s2[0.5]).to be_within(0.0001).of(0.5)
-    expect(s2.range.first).to be_within(0.0001).of(-1.0)
-
-    s3 = Spliner::Spliner.new Vector[0.0, 1.0], Vector[0.0, 1.0]
-    expect(s3[0.5]).to be_within(0.0001).of(0.5)
-  end
-
-  it 'should return the data points themselves' do
-    s = Spliner::Spliner.new DATASET
-    DATASET.each do |k,v|
-      expect(s.get(k)).to be_within(0.00001).of(v)
-    end
-  end
-
-  it 'should return nil outside the data area' do
-    s = Spliner::Spliner.new DATASET
-    expect(s.get(-1.0)).to be_nil
-    expect(s.get(3.0)).to be_nil
-  end
-
-  it 'should generate a smooth curve (predefined points)' do
-    s = Spliner::Spliner.new DATASET
-    expect(s.get(0.4)).to be_within(0.0001).of(0.5260)
-    expect(s.get(0.8)).to be_within(0.0001).of(0.9080)
-    expect(s.get(1.2)).to be_within(0.0001).of(1.0080)
-    expect(s.get(1.6)).to be_within(0.0001).of(0.8260)
-  end
-
-  it 'should perform linear interpolation in the case of two data points' do
-    s = Spliner::Spliner.new({0 => 0, 10.0 => 100.0})
-    expect(s.get(3.0)).to be_within(0.0001).of(30.0)
-  end
-
-  it 'supports the [] operator (indexing like)' do
-    s = Spliner::Spliner.new DATASET
-    expect(s[-1]).to be_nil
-    expect(s[0]).to be_within(0.0001).of(0.0)
-  end
-
-  it 'performs :linear extrapolation outside the data range when such is given' do
-    s = Spliner::Spliner.new KEYS_0_100, :extrapolate => -200..200
-    expect(s.get -110).not_to be_nil
-    expect(s.get -150).to be_within(0.0001).of(-150)
-    expect(s.get 150).to be_within(0.0001).of(150)
-  end
-
-  it 'performs :hold extrapolation' do
-    s = Spliner::Spliner.new KEYS_0_100, :extrapolate => -200..200, :emethod => :hold
-    expect(s.get -150).to be_within(0.0001).of(0)
-    expect(s.get 150).to be_within(0.0001).of(100)
-  end
-
-  it 'supports data ranges given as a string like "10%"' do
-    s1 = Spliner::Spliner.new KEYS_0_100, :extrapolate => '10%'
-    expect(s1.range.first).to be_within(0.0001).of(-10.0)
-    expect(s1.range.last).to be_within(0.0001).of(110.0)
-
-    s2 = Spliner::Spliner.new KEYS_0_100, :extrapolate => '10.0%'
-    expect(s2.range.first).to be_within(0.0001).of(-10.0)
-    expect(s2.range.last).to be_within(0.0001).of(110.0)
-
-    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
-    s = Spliner::Spliner.new [0.0, 1.0, 1.0, 2.0, 2.0, 3.0], [0.0, 0.0, 1.0, 1.0, 2.0, 2.0], :extrapolate => 3.0..4.0
-    expect(s.sections).to eq(3)
-    expect(s[-1.0]).to be_nil
-    expect(s[0.5]).to be_within(0.0001).of(0.0)
-    expect(s[1.5]).to be_within(0.0001).of(1.0)
-    expect(s[2.5]).to be_within(0.0001).of(2.0)
-    expect(s[3.5]).to be_within(0.0001).of(2.0)
-    expect(s[5.0]).to be_nil
-  end
-
-  it 'should accept an array or vector as index' do
-    s = Spliner::Spliner.new DATASET
-    expect(s[*DATASET.keys]).to eq(DATASET.values)
-    expect(s[DATASET.keys]).to eq(DATASET.values)
-    expect(s[Vector[*DATASET.keys]]).to eq(Vector[*DATASET.values])
-  end
-
-  it 'should accept an range/enumerator as index' do
-    s = Spliner::Spliner.new DATASET
-    expect(s[0..2]).to eq(DATASET.values)
-    expect(s[(0.0..2.0).step(1.0)]).to eq(DATASET.values)
-  end
-
-  it 'supports the class shortcut method' do
-    expect(Spliner::Spliner[DATASET_X, DATASET_Y, 0..2]).to eq(DATASET.values)
-    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.1, 0.5, 0.4, 1.0], [0.0, 1.0, 1.0, 0.5, 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)
-
-    # not sure why this one is more difficult
-    x = [ -0.2006675899028778, -0.15321242064237595, -0.1328744888305664, -0.09355448558926582, -0.055590344592928886, -0.01355862058699131, 0.0, -0.008135172538459301, 0.0, -0.005423448514193296 ]
-    y = [ -60.06944274902344, -53.81944274902344, -51.46846008300781, -46.78096008300781, -41.30497741699219, -35.9664306640625, -33.99884033203125, -32.79803466796875, -31.980606079101562, -31.163192749023438 ]
-    s2 = Spliner::Spliner.new x, y, :fix_invalid_x => true 
-  end
-
-end

data/spliner.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "spliner"
-
-Gem::Specification.new do |s|
-  s.name = "spliner"
-  s.version = Spliner::VERSION
-  s.authors = ["Tallak Tveide"]
-  s.email = ["tallak@tveide.net"]
-  s.homepage = "http://www.github.com/tallakt/spliner"
-  s.summary = %q{Cubic spline interpolation library}
-  s.description = %q{Simple library to perform cubic spline interpolation based on key X,Y values}
-  s.required_ruby_version = '>= 1.9.1'
-
-  s.rubyforge_project = "spliner"
-
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # s.add_runtime_dependency "clamp", '~> 0.3'
-  s.add_development_dependency "rspec", '~> 2.11'
-  s.add_development_dependency "rake", '~> 0.9'
-end