statsample 0.6.3 → 0.6.4

data/test/test_dominance_analysis.rb

@@ -0,0 +1,43 @@
+$:.unshift(File.dirname(__FILE__)+'/../lib/')
+require 'statsample'
+require 'test/unit'
+
+class StatsampleCSVTestCase < Test::Unit::TestCase
+  def aatest_dominance_univariate
+    # Example from Budescu (1993)
+    m=Matrix[[1, 0.683, 0.154, 0.460, 0.618],[0.683, 1, -0.050, 0.297, 0.461], [0.154, -0.050, 1, 0.006, 0.262],[0.460, 0.297, 0.006, 1, 0.507],[0.618, 0.461, 0.262, 0.507, 1]]
+    m.extend Statsample::CovariateMatrix
+    m.fields=%w{x1 x2 x3 x4 y}
+    da=Statsample::DominanceAnalysis.new(m,'y')
+    
+    contr_x1={'x2'=>0.003, 'x3'=>0.028, 'x4'=>0.063}
+    contr_x1.each  do |k,v|
+      assert_in_delta(v, da.models_data[['x1']].contributions[k], 0.001)
+    end
+    assert_in_delta(0.052, da.models_data[['x2','x3','x4']].contributions['x1'], 0.001)
+    expected_dominances=[1, 1, 0.5, 0.5, 0,0]
+    expected_g_dominances=[1, 1, 1, 1, 0,0]
+
+    da.pairs.each_with_index do |a,i|
+      assert_equal(expected_dominances[i], da.total_dominance_pairwise(a[0],a[1]))
+      assert_equal(expected_dominances[i], da.conditional_dominance_pairwise(a[0],a[1]))
+      assert_equal(expected_g_dominances[i], da.general_dominance_pairwise(a[0],a[1]))
+    end
+  end    
+  def test_dominance_multivariate
+    m=Matrix[[1.0, -0.19, -0.358, -0.343, 0.359, 0.257], [-0.19, 1.0, 0.26, 0.29, -0.11, -0.11], [-0.358, 0.26, 1.0, 0.54, -0.49, -0.23], [-0.343, 0.29, 0.54, 1.0, -0.22, -0.41], [0.359, -0.11, -0.49, -0.22, 1.0, 0.62], [0.257, -0.11, -0.23, -0.41, 0.62, 1]]
+    m.extend Statsample::CovariateMatrix
+    m.fields=%w{y1 y2 x1 x2 x3 x4}
+    m2=m.submatrix(%w{y1 x1 x2 x3 x4})
+        
+    
+    da=Statsample::DominanceAnalysis.new(m, ['y1','y2'], :cases=>683, :method_association=>:p2yx)
+    
+    contr_x1={'x2'=>0.027, 'x3'=>0.024, 'x4'=>0.017}
+    contr_x1.each  do |k,v|
+      assert_in_delta(v, da.models_data[['x1']].contributions[k], 0.003)
+    end
+    
+    
+  end
+end

data/test/test_matrix.rb

@@ -0,0 +1,52 @@
+$:.unshift(File.dirname(__FILE__)+'/../lib/')
+require 'test/unit'
+require 'statsample'
+
+class StatsampleMatrixTestCase < Test::Unit::TestCase
+        
+    def setup
+    end
+    def test_subindex
+      matrix=Matrix[[1,2,3],[4,5,6],[7,8,9]]
+      assert_equal(5, matrix[1,1])
+      assert_equal(Matrix[[1,2,3]], matrix[0,:*])
+      assert_equal(Matrix[[1],[4],[7]], matrix[:*,0])
+      assert_equal(Matrix[[1,2],[4,5],[7,8]], matrix[:*,0..1])
+      assert_equal(Matrix[[1,2],[4,5]], matrix[0..1,0..1])
+    end
+    def test_sums
+      matrix=Matrix[[1,2,3],[4,5,6],[7,8,9]]
+      assert_equal(6,matrix.row_sum[0])
+      assert_equal(12,matrix.column_sum[0])
+      assert_equal(45,matrix.total_sum)
+      m=matrix.to_gsl
+    end
+    def test_covariate
+      a=Matrix[[1.0, 0.3, 0.2], [0.3, 1.0, 0.5], [0.2, 0.5, 1.0]]
+      a.extend Statsample::CovariateMatrix
+      a.fields=%w{a b c}
+      assert_equal(:correlation, a.type)
+      
+      assert_equal(Matrix[[0.5],[0.3]], a.submatrix(%w{c a}, %w{b}))
+      assert_equal(Matrix[[1.0, 0.2] , [0.2, 1.0]], a.submatrix(%w{c a}))
+      assert_equal(:correlation, a.submatrix(%w{c a}).type)
+      
+      a=Matrix[[20,30,10], [30,60,50], [10,50,50]]
+      
+      a.extend Statsample::CovariateMatrix
+      
+      assert_equal(:covariance, a.type)
+      
+      a=100.times.collect {rand()}.to_scale
+      b=100.times.collect {rand()}.to_scale
+      c=100.times.collect {rand()}.to_scale
+      ds={'a'=>a,'b'=>b,'c'=>c}.to_dataset
+      corr=Statsample::Bivariate.correlation_matrix(ds)
+      real=Statsample::Bivariate.covariance_matrix(ds).correlation
+      corr.row_size.times do |i|
+        corr.column_size.times do |j|
+          assert_in_delta(corr[i,j], real[i,j],1e-15)
+        end
+      end
+    end
+end

data/test/test_regression.rb

@@ -13,141 +13,186 @@ class StatsampleRegressionTestCase < Test::Unit::TestCase
 		assert_in_delta(-0.957, @reg.b,0.001)
 		assert_in_delta(4.248,@reg.standard_error,0.002)
 	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)
-        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)
-        assert_in_delta(0.752,lr.r,0.001)
-        assert_in_delta(0.565,lr.r2,0.001)
-        assert_in_delta(1361.130,lr.ssr,0.001)
-        assert_in_delta(1046.306,lr.sse,0.001)
-        assert_in_delta(3.035,lr.f,0.001)
-        
-    end
+  def test_multiple_dependent
+    complete=Matrix[
+    [1,0.53,0.62,0.19,-0.09,0.08,0.02,-0.12,0.08],
+    [0.53,1,0.61,0.23,0.1,0.18,0.02,-0.1,0.15],
+    [0.62,0.61,1,0.03,0.1,0.12,0.03,-0.06,0.12],
+    [0.19,0.23,0.03,1,-0.02,0.02,0,-0.02,-0.02],
+    [-0.09,0.1,0.1,-0.02,1,0.05,0.06,0.18,0.02],
+    [0.08,0.18,0.12,0.02,0.05,1,0.22,-0.07,0.36],
+    [0.02,0.02,0.03,0,0.06,0.22,1,-0.01,-0.05],
+    [-0.12,-0.1,-0.06,-0.02,0.18,-0.07,-0.01,1,-0.03],
+    [0.08,0.15,0.12,-0.02,0.02,0.36,-0.05,-0.03,1]]
+    complete.extend Statsample::CovariateMatrix
+    complete.fields=%w{adhd cd odd sex age monly mwork mage poverty}
+    
+    lr=Statsample::Regression::Multiple::MultipleDependent.new(complete, %w{adhd cd odd})
+    
+    
+    assert_in_delta(0.197, lr.r2yx,0.001)
+    assert_in_delta(0.197, lr.r2yx_covariance,0.001)
+    assert_in_delta(0.07, lr.p2yx,0.001)
+    
 
+  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)
+    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)
+    assert_in_delta(0.752,lr.r,0.001, "pairwise r")
+    assert_in_delta(0.565,lr.r2,0.001)
+    assert_in_delta(1361.130,lr.ssr,0.001)
+    assert_in_delta(1046.306,lr.sse,0.001)
+    assert_in_delta(3.035,lr.f,0.001)
+      
+  end
 
-    def test_multiple_regression_gsl
-	    if 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)
-        ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
-        lr=Statsample::Regression::Multiple::GslEngine.new(ds,'y')
-        model_test(lr)
-        predicted=[1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
-        c_predicted=lr.predicted
-        predicted.each_index{|i|
-            assert_in_delta(predicted[i],c_predicted[i],0.001)
-        }
-        residuals=[1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
-        c_residuals=lr.residuals
-        residuals.each_index{|i|
-            assert_in_delta(residuals[i],c_residuals[i],0.001)
-        }
-	else
-		puts "Regression::Multiple::GslEngine not tested (no Gsl)"
-	end
+
+  def test_multiple_regression_gsl
+    if 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)
+      ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
+      lr=Statsample::Regression::Multiple::GslEngine.new(ds,'y')
+      model_test(lr,'gsl')
+      predicted=[1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
+      c_predicted=lr.predicted
+      predicted.each_index{|i|
+          assert_in_delta(predicted[i],c_predicted[i],0.001)
+      }
+      residuals=[1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
+      c_residuals=lr.residuals
+      residuals.each_index{|i|
+          assert_in_delta(residuals[i],c_residuals[i],0.001)
+      }
+    else
+      puts "Regression::Multiple::GslEngine not tested (no Gsl)"
     end
+  end
 
 
-    def test_multiple_regression_alglib
-	    if HAS_ALGIB
-        @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)
-        ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
-        lr=Statsample::Regression::Multiple::AlglibEngine.new(ds,'y')
-        model_test(lr)
-        predicted=[1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
-        c_predicted=lr.predicted
-        predicted.each_index{|i|
-            assert_in_delta(predicted[i],c_predicted[i],0.001)
-        }
-        residuals=[1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
-        c_residuals=lr.residuals
-        residuals.each_index{|i|
-            assert_in_delta(residuals[i],c_residuals[i],0.001)
-        }
-	else
-		puts "Regression::Multiple::AlglibEngine not tested (no Alglib)"
-	end
-    end
-    def model_test(lr)
-        assert_in_delta(0.695,lr.coeffs['a'],0.001)
-        assert_in_delta(11.027,lr.constant,0.001)
-        assert_in_delta(1.785,lr.process([1,3,11]),0.001)
-        
-        
-        s_coeffs={'a'=>0.151,'b'=>-0.547,'c'=>0.997}
-        cs_coeefs=lr.standarized_coeffs
-        s_coeffs.each_key{|k|
-            assert_in_delta(s_coeffs[k], cs_coeefs[k],0.001)
-        }
-        assert_in_delta(639.6,lr.sst,0.001)
-        assert_in_delta(583.76,lr.ssr,0.001)
-        assert_in_delta(55.840,lr.sse,0.001)
-        assert_in_delta(0.955,lr.r,0.001)
-        assert_in_delta(0.913,lr.r2,0.001)
-        assert_in_delta(20.908, lr.f,0.001)
-        assert_in_delta(0.001, lr.significance, 0.001)
-        assert_in_delta(0.226,lr.tolerance("a"),0.001)
-        coeffs_se={"a"=>1.171,"b"=>1.129,"c"=>0.072}
-        ccoeffs_se=lr.coeffs_se
-        coeffs_se.each_key{|k|
-            assert_in_delta(coeffs_se[k],ccoeffs_se[k],0.001)
-        }
-        coeffs_t={"a"=>0.594,"b"=>-3.796,"c"=>3.703}
-        ccoeffs_t=lr.coeffs_t
-        coeffs_t.each_key{|k|
-            assert_in_delta(coeffs_t[k], ccoeffs_t[k],0.001)
-        }
-        assert_in_delta(4.559, lr.constant_se,0.001)
-        assert_in_delta(2.419, lr.constant_t,0.001)
+  def test_multiple_regression_alglib
+    if HAS_ALGIB
+      @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)
+      ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
+      lr=Statsample::Regression::Multiple::AlglibEngine.new(ds,'y')
+      model_test(lr,'alglib')
+      predicted=[1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
+      c_predicted=lr.predicted
+      predicted.each_index{|i|
+          assert_in_delta(predicted[i],c_predicted[i],0.001)
+      }
+      residuals=[1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
+      c_residuals=lr.residuals
+      residuals.each_index{|i|
+          assert_in_delta(residuals[i],c_residuals[i],0.001)
+      }
+    else
+    puts "Regression::Multiple::AlglibEngine not tested (no Alglib)"
     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)
-        ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
-        lr=Statsample::Regression::Multiple::RubyEngine.new(ds,'y')
-        model_test(lr)
-        predicted=[nil,1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
-        c_predicted = lr.predicted
-        
-        predicted.each_index{|i|
-            if c_predicted[i].nil?
-                assert(predicted[i].nil?)
-            else
-            assert_in_delta(predicted[i], c_predicted[i], 0.001)
-            end
-        }
-        residuals=[nil,1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
-        c_residuals=lr.residuals
-        residuals.each_index{|i|
-            if c_residuals[i].nil?
-                assert(residuals[i].nil?)
-            else
-                assert_in_delta(residuals[i],c_residuals[i],0.001)
-            end
-        }
+  end
+  def model_test_matrix(lr,name='undefined')
+    
+    stan_coeffs={'a'=>0.151,'b'=>-0.547,'c'=>0.997}
+    unstan_coeffs={'a'=>0.695, 'b'=>-4.286, 'c'=>0.266}
+     
+    unstan_coeffs.each_key{|k|
+      assert_in_delta(unstan_coeffs[k], lr.coeffs[k],0.001,"b coeffs - #{name}")
+    }
+
+   stan_coeffs.each_key{|k|
+     assert_in_delta(stan_coeffs[k], lr.standarized_coeffs[k],0.001, "beta coeffs - #{name}")
+    }
+    
+    assert_in_delta(11.027,lr.constant,0.001)
+    
+    assert_in_delta(0.955,lr.r,0.001)
+    assert_in_delta(0.913,lr.r2,0.001)
+
+    assert_in_delta(20.908, lr.f,0.001)
+    assert_in_delta(0.001, lr.significance, 0.001)
+    assert_in_delta(0.226,lr.tolerance("a"),0.001)
+    
+    coeffs_se={"a"=>1.171,"b"=>1.129,"c"=>0.072}
+
+    
+    
+    ccoeffs_se=lr.coeffs_se
+    coeffs_se.each_key{|k|
+        assert_in_delta(coeffs_se[k],ccoeffs_se[k],0.001)
+    }
+    coeffs_t={"a"=>0.594,"b"=>-3.796,"c"=>3.703}
+    ccoeffs_t=lr.coeffs_t
+    coeffs_t.each_key{|k|
+        assert_in_delta(coeffs_t[k], ccoeffs_t[k],0.001)
+    }
+   
+    assert_in_delta(639.6,lr.sst,0.001)
+    assert_in_delta(583.76,lr.ssr,0.001)
+    assert_in_delta(55.840,lr.sse,0.001)
+    
+  end
+  def model_test(lr,name='undefined')
+    model_test_matrix(lr,name)
+    assert_in_delta(4.559, lr.constant_se,0.001)
+    assert_in_delta(2.419, lr.constant_t,0.001)
+    
+    assert_in_delta(1.785,lr.process([1,3,11]),0.001) 
+  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)
+    ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
+    
+    cor=Statsample::Bivariate.correlation_matrix(ds)
+    lr=Statsample::Regression::Multiple::MatrixEngine.new(cor,'y', :y_mean=>@y.mean, :x_mean=>{'a'=>ds['a'].mean, 'b'=>ds['b'].mean, 'c'=>ds['c'].mean}, :cases=>@a.size, :y_sd=>@y.sd , :x_sd=>{'a' => @a.sd, 'b' => @b.sd, 'c' => @c.sd})
+    
+    model_test_matrix(lr, "correlation matrix")
+    
+    covariance=Statsample::Bivariate.covariance_matrix(ds)
+    lr=Statsample::Regression::Multiple::MatrixEngine.new(covariance,'y', :y_mean=>@y.mean, :x_mean=>{'a'=>ds['a'].mean, 'b'=>ds['b'].mean, 'c'=>ds['c'].mean}, :cases=>@a.size)
+    model_test_matrix(lr , "covariance matrix")
+  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)
+    ds={'a'=>@a,'b'=>@b,'c'=>@c,'y'=>@y}.to_dataset
+    lr=Statsample::Regression::Multiple::RubyEngine.new(ds,'y')
+    model_test(lr, 'rubyengine with missing data')
+    
+    predicted=[nil,1.7857, 6.0989, 3.2433, 7.2908, 4.9667, 10.3428, 8.8158, 10.4717, 23.6639, 25.3198]
+    c_predicted = lr.predicted
+    
+    predicted.each_index do |i|
+      if c_predicted[i].nil?
+        assert(predicted[i].nil?)
+      else
+        assert_in_delta(predicted[i], c_predicted[i], 0.001)
+      end
     end
-    def test_ds_by_exp
-        @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)
-        @d=%w{a  b  c  a  a  c  a   a c  a}.to_vector(:nominal)
-        @y=[3,4,5,6,7,8,9,10,20,30].to_vector(:scale)
-        ds={'a'=>@a,'b'=>@b,'c'=>@c,'d'=>@d,'y'=>@y}.to_dataset
-        #puts Statsample::Regression::Multiple.ds_by_exp(ds,"a+b=y")
-        #puts Statsample::Regression::Multiple.ds_by_exp(ds,"a+b*d=y")
-        #puts Statsample::Regression::Multiple.ds_by_exp(ds,"c+d=y")
+    residuals=[nil,1.2142, -2.0989, 1.7566, -1.29085, 2.033, -2.3428, 0.18414, -0.47177, -3.66395, 4.6801]
+    c_residuals=lr.residuals
+    residuals.each_index do |i|
+      if c_residuals[i].nil?
+        assert(residuals[i].nil?)
+      else
+        assert_in_delta(residuals[i],c_residuals[i],0.001)
+      end
     end
-
+    
+  end
 end

data/test/test_svg_graph.rb

@@ -8,58 +8,58 @@ begin
 	require 'statsample/graph/svggraph'
 class StatsampleSvgGraphTestCase < Test::Unit::TestCase
 
-	def initialize(*args)
-        @image_path=Dir::tmpdir+"/images"
-        FileUtils.mkdir(@image_path) if !File.exists? @image_path 
-		super
-	end
-    def test_histogram
-        if HAS_GSL
-        ar=(1..1000).to_a.collect {|a|
-			rand(10)
-		}.to_vector(:scale)
-        h=ar.histogram([0,2,5,11])
-        file=@image_path+"/svg_histogram_only.svg"
-        graph = Statsample::Graph::SvgHistogram.new({})
-        graph.histogram=h
-        File.open(file,"w") {|f|
-              f.puts(graph.burn)
-        }
-	else
-		puts "Statsample::Graph::SvgHistogram.new not tested (no ruby-gsl)"
-	end
+  def initialize(*args)
+      @image_path=Dir::tmpdir+"/images"
+      FileUtils.mkdir(@image_path) if !File.exists? @image_path 
+  super
+  end
+  def test_histogram
+    if HAS_GSL
+      ar=(1..1000).to_a.collect {|a|
+    rand(10)
+    }.to_vector(:scale)
+      h=ar.histogram([0,2,5,11])
+      file=@image_path+"/svg_histogram_only.svg"
+      graph = Statsample::Graph::SvgHistogram.new({})
+      graph.histogram=h
+      File.open(file,"w") {|f|
+            f.puts(graph.burn)
+      }
+    else
+    puts "Statsample::Graph::SvgHistogram.new not tested (no ruby-gsl)"
     end
-    def test_vector
-		file=@image_path+"/gdchart_bar.jpg"
-		ar=[]
-		(1..1000).each {|a|
-			ar.push(rand(10))
-		}
-		vector=ar.to_vector
-        file=@image_path+"/svggraph_default.svg"
-		vector.svggraph_frequencies(file)
-		file=@image_path+"/svggraph_Bar.svg"
-		vector.svggraph_frequencies(file,800,600,SVG::Graph::Bar,:graph_title=>'Bar')
-		assert(File.exists?(file))
-		file=@image_path+"/svggraph_BarHorizontal.svg"
-		vector.svggraph_frequencies(file,800,600,SVG::Graph::BarHorizontalNoOp,:graph_title=>'Horizontal Bar')
-		assert(File.exists?(file))
-		file=@image_path+"/svggraph_Pie.svg"
-		vector.svggraph_frequencies(file,800,600,SVG::Graph::PieNoOp,:graph_title=>'Pie')
-		assert(File.exists?(file))		
-		vector.type=:scale
-		if HAS_GSL
-		file=@image_path+"/svggraph_histogram.svg"		
-		hist=vector.svggraph_histogram(5)
-		File.open(file,"wb") {|fp|
-            fp.write(hist.burn)
-		}
-		assert(File.exists?(file))
-		else
-		puts "Statsample::Vector#svggraph_histogram.new not tested (no ruby-gsl)"
-
-		end
-	end
+  end
+  def test_vector
+    file=@image_path+"/gdchart_bar.jpg"
+    ar=[]
+    (1..1000).each {|a|
+      ar.push(rand(10))
+    }
+    vector=ar.to_vector
+    file=@image_path+"/svggraph_default.svg"
+    vector.svggraph_frequencies(file)
+    file=@image_path+"/svggraph_Bar.svg"
+    vector.svggraph_frequencies(file,800,600,SVG::Graph::Bar,:graph_title=>'Bar')
+    assert(File.exists?(file))
+    file=@image_path+"/svggraph_BarHorizontal.svg"
+    vector.svggraph_frequencies(file,800,600,SVG::Graph::BarHorizontalNoOp,:graph_title=>'Horizontal Bar')
+    assert(File.exists?(file))
+    file=@image_path+"/svggraph_Pie.svg"
+    vector.svggraph_frequencies(file,800,600,SVG::Graph::PieNoOp,:graph_title=>'Pie')
+    assert(File.exists?(file))		
+    vector.type=:scale
+    if HAS_GSL
+      file=@image_path+"/svggraph_histogram.svg"		
+      hist=vector.svggraph_histogram(5)
+      File.open(file,"wb") {|fp|
+              fp.write(hist.burn)
+      }
+      assert(File.exists?(file))
+      else
+      puts "Statsample::Vector#svggraph_histogram.new not tested (no ruby-gsl)"
+  
+    end
+  end
 end
 rescue LoadError
 	puts "You should install SVG::Graph"