statsample 1.4.3 → 1.5.0

data/test/test_factor.rb

@@ -18,8 +18,8 @@ class StatsampleFactorTestCase < Minitest::Test
     pca = Statsample::Factor::PCA.new(cm, m: 6)
     # puts pca.summary
     # puts pca.feature_matrix
-    exp_eig = [2.985, 0.931, 0.242, 0.194, 0.085, 0.035].to_scale
-    assert_similar_vector(exp_eig, pca.eigenvalues.to_scale, 0.1)
+    exp_eig = [2.985, 0.931, 0.242, 0.194, 0.085, 0.035].to_numeric
+    assert_similar_vector(exp_eig, pca.eigenvalues.to_numeric, 0.1)
     pcs = pca.principal_components(ds)
     k = 6
     comp_matrix = pca.component_matrix
@@ -34,59 +34,61 @@ class StatsampleFactorTestCase < Minitest::Test
   end
 
   def test_principalcomponents_ruby_gsl
-    ran = Distribution::Normal.rng
-
-    #    @r=::Rserve::Connection.new
-
-    samples = 20
-    [3, 5, 7].each {|k|
-      v = {}
-      v['x0'] = samples.times.map { ran.call }.to_scale.centered
-      (1...k).each {|i|
-        v["x#{i}"] = samples.times.map { |ii| ran.call * 0.5 + v["x#{i - 1}"][ii] * 0.5 }.to_scale.centered
-      }
-
-      ds = v.to_dataset
-      cm = ds.covariance_matrix
-      #      @r.assign('ds',ds)
-      #      @r.eval('cm<-cor(ds);sm<-eigen(cm, sym=TRUE);v<-sm$vectors')
-      #      puts "eigenvalues"
-      #      puts @r.eval('v').to_ruby.to_s
-      pca_ruby = Statsample::Factor::PCA.new(cm, m: k, use_gsl: false)
-      pca_gsl = Statsample::Factor::PCA.new(cm, m: k, use_gsl: true)
-      pc_ruby = pca_ruby.principal_components(ds)
-      pc_gsl  = pca_gsl.principal_components(ds)
-      # Test component matrix correlation!
-      cm_ruby = pca_ruby.component_matrix
-      # puts cm_ruby.summary
-      k.times {|i|
-        pc_id = "PC_#{i + 1}"
-        assert_in_delta(pca_ruby.eigenvalues[i], pca_gsl.eigenvalues[i], 1e-10)
-        # Revert gsl component values
-        pc_gsl_data = (pc_gsl[pc_id][0] - pc_ruby[pc_id][0]).abs > 1e-6 ? pc_gsl[pc_id].recode(&:-@) : pc_gsl[pc_id]
-        assert_similar_vector(pc_gsl_data, pc_ruby[pc_id], 1e-6, "PC for #{k} variables")
-        if false
-          k.times {|j| # variable
-            ds_id = "x#{j}"
-            r = Statsample::Bivariate.correlation(ds[ds_id], pc_ruby[pc_id])
-            puts "#{pc_id}-#{ds_id}:#{r}"
-          }
-        end
+    if Statsample.has_gsl?
+      ran = Distribution::Normal.rng
+
+      #    @r=::Rserve::Connection.new
+
+      samples = 20
+      [3, 5, 7].each {|k|
+        v = {}
+        v['x0'] = samples.times.map { ran.call }.to_numeric.centered
+        (1...k).each {|i|
+          v["x#{i}"] = samples.times.map { |ii| ran.call * 0.5 + v["x#{i - 1}"][ii] * 0.5 }.to_numeric.centered
+        }
+
+        ds = v.to_dataset
+        cm = ds.covariance_matrix
+        #      @r.assign('ds',ds)
+        #      @r.eval('cm<-cor(ds);sm<-eigen(cm, sym=TRUE);v<-sm$vectors')
+        #      puts "eigenvalues"
+        #      puts @r.eval('v').to_ruby.to_s
+        pca_ruby = Statsample::Factor::PCA.new(cm, m: k, use_gsl: false)
+        pca_gsl = Statsample::Factor::PCA.new(cm, m: k, use_gsl: true)
+        pc_ruby = pca_ruby.principal_components(ds)
+        pc_gsl  = pca_gsl.principal_components(ds)
+        # Test component matrix correlation!
+        cm_ruby = pca_ruby.component_matrix
+        # puts cm_ruby.summary
+        k.times {|i|
+          pc_id = "PC_#{i + 1}"
+          assert_in_delta(pca_ruby.eigenvalues[i], pca_gsl.eigenvalues[i], 1e-10)
+          # Revert gsl component values
+          pc_gsl_data = (pc_gsl[pc_id][0] - pc_ruby[pc_id][0]).abs > 1e-6 ? pc_gsl[pc_id].recode(&:-@) : pc_gsl[pc_id]
+          assert_similar_vector(pc_gsl_data, pc_ruby[pc_id], 1e-6, "PC for #{k} variables")
+          if false
+            k.times {|j| # variable
+              ds_id = "x#{j}"
+              r = Statsample::Bivariate.correlation(ds[ds_id], pc_ruby[pc_id])
+              puts "#{pc_id}-#{ds_id}:#{r}"
+            }
+          end
+        }
       }
-    }
+    end
     # @r.close
   end
 
   def test_principalcomponents
-    principalcomponents(true)
+    principalcomponents(true) if Statsample.has_gsl?
     principalcomponents(false)
   end
 
   def principalcomponents(gsl)
     ran = Distribution::Normal.rng
     samples = 50
-    x1 = samples.times.map { ran.call }.to_scale
-    x2 = samples.times.map { |i| ran.call * 0.5 + x1[i] * 0.5 }.to_scale
+    x1 = samples.times.map { ran.call }.to_numeric
+    x2 = samples.times.map { |i| ran.call * 0.5 + x1[i] * 0.5 }.to_numeric
     ds = { 'x1' => x1, 'x2' => x2 }.to_dataset
 
     cm = ds.correlation_matrix
@@ -119,9 +121,9 @@ class StatsampleFactorTestCase < Minitest::Test
   end
 
   def test_kmo
-    @v1 = [1, 2, 3, 4, 7, 8, 9, 10, 14, 15, 20, 50, 60, 70].to_scale
-    @v2 = [5, 6, 11, 12, 13, 16, 17, 18, 19, 20, 30, 0, 0, 0].to_scale
-    @v3 = [10, 3, 20, 30, 40, 50, 80, 10, 20, 30, 40, 2, 3, 4].to_scale
+    @v1 = [1, 2, 3, 4, 7, 8, 9, 10, 14, 15, 20, 50, 60, 70].to_numeric
+    @v2 = [5, 6, 11, 12, 13, 16, 17, 18, 19, 20, 30, 0, 0, 0].to_numeric
+    @v3 = [10, 3, 20, 30, 40, 50, 80, 10, 20, 30, 40, 2, 3, 4].to_numeric
     # KMO: 0.490
     ds = { 'v1' => @v1, 'v2' => @v2, 'v3' => @v3 }.to_dataset
     cor = Statsample::Bivariate.correlation_matrix(ds)
@@ -139,11 +141,13 @@ class StatsampleFactorTestCase < Minitest::Test
   end
   # Tested with SPSS and R
   def test_pca
-    a = [2.5, 0.5, 2.2, 1.9, 3.1, 2.3, 2.0, 1.0, 1.5, 1.1].to_scale
-    b = [2.4, 0.7, 2.9, 2.2, 3.0, 2.7, 1.6, 1.1, 1.6, 0.9].to_scale
+
+    a = [2.5, 0.5, 2.2, 1.9, 3.1, 2.3, 2.0, 1.0, 1.5, 1.1].to_numeric
+    b = [2.4, 0.7, 2.9, 2.2, 3.0, 2.7, 1.6, 1.1, 1.6, 0.9].to_numeric
     a.recode! { |c| c - a.mean }
     b.recode! { |c| c - b.mean }
     ds = { 'a' => a, 'b' => b }.to_dataset
+
     cov_matrix = Statsample::Bivariate.covariance_matrix(ds)
     if Statsample.has_gsl?
       pca = Statsample::Factor::PCA.new(cov_matrix, use_gsl: true)
@@ -156,6 +160,8 @@ class StatsampleFactorTestCase < Minitest::Test
   end
 
   def pca_set(pca, _type)
+
+
     expected_eigenvalues = [1.284, 0.0490]
     expected_eigenvalues.each_with_index{|ev, i|
       assert_in_delta(ev, pca.eigenvalues[i], 0.001)

data/test/test_factor_pa.rb

@@ -15,18 +15,18 @@ class StatsampleFactorTestCase < Minitest::Test
       variables = 10
       iterations = 50
       rng = Distribution::Normal.rng
-      f1 = samples.times.collect { rng.call }.to_scale
-      f2 = samples.times.collect { rng.call }.to_scale
+      f1 = samples.times.collect { rng.call }.to_numeric
+      f2 = samples.times.collect { rng.call }.to_numeric
       vectors = {}
       variables.times do |i|
         if i < 5
           vectors["v#{i}"] = samples.times.collect {|nv|
             f1[nv] * 5 + f2[nv] * 2 + rng.call
-          }.to_scale
+          }.to_numeric
         else
           vectors["v#{i}"] = samples.times.collect {|nv|
             f2[nv] * 5 + f1[nv] * 2 + rng.call
-          }.to_scale
+          }.to_numeric
         end
       end
       ds = vectors.to_dataset

data/test/test_ggobi.rb

@@ -2,10 +2,10 @@ require(File.expand_path(File.dirname(__FILE__) + '/helpers_tests.rb'))
 require 'ostruct'
 class StatsampleGGobiTestCase < Minitest::Test
   def setup
-    v1 = ([10.2, 20.3, 10, 20, 30, 40, 30, 20, 30, 40] * 10).to_vector(:scale)
-    @v2 = (%w(a b c a a a b b c d) * 10).to_vector(:nominal)
+    v1 = ([10.2, 20.3, 10, 20, 30, 40, 30, 20, 30, 40] * 10).to_vector(:numeric)
+    @v2 = (%w(a b c a a a b b c d) * 10).to_vector(:object)
     @v2.labels = { 'a' => 'letter a', 'd' => 'letter d' }
-    v3 = ([1, 2, 3, 4, 5, 4, 3, 2, 1, 2] * 10).to_vector(:ordinal)
+    v3 = ([1, 2, 3, 4, 5, 4, 3, 2, 1, 2] * 10).to_vector(:numeric)
     @ds = { 'v1' => v1, 'v2' => @v2, 'v3' => v3 }.to_dataset
   end
 

data/test/test_gsl.rb

@@ -1,9 +1,9 @@
 require(File.expand_path(File.dirname(__FILE__) + '/helpers_tests.rb'))
 class StatsampleGSLTestCase < Minitest::Test
   should_with_gsl 'matrix with gsl' do
-    a = [1, 2, 3, 4, 20].to_vector(:scale)
-    b = [3, 2, 3, 4, 50].to_vector(:scale)
-    c = [6, 2, 3, 4, 3].to_vector(:scale)
+    a = [1, 2, 3, 4, 20].to_vector(:numeric)
+    b = [3, 2, 3, 4, 50].to_vector(:numeric)
+    c = [6, 2, 3, 4, 3].to_vector(:numeric)
     ds = { 'a' => a, 'b' => b, 'c' => c }.to_dataset
     gsl = ds.to_matrix.to_gsl
     assert_equal(5, gsl.size1)

data/test/test_histogram.rb

@@ -75,13 +75,13 @@ class StatsampleHistogramTestCase < Minitest::Test
       assert_equal(min, h.min_val)
     end
     should 'return correct estimated mean' do
-      a = [1.5, 1.5, 1.5, 3.5, 3.5, 3.5].to_scale
+      a = [1.5, 1.5, 1.5, 3.5, 3.5, 3.5].to_numeric
       h = Statsample::Histogram.alloc(5, [0, 5])
       h.increment(a)
       assert_equal(2.5, h.estimated_mean)
     end
     should 'return correct estimated standard deviation' do
-      a = [0.5, 1.5, 1.5, 1.5, 2.5, 3.5, 3.5, 3.5, 4.5].to_scale
+      a = [0.5, 1.5, 1.5, 1.5, 2.5, 3.5, 3.5, 3.5, 4.5].to_numeric
       h = Statsample::Histogram.alloc(5, [0, 5])
       h.increment(a)
       assert_equal(a.sd, h.estimated_standard_deviation)
@@ -100,7 +100,7 @@ class StatsampleHistogramTestCase < Minitest::Test
     end
     should 'not raise exception when all values equal' do
       assert_nothing_raised do
-        a = [5, 5, 5, 5, 5, 5].to_scale
+        a = [5, 5, 5, 5, 5, 5].to_numeric
         h = Statsample::Graph::Histogram.new(a)
         h.to_svg
       end

data/test/test_matrix.rb

@@ -7,8 +7,8 @@ class StatsampleMatrixTestCase < Minitest::Test
     m.fields_y = %w(x1 x2)
     m.name = 'test'
     samples = 100
-    x1 = [1, 2, 3].to_scale
-    x2 = [4, 5, 6].to_scale
+    x1 = [1, 2, 3].to_numeric
+    x2 = [4, 5, 6].to_numeric
     ds = { 'x1' => x1, 'x2' => x2 }.to_dataset
     ds.name = 'test'
     obs = m.to_dataset
@@ -33,9 +33,9 @@ class StatsampleMatrixTestCase < Minitest::Test
 
     assert_equal(:covariance, a._type)
 
-    a = 50.times.collect { rand }.to_scale
-    b = 50.times.collect { rand }.to_scale
-    c = 50.times.collect { rand }.to_scale
+    a = 50.times.collect { rand }.to_numeric
+    b = 50.times.collect { rand }.to_numeric
+    c = 50.times.collect { rand }.to_numeric
     ds = { 'a' => a, 'b' => b, 'c' => c }.to_dataset
     corr = Statsample::Bivariate.correlation_matrix(ds)
     real = Statsample::Bivariate.covariance_matrix(ds).correlation

data/test/test_multiset.rb

@@ -3,8 +3,8 @@ require(File.expand_path(File.dirname(__FILE__) + '/helpers_tests.rb'))
 class StatsampleMultisetTestCase < Minitest::Test
   def setup
     @x = %w(a a a a b b b b).to_vector
-    @y = [1, 2, 3, 4, 5, 6, 7, 8].to_scale
-    @z = [10, 11, 12, 13, 14, 15, 16, 17].to_scale
+    @y = [1, 2, 3, 4, 5, 6, 7, 8].to_numeric
+    @z = [10, 11, 12, 13, 14, 15, 16, 17].to_numeric
     @ds = { 'x' => @x, 'y' => @y, 'z' => @z }.to_dataset
     @ms = @ds.to_multiset_by_split('x')
   end
@@ -44,9 +44,9 @@ class StatsampleMultisetTestCase < Minitest::Test
   end
 
   def test_to_multiset_by_split_one
-    sex = %w(m m m m m f f f f m).to_vector(:nominal)
-    city = %w(London Paris NY London Paris NY London Paris NY Tome).to_vector(:nominal)
-    age = [10, 10, 20, 30, 34, 34, 33, 35, 36, 40].to_vector(:scale)
+    sex = %w(m m m m m f f f f m).to_vector(:object)
+    city = %w(London Paris NY London Paris NY London Paris NY Tome).to_vector(:object)
+    age = [10, 10, 20, 30, 34, 34, 33, 35, 36, 40].to_vector(:numeric)
     ds = { 'sex' => sex, 'city' => city, 'age' => age }.to_dataset
     ms = ds.to_multiset_by_split('sex')
     assert_equal(2, ms.n_datasets)
@@ -58,10 +58,10 @@ class StatsampleMultisetTestCase < Minitest::Test
   end
 
   def test_to_multiset_by_split_multiple
-    sex = %w(m m m m m m m m m m f f f f f f f f f f).to_vector(:nominal)
-    city = %w(London London London Paris Paris London London London Paris Paris London London London Paris Paris London London London Paris Paris).to_vector(:nominal)
-    hair = %w(blonde blonde black black blonde blonde black black blonde blonde black black blonde blonde black black blonde blonde black black).to_vector(:nominal)
-    age = [10, 10, 20, 30, 34, 34, 33, 35, 36, 40, 10, 10, 20, 30, 34, 34, 33, 35, 36, 40].to_vector(:scale)
+    sex = %w(m m m m m m m m m m f f f f f f f f f f).to_vector(:object)
+    city = %w(London London London Paris Paris London London London Paris Paris London London London Paris Paris London London London Paris Paris).to_vector(:object)
+    hair = %w(blonde blonde black black blonde blonde black black blonde blonde black black blonde blonde black black blonde blonde black black).to_vector(:object)
+    age = [10, 10, 20, 30, 34, 34, 33, 35, 36, 40, 10, 10, 20, 30, 34, 34, 33, 35, 36, 40].to_vector(:numeric)
     ds = { 'sex' => sex, 'city' => city, 'hair' => hair, 'age' => age }.to_dataset(%w(sex city hair age))
     ms = ds.to_multiset_by_split('sex', 'city', 'hair')
     assert_equal(8, ms.n_datasets)
@@ -84,8 +84,8 @@ class StatsampleMultisetTestCase < Minitest::Test
   end
 
   def test_stratum_scale
-    boys = { 'test' => [50, 55, 60, 62, 62, 65, 67, 67, 70, 70, 73, 73, 75, 78, 78, 80, 85, 90].to_vector(:scale) }.to_dataset
-    girls = { 'test' => [70, 70, 72, 72, 75, 75, 78, 78, 80, 80, 82, 82, 85, 85, 88, 88, 90, 90].to_vector(:scale) }.to_dataset
+    boys = { 'test' => [50, 55, 60, 62, 62, 65, 67, 67, 70, 70, 73, 73, 75, 78, 78, 80, 85, 90].to_vector(:numeric) }.to_dataset
+    girls = { 'test' => [70, 70, 72, 72, 75, 75, 78, 78, 80, 80, 82, 82, 85, 85, 88, 88, 90, 90].to_vector(:numeric) }.to_dataset
     ms = Statsample::Multiset.new(['test'])
     ms.add_dataset('boys', boys)
     ms.add_dataset('girls', girls)
@@ -106,12 +106,12 @@ class StatsampleMultisetTestCase < Minitest::Test
       'b' => %w(b b b b).to_vector
     }
     ype = {
-      'a' => [1, 2, 3, 4].to_scale,
-      'b' => [5, 6, 7, 8].to_scale
+      'a' => [1, 2, 3, 4].to_numeric,
+      'b' => [5, 6, 7, 8].to_numeric
     }
     zpe = {
-      'a' => [10, 11, 12, 13].to_scale,
-      'b' => [14, 15, 16, 17].to_scale
+      'a' => [10, 11, 12, 13].to_numeric,
+      'b' => [14, 15, 16, 17].to_numeric
     }
     xp, yp, zp = {}, {}, {}
     @ms.each {|k, ds|
@@ -127,9 +127,9 @@ class StatsampleMultisetTestCase < Minitest::Test
   def test_multiset_union_with_block
     r1 = rand
     r2 = rand
-    ye = [1 * r1, 2 * r1, 3 * r1, 4 * r1, 5 * r2, 6 * r2, 7 * r2, 8 * r2].to_scale
+    ye = [1 * r1, 2 * r1, 3 * r1, 4 * r1, 5 * r2, 6 * r2, 7 * r2, 8 * r2].to_numeric
 
-    ze = [10 * r1, 11 * r1, 12 * r1, 13 * r1, 14 * r2, 15 * r2, 16 * r2, 17 * r2].to_scale
+    ze = [10 * r1, 11 * r1, 12 * r1, 13 * r1, 14 * r2, 15 * r2, 16 * r2, 17 * r2].to_numeric
 
     ds2 = @ms.union {|k, ds|
       ds['y'].recode!{|v|
@@ -146,9 +146,9 @@ class StatsampleMultisetTestCase < Minitest::Test
   def test_multiset_union
     r1 = rand
     r2 = rand
-    ye = [1 * r1, 2 * r1, 3 * r1, 4 * r1, 5 * r2, 6 * r2, 7 * r2, 8 * r2].to_scale
+    ye = [1 * r1, 2 * r1, 3 * r1, 4 * r1, 5 * r2, 6 * r2, 7 * r2, 8 * r2].to_numeric
 
-    ze = [10 * r1, 11 * r1, 12 * r1, 13 * r1, 14 * r2, 15 * r2, 16 * r2, 17 * r2].to_scale
+    ze = [10 * r1, 11 * r1, 12 * r1, 13 * r1, 14 * r2, 15 * r2, 16 * r2, 17 * r2].to_numeric
     @ms.each {|k, ds|
       ds['y'].recode!{|v|
         k == 'a' ? v * r1 : v * r2

data/test/test_regression.rb

@@ -3,9 +3,9 @@ require(File.expand_path(File.dirname(__FILE__) + '/helpers_tests.rb'))
 class StatsampleRegressionTestCase < Minitest::Test
   context 'Example with missing data' do
     setup do
-      @x = [0.285714285714286, 0.114285714285714, 0.314285714285714, 0.2, 0.2, 0.228571428571429, 0.2, 0.4, 0.714285714285714, 0.285714285714286, 0.285714285714286, 0.228571428571429, 0.485714285714286, 0.457142857142857, 0.257142857142857, 0.228571428571429, 0.285714285714286, 0.285714285714286, 0.285714285714286, 0.142857142857143, 0.285714285714286, 0.514285714285714, 0.485714285714286, 0.228571428571429, 0.285714285714286, 0.342857142857143, 0.285714285714286, 0.0857142857142857].to_scale
+      @x = [0.285714285714286, 0.114285714285714, 0.314285714285714, 0.2, 0.2, 0.228571428571429, 0.2, 0.4, 0.714285714285714, 0.285714285714286, 0.285714285714286, 0.228571428571429, 0.485714285714286, 0.457142857142857, 0.257142857142857, 0.228571428571429, 0.285714285714286, 0.285714285714286, 0.285714285714286, 0.142857142857143, 0.285714285714286, 0.514285714285714, 0.485714285714286, 0.228571428571429, 0.285714285714286, 0.342857142857143, 0.285714285714286, 0.0857142857142857].to_numeric
 
-      @y = [nil, 0.233333333333333, nil, 0.266666666666667, 0.366666666666667, nil, 0.333333333333333, 0.3, 0.666666666666667, 0.0333333333333333, 0.333333333333333, nil, nil, 0.533333333333333, 0.433333333333333, 0.4, 0.4, 0.5, 0.4, 0.266666666666667, 0.166666666666667, 0.666666666666667, 0.433333333333333, 0.166666666666667, nil, 0.4, 0.366666666666667, nil].to_scale
+      @y = [nil, 0.233333333333333, nil, 0.266666666666667, 0.366666666666667, nil, 0.333333333333333, 0.3, 0.666666666666667, 0.0333333333333333, 0.333333333333333, nil, nil, 0.533333333333333, 0.433333333333333, 0.4, 0.4, 0.5, 0.4, 0.266666666666667, 0.166666666666667, 0.666666666666667, 0.433333333333333, 0.166666666666667, nil, 0.4, 0.366666666666667, nil].to_numeric
       @ds = { 'x' => @x, 'y' => @y }.to_dataset
       @lr = Statsample::Regression::Multiple::RubyEngine.new(@ds, 'y')
     end
@@ -26,10 +26,10 @@ class StatsampleRegressionTestCase < Minitest::Test
 
     a, b = rand, rand
 
-    x1 = samples.times.map { rand }.to_scale
-    x2 = samples.times.map { rand }.to_scale
-    x3 = samples.times.map { |i| x1[i] * (1 + a) + x2[i] * (1 + b) }.to_scale
-    y = samples.times.map { |i| x1[i] + x2[i] + x3[i] + rand }.to_scale
+    x1 = samples.times.map { rand }.to_numeric
+    x2 = samples.times.map { rand }.to_numeric
+    x3 = samples.times.map { |i| x1[i] * (1 + a) + x2[i] * (1 + b) }.to_numeric
+    y = samples.times.map { |i| x1[i] + x2[i] + x3[i] + rand }.to_numeric
 
     ds = { 'x1' => x1, 'x2' => x2, 'x3' => x3, 'y' => y }.to_dataset
 
@@ -38,8 +38,8 @@ class StatsampleRegressionTestCase < Minitest::Test
     }
   end
   def test_parameters
-    @x = [13, 20, 10, 33, 15].to_vector(:scale)
-    @y = [23, 18, 35, 10, 27].to_vector(:scale)
+    @x = [13, 20, 10, 33, 15].to_vector(:numeric)
+    @y = [23, 18, 35, 10, 27].to_vector(:numeric)
     reg = Statsample::Regression::Simple.new_from_vectors(@x, @y)
     _test_simple_regression(reg)
     ds = { 'x' => @x, 'y' => @y }.to_dataset
@@ -57,9 +57,9 @@ class StatsampleRegressionTestCase < Minitest::Test
   end
 
   def test_summaries
-    a = 10.times.map { rand(100) }.to_scale
-    b = 10.times.map { rand(100) }.to_scale
-    y = 10.times.map { rand(100) }.to_scale
+    a = 10.times.map { rand(100) }.to_numeric
+    b = 10.times.map { rand(100) }.to_numeric
+    y = 10.times.map { rand(100) }.to_numeric
     ds = { 'a' => a, 'b' => b, 'y' => y }.to_dataset
     lr = Statsample::Regression::Multiple::RubyEngine.new(ds, 'y')
     assert(lr.summary.size > 0)
@@ -87,10 +87,10 @@ class StatsampleRegressionTestCase < Minitest::Test
   end
 
   def test_multiple_regression_pairwise_2
-    @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, nil, 3, nil, 3].to_vector(:scale)
-    @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4, 2, 2, nil, 6, 2].to_vector(:scale)
-    @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100, nil, 3, 7, nil, 7].to_vector(:scale)
-    @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 30, 40, nil, 50, nil].to_vector(:scale)
+    @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7, 3, nil, 3, nil, 3].to_vector(:numeric)
+    @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4, 2, 2, nil, 6, 2].to_vector(:numeric)
+    @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100, nil, 3, 7, nil, 7].to_vector(:numeric)
+    @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 30, 40, nil, 50, nil].to_vector(:numeric)
     ds = { 'a' => @a, 'b' => @b, 'c' => @c, 'y' => @y }.to_dataset
     lr = Statsample::Regression::Multiple::RubyEngine.new(ds, 'y')
     assert_in_delta(2407.436, lr.sst, 0.001)
@@ -103,10 +103,10 @@ class StatsampleRegressionTestCase < Minitest::Test
 
   def test_multiple_regression_gsl
     if Statsample.has_gsl?
-      @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:scale)
-      @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:scale)
-      @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:scale)
-      @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:scale)
+      @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:numeric)
+      @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:numeric)
+      @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:numeric)
+      @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:numeric)
       ds = { 'a' => @a, 'b' => @b, 'c' => @c, 'y' => @y }.to_dataset
       lr = Statsample::Regression::Multiple::GslEngine.new(ds, 'y')
       assert(lr.summary.size > 0)
@@ -174,10 +174,10 @@ class StatsampleRegressionTestCase < Minitest::Test
   end
 
   def test_regression_matrix
-    @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:scale)
-    @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:scale)
-    @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:scale)
-    @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:scale)
+    @a = [1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:numeric)
+    @b = [3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:numeric)
+    @c = [11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:numeric)
+    @y = [3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:numeric)
     ds = { 'a' => @a, 'b' => @b, 'c' => @c, 'y' => @y }.to_dataset
     cor = Statsample::Bivariate.correlation_matrix(ds)
 
@@ -194,10 +194,10 @@ class StatsampleRegressionTestCase < Minitest::Test
   end
 
   def test_regression_rubyengine
-    @a = [nil, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:scale)
-    @b = [nil, 3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:scale)
-    @c = [nil, 11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:scale)
-    @y = [nil, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:scale)
+    @a = [nil, 1, 3, 2, 4, 3, 5, 4, 6, 5, 7].to_vector(:numeric)
+    @b = [nil, 3, 3, 4, 4, 5, 5, 6, 6, 4, 4].to_vector(:numeric)
+    @c = [nil, 11, 22, 30, 40, 50, 65, 78, 79, 99, 100].to_vector(:numeric)
+    @y = [nil, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30].to_vector(:numeric)
     ds = { 'a' => @a, 'b' => @b, 'c' => @c, 'y' => @y }.to_dataset
     lr = Statsample::Regression::Multiple::RubyEngine.new(ds, 'y')
     assert_equal(11, lr.total_cases)

data/test/test_reliability.rb

@@ -16,9 +16,9 @@ class StatsampleReliabilityTestCase < Minitest::Test
         @samples = 40
         @n_variables = rand(10) + 2
         @ds = Statsample::Dataset.new
-        base = @samples.times.collect { |_a| rand }.to_scale
+        base = @samples.times.collect { |_a| rand }.to_numeric
         @n_variables.times do |i|
-          @ds[i] = base.collect { |v| v + rand }.to_scale
+          @ds[i] = base.collect { |v| v + rand }.to_numeric
         end
 
         @ds.update_valid_data
@@ -67,9 +67,9 @@ class StatsampleReliabilityTestCase < Minitest::Test
         @samples = 100
         @points = rand(10) + 3
         @max_point = (@points - 1) * 3
-        @x1 = @samples.times.map { rand(@points) }.to_scale
-        @x2 = @samples.times.map { rand(@points) }.to_scale
-        @x3 = @samples.times.map { rand(@points) }.to_scale
+        @x1 = @samples.times.map { rand(@points) }.to_numeric
+        @x2 = @samples.times.map { rand(@points) }.to_numeric
+        @x3 = @samples.times.map { rand(@points) }.to_numeric
         @ds = { 'a' => @x1, 'b' => @x2, 'c' => @x3 }.to_dataset
         @icc = Statsample::Reliability::ItemCharacteristicCurve.new(@ds)
       end
@@ -77,11 +77,11 @@ class StatsampleReliabilityTestCase < Minitest::Test
         assert_equal(@ds.vector_sum, @icc.vector_total)
       end
       should 'have a correct different vector_total' do
-        x2 = @samples.times.map { rand(10) }.to_scale
+        x2 = @samples.times.map { rand(10) }.to_numeric
         @icc = Statsample::Reliability::ItemCharacteristicCurve.new(@ds, x2)
         assert_equal(x2, @icc.vector_total)
         assert_raises(ArgumentError) do
-          inc = (@samples + 10).times.map { rand(10) }.to_scale
+          inc = (@samples + 10).times.map { rand(10) }.to_numeric
           @icc = Statsample::Reliability::ItemCharacteristicCurve.new(@ds, inc)
         end
       end
@@ -119,7 +119,7 @@ class StatsampleReliabilityTestCase < Minitest::Test
         h = {}
         @scales.times {|s|
           @items_per_scale.times {|i|
-            h["#{s}_#{i}"] = (size.times.map { (s * 2) + rand }).to_scale
+            h["#{s}_#{i}"] = (size.times.map { (s * 2) + rand }).to_numeric
           }
         }
         @ds = h.to_dataset
@@ -177,10 +177,10 @@ class StatsampleReliabilityTestCase < Minitest::Test
     end
     context Statsample::Reliability::ScaleAnalysis do
       setup do
-        @x1 = [1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 30].to_scale
-        @x2 = [1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 50].to_scale
-        @x3 = [2, 2, 1, 1, 1, 2, 2, 2, 3, 4, 5, 40].to_scale
-        @x4 = [1, 2, 3, 4, 4, 4, 4, 3, 4, 4, 5, 30].to_scale
+        @x1 = [1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 30].to_numeric
+        @x2 = [1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 50].to_numeric
+        @x3 = [2, 2, 1, 1, 1, 2, 2, 2, 3, 4, 5, 40].to_numeric
+        @x4 = [1, 2, 3, 4, 4, 4, 4, 3, 4, 4, 5, 30].to_numeric
         @ds = { 'x1' => @x1, 'x2' => @x2, 'x3' => @x3, 'x4' => @x4 }.to_dataset
         @ia = Statsample::Reliability::ScaleAnalysis.new(@ds)
         @cov_matrix = @ia.cov_m
@@ -188,7 +188,7 @@ class StatsampleReliabilityTestCase < Minitest::Test
       should 'return correct values for item analysis' do
         assert_in_delta(0.980, @ia.alpha, 0.001)
         assert_in_delta(0.999, @ia.alpha_standarized, 0.001)
-        var_mean = 4.times.map { |m| @cov_matrix[m, m] }.to_scale.mean
+        var_mean = 4.times.map { |m| @cov_matrix[m, m] }.to_numeric.mean
         assert_in_delta(var_mean, @ia.variances_mean)
         assert_equal(@x1.mean, @ia.item_statistics['x1'][:mean])
         assert_equal(@x4.mean, @ia.item_statistics['x4'][:mean])
@@ -211,7 +211,7 @@ class StatsampleReliabilityTestCase < Minitest::Test
             end
           }
         }
-        assert_in_delta(covariances.to_scale.mean, @ia.covariances_mean)
+        assert_in_delta(covariances.to_numeric.mean, @ia.covariances_mean)
         assert_in_delta(0.999, @ia.item_total_correlation['x1'], 0.001)
         assert_in_delta(1050.455, @ia.stats_if_deleted['x1'][:variance_sample], 0.001)
       end