more_math 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8592c5f27e6c601ae312bf1870259967e7763b28
-  data.tar.gz: b1e23ffdfc15ee89ff25f8cf7d0a3f9ca8f27aa5
+SHA256:
+  metadata.gz: f0225a838150eb806c43ab9f127a48d4e3413a112d790c471a30a523a9ba232a
+  data.tar.gz: 280a109a31687d7d1206a4242b70d45c569109104a806f12a76335d469571cef
 SHA512:
-  metadata.gz: 0a0bf6510034861d95b94abbe7bc6d13d38fa5c5db9d5eb62dec371b8b6a846a76e15de6fd0a1a8151d6459cdb0819fe85ea5503025c4cf49e331a39f7dcd8a8
-  data.tar.gz: f841cbc883d82f78a834044e84857bc25d212c54da766085e5ea7fe0f7dcebf44044896a5009565a09e6d6183ad6fc991fab166a688f6ec2db57daf1ee9a48c2
+  metadata.gz: 28d4b17002c51d638cac2df07f1e183c507f27dc963c18579fd0ba6a6796f3ae119fd4c1ffc77bfa7125dfb69b00d5d6fac48b90f9449d9596a36c2f139e4bd8
+  data.tar.gz: 2ebdea2b609ada67acd58764c1983dd5ec773866f94bd3900213ea73e7119b758467fdff7b576a7552669cf4dbb5431462b9321a40393e7d89564acb11bcffd0

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
   - 2.1
   - 2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 sudo: false

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/more_math/linear_regression.rb

@@ -32,9 +32,9 @@ module MoreMath
       t.abs <= td.inverse_probability(1 - alpha.abs / 2.0).abs
     end
 
-    # Returns the residues of this linear regression in relation to the given
+    # Returns the residuals of this linear regression in relation to the given
     # domain and image.
-    def residues
+    def residuals
       result = []
       @domain.zip(@image) do |x, y|
         result << y - (@a * x + @b)
@@ -42,13 +42,21 @@ module MoreMath
       result
     end
 
+    def r2
+      image_seq = MoreMath::Sequence.new(@image)
+      sum_res   = residuals.inject(0.0) { |s, r| s + r ** 2 }
+      [
+        1.0 -  sum_res / image_seq.sum_of_squares,
+        0.0,
+      ].max
+    end
+
     private
 
     def compute
       size = @image.size
       sum_xx = sum_xy = sum_x = sum_y = 0.0
       @domain.zip(@image) do |x, y|
-        x += 1
         sum_xx += x ** 2
         sum_xy += x * y
         sum_x += x

data/lib/more_math/sequence.rb

@@ -289,7 +289,7 @@ module MoreMath
     # Returns the d-value for the Durbin-Watson statistic. The value is d << 2
     # for positive, d >> 2 for negative and d around 2 for no autocorrelation.
     def durbin_watson_statistic
-      e = linear_regression.residues
+      e = linear_regression.residuals
       e.size <= 1 and return 2.0
       (1...e.size).inject(0.0) { |s, i| s + (e[i] - e[i - 1]) ** 2 } /
         e.inject(0.0) { |s, x| s + x ** 2 }

data/lib/more_math/version.rb

@@ -1,6 +1,6 @@
 module MoreMath
   # MoreMath version
-  VERSION         = '0.3.3'
+  VERSION         = '0.4.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/more_math.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: more_math 0.3.3 ruby lib
+# stub: more_math 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "more_math".freeze
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2017-07-04"
+  s.date = "2019-06-13"
   s.description = "Library that provides more mathematical functions/algorithms than standard Ruby.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.rdoc".freeze, "lib/more_math.rb".freeze, "lib/more_math/cantor_pairing_function.rb".freeze, "lib/more_math/constants/functions_constants.rb".freeze, "lib/more_math/continued_fraction.rb".freeze, "lib/more_math/distributions.rb".freeze, "lib/more_math/entropy.rb".freeze, "lib/more_math/exceptions.rb".freeze, "lib/more_math/functions.rb".freeze, "lib/more_math/histogram.rb".freeze, "lib/more_math/linear_regression.rb".freeze, "lib/more_math/newton_bisection.rb".freeze, "lib/more_math/numberify_string_function.rb".freeze, "lib/more_math/permutation.rb".freeze, "lib/more_math/ranking_common.rb".freeze, "lib/more_math/sequence.rb".freeze, "lib/more_math/sequence/moving_average.rb".freeze, "lib/more_math/sequence/refinement.rb".freeze, "lib/more_math/string_numeral.rb".freeze, "lib/more_math/subset.rb".freeze, "lib/more_math/version.rb".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "MoreMath -- More Math in Ruby".freeze, "--main".freeze, "README.rdoc".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Library that provides more mathematics.".freeze
   s.test_files = ["tests/cantor_pairing_function_test.rb".freeze, "tests/continued_fraction_test.rb".freeze, "tests/distribution_test.rb".freeze, "tests/entropy_test.rb".freeze, "tests/functions_test.rb".freeze, "tests/histogram_test.rb".freeze, "tests/newton_bisection_test.rb".freeze, "tests/numberify_string_function_test.rb".freeze, "tests/permutation_test.rb".freeze, "tests/sequence_moving_average_test.rb".freeze, "tests/sequence_test.rb".freeze, "tests/string_numeral_test.rb".freeze, "tests/subset_test.rb".freeze, "tests/test_helper.rb".freeze]
 

data/tests/sequence_test.rb

@@ -126,8 +126,8 @@ class SequenceTest < Test::Unit::TestCase
       3, 94, 5, 79, 11, 16, 0, 90, 81, 42, 64, 76, 92, 25,
       3, 90, 51, 15, 0, 74, 98, 93, 90, 14, 81, 85, 28, 30,
       73, 32, 88])
-    @rand_up = Sequence.new(Array.new(rand.size) { |i| rand[i] * (1 - 4.0 / (i + 1)) })
-    @rand_down = Sequence.new(Array.new(rand.size) { |i| rand[i] * (1 + 4.0 / (i + 1)) })
+    @rand_up = Sequence.new(Array.new(rand.size) { |i| rand[i] + 10 * i })
+    @rand_down = Sequence.new(Array.new(rand.size) { |i| rand[i] - 10 * i })
     @rasi = Sequence.new(
       [ 0.0, 11.7813239550446, 23.8742291678261, 0.368124552684678,
       20.233654312272, 7.64120827980215, 61.609239533582, 69.346191849821,
@@ -186,7 +186,8 @@ class SequenceTest < Test::Unit::TestCase
     assert_in_delta 0.3, @flat.median, 1E-8
     assert_in_delta 0.3, @flat.percentile(75), 1E-8
     assert_equal 100, @flat.histogram(10).each_bin.first.count
-    assert @flat.linear_regression.residues.all? { |r| r.abs <= 1E-6 }
+    assert @flat.linear_regression.residuals.all? { |r| r.abs <= 1E-6 }
+    assert_in_delta 0.0, @flat.linear_regression.r2, 1E-8
   end
 
   def test_half
@@ -207,7 +208,8 @@ class SequenceTest < Test::Unit::TestCase
     assert_in_delta 37.375, @half.percentile(75), 1E-8
     assert_equal [10] * 10, counts = @half.histogram(10).counts
     assert_equal 100, counts.inject { |s, x| s + x }
-    assert @half.linear_regression.residues.all? { |r| r.abs <= 0.5 }
+    assert @half.linear_regression.residuals.all? { |r| r.abs <= 0.5 }
+    assert_in_delta 1.0, @half.linear_regression.r2, 1E-8
   end
 
   def test_rand
@@ -227,13 +229,15 @@ class SequenceTest < Test::Unit::TestCase
     assert_in_delta 50.0, @rand.median, 1E-8
     assert_in_delta 81, @rand.percentile(75), 1E-8
     assert_in_delta 0.05660, @rand.linear_regression.a, 1E-4
-    assert_in_delta 47.9812, @rand.linear_regression.b, 1E-4
+    assert_in_delta 48.0378, @rand.linear_regression.b, 1E-4
     assert @rand.linear_regression.slope_zero?
-    assert_in_delta(-0.4019, @rand_down.linear_regression.a, 1E-4)
-    assert_in_delta 82.7303, @rand_down.linear_regression.b, 1E-4
+    assert_in_delta(-9.9433, @rand_down.linear_regression.a, 1E-4)
+    assert_in_delta 48.0378, @rand_down.linear_regression.b, 1E-4
+    assert_in_delta 0.9883, @rand_down.linear_regression.r2, 1E-4
     assert !@rand_down.linear_regression.slope_zero?
-    assert_in_delta 0.5151, @rand_up.linear_regression.a, 1E-4
-    assert_in_delta(13.2320, @rand_up.linear_regression.b, 1E-4)
+    assert_in_delta 10.0566, @rand_up.linear_regression.a, 1E-4
+    assert_in_delta 48.0378, @rand_up.linear_regression.b, 1E-4
+    assert_in_delta 0.98857, @rand_up.linear_regression.r2, 1E-4
     assert !@rand_up.linear_regression.slope_zero?
     assert_nil @rand.detect_outliers
     assert !@rand.detect_autocorrelation[:detected]
@@ -258,7 +262,8 @@ class SequenceTest < Test::Unit::TestCase
     assert_in_delta 0.0, @rasi.median, 1E-2
     assert_in_delta 30.58, @rasi.percentile(75), 1E-2
     assert_in_delta(-0.41, @rasi.linear_regression.a, 1E-2)
-    assert_in_delta(24.35, @rasi.linear_regression.b, 1E-2)
+    assert_in_delta(23.94, @rasi.linear_regression.b, 1E-2)
+    assert_in_delta 0.0887, @rasi.linear_regression.r2, 1E-4
     assert !@rasi.linear_regression.slope_zero?
     assert_equal 13, @rasi.detect_outliers[:high]
     assert @rasi.detect_autocorrelation[:detected]
@@ -284,8 +289,9 @@ class SequenceTest < Test::Unit::TestCase
     assert_in_delta 51.5, @book.median, 1E-2
     assert_in_delta 58.25, @book.percentile(75), 1E-2
     assert_in_delta(-0.0952, @book.linear_regression.a, 1E-4)
-    assert_in_delta(54.6372, @book.linear_regression.b, 1E-4)
+    assert_in_delta(54.5420, @book.linear_regression.b, 1E-4)
     assert @book.linear_regression.slope_zero?
+    assert_in_delta 0.0249, @book.linear_regression.r2, 1E-4
     assert_equal 7, @book.detect_outliers[:high]
     ought = [1.0, -0.39, 0.3, -0.17, 0.07, -0.10, 0.05, 0.04, -0.04, -0.01,
       0.01, 0.11, -0.07, 0.15, 0.04, -0.01
@@ -297,7 +303,7 @@ class SequenceTest < Test::Unit::TestCase
     assert_equal [3, 4, 9, 12, 18, 14, 4, 5, 0, 1],
       counts = @book.histogram(10).counts
     assert_equal 70, counts.inject { |s, x| s + x }
-    assert @flat.linear_regression.residues.all? { |r| r.abs <= 1E-6 }
+    assert @flat.linear_regression.residuals.all? { |r| r.abs <= 1E-6 }
   end
 
   def test_cover

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: more_math
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -204,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library that provides more mathematics.