statsample 0.6.5 → 0.6.7

data/History.txt

@@ -1,4 +1,19 @@
+=== 0.6.7 / 2010-03-23
+* Bug fix: dependency on Reportbuilder should be set to "~>0.2.0", not "0.2"
+=== 0.6.6 / 2010-03-22
+* Set ReportBuilder dependency to '0.2.~' version, because future API break
+* Removed Alglib dependency
+* Factor::PrincipalAxis and Factor::PCA reworked
+* Standarization of documentation on almost every file
+* New Statsample::Test::Levene, to test equality of variances
+* Constant HAS_GSL replaced by Statsample.has_gsl?
+* PCA and Principal Axis test based on R and SPSS results
+* Bug fix on test_dataset.rb / test_saveload
+* Added Rakefile
+* Demos for levene, Principal Axis
+
 === 0.6.5 / 2010-02-24
+
 * Bug fix on test: Use tempfile instead of tempdir
 * Multiple Regression: Calculation of constant standard error , using covariance matrix.
 * Calculation of R^2_yx and P^2_yx for Regresion on Multiple Dependents variables

data/Manifest.txt

@@ -2,6 +2,7 @@ History.txt
 LICENSE.txt
 Manifest.txt
 README.txt
+Rakefile
 bin/statsample
 data/crime.txt
 data/locale/es/LC_MESSAGES/statsample.mo
@@ -12,9 +13,11 @@ data/tetmat_test.txt
 demo/correlation_matrix.rb
 demo/dominance_analysis_bootstrap.rb
 demo/dominanceanalysis.rb
+demo/levene.rb
 demo/multiple_regression.rb
 demo/multivariate_correlation.rb
 demo/polychoric.rb
+demo/principal_axis.rb
 demo/tetrachoric.rb
 lib/distribution.rb
 lib/distribution/chisquare.rb
@@ -71,8 +74,10 @@ lib/statsample/reliability.rb
 lib/statsample/resample.rb
 lib/statsample/srs.rb
 lib/statsample/test.rb
+lib/statsample/test/levene.rb
 lib/statsample/test/umannwhitney.rb
 lib/statsample/vector.rb
+po/es/statsample.mo
 po/es/statsample.po
 po/statsample.pot
 setup.rb
@@ -100,6 +105,7 @@ test/test_reliability.rb
 test/test_resample.rb
 test/test_srs.rb
 test/test_statistics.rb
+test/test_stest.rb
 test/test_stratified.rb
 test/test_svg_graph.rb
 test/test_umannwhitney.rb

data/README.txt

@@ -10,25 +10,43 @@ A suite for basic and advanced statistics on Ruby. Tested on Ruby 1.8.7, Ruby 1.
 Includes:
 * Descriptive statistics: frequencies, median, mean, standard error, skew, kurtosis (and many others).
 * Imports and exports datasets from and to Excel, CSV and plain text files.
-* Correlations: Pearson (r), Rho, Tetrachoric, Polychoric
-* Regression: Simple, Multiple, Probit and Logit
+* Correlations: Pearson's r, Spearman's rank correlation (rho), Tetrachoric, Polychoric
+* Regression: Simple, Multiple, Probit  and Logit
 * Factorial Analysis: Extraction (PCA and Principal Axis) and Rotation (Varimax and relatives)
 * Dominance Analysis, with multivariate dependent and bootstrap (Azen & Budescu)
 * Sample calculation related formulas
 
 == FEATURES:
 
-* Factorial Analysis. Principal Component Analysis and Principal Axis extraction, with orthogonal rotations (Varimax, Equimax, Quartimax)
-* Multiple Regression. Listwise analysis optimized with use of Alglib library. Pairwise analysis is executed on pure ruby with matrixes and reports same values as SPSS
-* Module Bivariate provides covariance and pearson, spearman, point biserial, tau a, tau b, gamma, tetrachoric and polychoric correlation correlations. Include methods to create correlation (pearson and tetrachoric) and covariance matrices
-* Regression module provides linear regression methods
-* Dominance Analysis. Based on Budescu and Azen papers, <strong>DominanceAnalysis</strong> class can report dominance analysis for a sample, using uni or multivariate dependent variables and <strong>DominanceAnalysisBootstrap</strong> can execute bootstrap analysis to determine dominance stability, as recomended by  Azen & Budescu (2003) link[http://psycnet.apa.org/journals/met/8/2/129/]. 
-* Classes for Vector, Datasets (set of Vectors) and Multisets (multiple datasets with same fields and type of vectors), and multiple methods to manipulate them
-* Module Codification, to help to codify open questions
-* Converters to and from database and csv files, and to output Mx and GGobi files
-* Module Crosstab provides function to create crosstab for categorical data
+* Classes for manipulation and storage of data:
+  * Statsample::Vector: An extension of an array, with statistical methods like sum, mean and standard deviation
+  * Statsample::Dataset: a group of Statsample::Vector, analog to a excel spreadsheet or a dataframe on R. The base of almost all operations on statsample. 
+  * Statsample::Multiset: multiple datasets with same fields and type of vectors
+* Module Statsample::Bivariate provides covariance and pearson, spearman, point biserial, tau a, tau b, gamma, tetrachoric (see Bivariate::Tetrachoric) and polychoric (see Bivariate::Polychoric) correlations. Include methods to create correlation and covariance matrices
+* Multiple types of regression.
+  * Simple Regression :  Statsample::Regression::Simple
+  * Multiple Regression: Statsample::Regression::Multiple
+  * Logit Regression:    Statsample::Regression::Binomial::Logit
+  * Probit Regression:    Statsample::Regression::Binomial::Probit
+* Factorial Analysis algorithms on Statsample::Factor module.
+  * Classes for Extraction of factors: 
+    * Statsample::Factor::PCA
+    * Statsample::Factor::PrincipalAxis
+  * Classes for Rotation of factors: 
+    * Statsample::Factor::Varimax
+    * Statsample::Factor::Equimax
+    * Statsample::Factor::Quartimax
+* Dominance Analysis. Based on Budescu and Azen papers, Statsample::DominanceAnalysis class can report dominance analysis for a sample, using uni or multivariate dependent variables and DominanceAnalysisBootstrap can execute bootstrap analysis to determine dominance stability, as recomended by  Azen & Budescu (2003) link[http://psycnet.apa.org/journals/met/8/2/129/]. 
+* Module Statsample::Codification, to help to codify open questions
+* Converters to import and export data:
+  * Statsample::Database : Can create sql to create tables, read and insert data
+  * Statsample::CSV : Read and write CSV files
+  * Statsample::Excel : Read and write Excel files
+  * Statsample::Mx    : Write Mx Files
+  * Statsample::GGobi : Write Ggobi files
+* Module Statsample::Crosstab provides function to create crosstab for categorical data
 * Reliability analysis provides functions to analyze scales. Class ItemAnalysis provides statistics like mean, standard deviation for a scale, Cronbach's alpha and standarized Cronbach's alpha, and for each item: mean, correlation with total scale, mean if deleted, Cronbach's alpha is deleted. With HtmlReport, graph the histogram of the scale and the Item Characteristic Curve for each item
-* Module SRS (Simple Random Sampling) provides a lot of functions to estimate standard error for several type of samples
+* Module Statsample::SRS (Simple Random Sampling) provides a lot of functions to estimate standard error for several type of samples
 * Interfaces to gdchart, gnuplot and SVG::Graph 
 
 

data/Rakefile

@@ -0,0 +1,91 @@
+#!/usr/bin/ruby
+# -*- ruby -*-
+# -*- coding: utf-8 -*-
+
+require 'rubygems'
+require 'hoe'
+require './lib/statsample'
+
+
+
+
+
+if File.exists? './local_rakefile.rb'
+	require './local_rakefile'
+end
+
+desc "Ruby Lint"
+task :lint do
+  executable=Config::CONFIG['RUBY_INSTALL_NAME']
+  Dir.glob("lib/**/*.rb") {|f|
+    if !system %{#{executable} -w -c "#{f}"} 
+        puts "Error on: #{f}"
+    end
+  }
+end
+
+
+desc "Update pot/po files."
+task :updatepo do
+  require 'gettext/tools'
+  GetText.update_pofiles("statsample", Dir.glob("{lib,bin}/**/*.{rb,rhtml}"), "statsample #{Statsample::VERSION}")
+end
+
+desc "Create mo-files"
+task :makemo do
+  require 'gettext/tools'
+  GetText.create_mofiles()
+  # GetText.create_mofiles(true, "po", "locale")  # This is for "Ruby on Rails".
+end
+
+h=Hoe.spec('statsample') do 
+	self.version=Statsample::VERSION
+	self.rubyforge_name = "ruby-statsample"
+	self.developer('Claudio Bustos', 'clbustos@gmail.com')
+	self.extra_deps << ["spreadsheet","~>0.6.0"] << ["svg-graph", "~>1.0"] << ["reportbuilder", "~>0.2.0"] << ["minimization", "~>0.1.0"]
+	self.clean_globs << "test/images/*" << "demo/item_analysis/*" << "demo/Regression"
+	self.need_rdoc=false
+end
+
+Rake::RDocTask.new(:docs) do |rd|
+  rd.main = h.readme_file
+  rd.options << '-d' if (`which dot` =~ /\/dot/) unless
+    ENV['NODOT'] || Hoe::WINDOZE
+  rd.rdoc_dir = 'doc'
+  
+  rd.rdoc_files.include("lib/**/*.rb")
+  rd.rdoc_files += h.spec.extra_rdoc_files
+  rd.rdoc_files.reject! {|f| f=="Manifest.txt"}
+  title = h.spec.rdoc_options.grep(/^(-t|--title)=?$/).first
+  if title then
+    rd.options << title
+  
+    unless title =~ /\=/ then # for ['-t', 'title here']
+    title_index = spec.rdoc_options.index(title)
+    rd.options << spec.rdoc_options[title_index + 1]
+    end
+  else
+    title = "#{h.name}-#{h.version} Documentation"
+    title = "#{h.rubyforge_name}'s " + title if h.rubyforge_name != h.name
+    rd.options << '--title' << title
+  end
+end
+
+
+desc 'publicar a rdocs con analytics'
+task :publicar_docs => [:clean, :docs] do
+  ruby %{agregar_adsense_a_doc.rb}
+  path = File.expand_path("~/.rubyforge/user-config.yml")
+  config = YAML.load(File.read(path))
+  host = "#{config["username"]}@rubyforge.org"
+  
+  remote_dir = "/var/www/gforge-projects/#{h.rubyforge_name}/#{h.remote_rdoc_dir
+  }"
+  local_dir = h.local_rdoc_dir
+  Dir.glob(local_dir+"/**/*") {|file|
+    sh %{chmod 755 #{file}}
+  }
+  sh %{rsync #{h.rsync_args} #{local_dir}/ #{host}:#{remote_dir}}
+end
+    
+# vim: syntax=Ruby

data/demo/levene.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__)+'/../lib/')
+
+require 'statsample'
+a=[1,2,3,4,5,6,7,8,100,10].to_scale
+b=[30,40,50,60,70,80,90,100,110,120].to_scale
+
+levene=Statsample::Test::Levene.new([a,b])
+puts levene.summary

data/demo/multiple_regression.rb

@@ -17,7 +17,7 @@ Benchmark.bm(7) do |x|
 
 rb=ReportBuilder.new("Multiple Regression Engines")
 
-if HAS_GSL
+if Statsample.has_gsl?
   x.report("GSL:") {
   lr=Statsample::Regression::Multiple::GslEngine.new(ds,'y',:name=>"Multiple Regression using GSL")
   rb.add(lr.summary)
@@ -25,12 +25,6 @@ if HAS_GSL
 end
 
 
-if HAS_ALGIB
-  x.report("Alglib:") {
-  lr=Statsample::Regression::Multiple::AlglibEngine.new(ds,'y', :name=>"Multiple Regression using Alglib")
-  rb.add(lr.summary)
-  }
-end
   x.report("Ruby:") {
   lr=Statsample::Regression::Multiple::RubyEngine.new(ds,'y',:name=>"Multiple Regression using RubyEngine")
   rb.add(lr.summary)

data/demo/polychoric.rb

@@ -6,6 +6,7 @@ ct=Matrix[[58,52,1],[26,58,3],[8,12,9]]
 
 # Estimation of polychoric correlation using two-step (default)
 poly=Statsample::Bivariate::Polychoric.new(ct, :name=>"Polychoric with two-step", :debug=>true)
+
 puts poly.summary
 
 # Estimation of polychoric correlation using joint method (slow)

data/demo/principal_axis.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+$:.unshift(File.dirname(__FILE__)+'/../lib/')
+
+require 'statsample'
+matrix=Matrix[
+[1.0, 0.709501601093587, 0.877596585880047, 0.272219316266807],  [0.709501601093587, 1.0, 0.291633797330304, 0.871141831433844], [0.877596585880047, 0.291633797330304, 1.0, -0.213373722977167], [0.272219316266807, 0.871141831433844, -0.213373722977167, 1.0]]
+fa=Statsample::Factor::PrincipalAxis.new(matrix,:m=>1,:smc=>false)
+puts fa.summary

data/lib/distribution/f.rb

@@ -1,25 +1,25 @@
 module Distribution
-    # Calculate cdf and inverse cdf for Fisher Distribution.
-    # Uses Statistics2 module
-    module F
-        class << self
-            # Return the P-value of the corresponding integral with 
-            # k degrees of freedom
-            #
-            #   Distribution::F.p_value(0.95,1,2)
-            def p_value(pr,k1,k2)
-                Statistics2.pfdist(k1,k2, pr)
-            end
-            # F cumulative distribution function (cdf).
-            # 
-            # Returns the integral of F-distribution 
-            # with k1 and k2 degrees of freedom
-            # over [0, x].
-            #   Distribution::F.cdf(20,3,2)
-            # 
-            def cdf(x, k1, k2)
-                Statistics2.fdist(k1, k2,x)
-            end
-        end
+  # Calculate cdf and inverse cdf for Fisher Distribution.
+  # Uses Statistics2 module
+  module F
+    class << self
+      # Return the P-value of the corresponding integral with 
+      # k degrees of freedom
+      #
+      #   Distribution::F.p_value(0.95,1,2)
+      def p_value(pr,k1,k2)
+        Statistics2.pfdist(k1,k2, pr)
+      end
+      # F cumulative distribution function (cdf).
+      # 
+      # Returns the integral of F-distribution 
+      # with k1 and k2 degrees of freedom
+      # over [0, x].
+      #   Distribution::F.cdf(20,3,2)
+      # 
+      def cdf(x, k1, k2)
+        Statistics2.fdist(k1, k2,x)
+      end
     end
+  end
 end

data/lib/spss.rb

@@ -7,114 +7,114 @@
 # Claudio Bustos mailto:clbustos@gmail.com
 
 module SPSS # :nodoc: all
-    module Dictionary
-        class Element
-            def add(a)
-                @elements.push(a)
-            end
-            def parse_elements(func=:to_s)
-                @elements.collect{|e| "   "+e.send(func)}.join("\n")
-            end
-            def init_with config
-                config.each {|key,value|
-                    self.send(key.to_s+"=",value) if methods.include? key.to_s
-                }
-            end
-            def initialize(config={})
-                @config=config
-                @elements=[]
-            end
-        end
-        class Dictionary < Element
-            attr_accessor :locale, :date_time, :row_count
-            def initialize(config={})
-                super
-                init_with ({
-                        :locale=>"en_US", 
-                        :date_time=>Time.new().strftime("%Y-%m-%dT%H:%M:%S"),
-                        :row_count=>1
-                })
-                init_with config
-            end
-            
-            def to_xml
-                "<dictionary locale='#{@locale}' creationDateTime='#{@date_time}' rowCount='#{@row_count}' xmlns='http://xml.spss.com/spss/data'>\n"+parse_elements(:to_xml)+"\n</dictionary>"
-                
-            end
-            def to_spss
-                parse_elements(:to_spss)
-            end
-        end
+  module Dictionary
+    class Element
+      def add(a)
+        @elements.push(a)
+      end
+      def parse_elements(func=:to_s)
+        @elements.collect{|e| "   "+e.send(func)}.join("\n")
+      end
+      def init_with config
+        config.each {|key,value|
+            self.send(key.to_s+"=",value) if methods.include? key.to_s
+        }
+      end
+      def initialize(config={})
+        @config=config
+        @elements=[]
+      end
+    end
+    class Dictionary < Element
+      attr_accessor :locale, :date_time, :row_count
+      def initialize(config={})
+        super
+        init_with ({
+                :locale=>"en_US", 
+                :date_time=>Time.new().strftime("%Y-%m-%dT%H:%M:%S"),
+                :row_count=>1
+        })
+        init_with config
+      end
+      
+      def to_xml
+        "<dictionary locale='#{@locale}' creationDateTime='#{@date_time}' rowCount='#{@row_count}' xmlns='http://xml.spss.com/spss/data'>\n"+parse_elements(:to_xml)+"\n</dictionary>"
         
-        class MissingValue < Element
-            attr_accessor :data, :type, :from, :to
-            def initialize(data,type=nil)
-                @data=data
-                if type.nil? or type=="lowerBound" or type=="upperBound"
-                    @type=type
-                else
-                    raise Exception,"Incorrect value for type"
-                end
-            end
-            def to_xml
-                "<missingValue data='#{@data}' "+(type.nil? ? "":"type='#{type}'")+"/>"
-            end
-        end
-        class LabelSet
-            attr_accessor
-            def initialize(labels)
-                @labels=labels
-            end
-            def parse_xml(name)
-                "<valueLabelSet>\n   "+@labels.collect{|key,value| "<valueLabel label='#{key}' value='#{value}' />"}.join("\n   ")+"\n   <valueLabelVariable name='#{name}' />\n</valueLabelSet>"
-            end
-            def parse_spss()
-                @labels.collect{|key,value| "#{key} '#{value}'"}.join("\n   ")
-            end
+      end
+      def to_spss
+        parse_elements(:to_spss)
+      end
+    end
+    
+    class MissingValue < Element
+      attr_accessor :data, :type, :from, :to
+      def initialize(data,type=nil)
+        @data=data
+        if type.nil? or type=="lowerBound" or type=="upperBound"
+            @type=type
+        else
+            raise Exception,"Incorrect value for type"
         end
-        class Variable < Element
-            attr_accessor :aligment, :display_width, :label, :measurement_level, :name, :type, :decimals, :width, :type_format, :labelset, :missing_values
-            def initialize(config={})
-                super
-                @@var_number||=1
-                init_with({
-                        :aligment           =>  "left",
-                        :display_width      =>  8,
-                        :label              =>  "Variable #{@@var_number}",
-                        :measurement_level  =>  "SCALE",
-                        :name               =>  "var#{@@var_number}",
-                        :type               =>  0,
-                        :decimals           =>  2,
-                        :width              =>  10,
-                        :type_format        =>  "F",
-                        :labelset           => nil
-                })
-                init_with config
-                @missing_values=[]
-                @@var_number+=1
-            end
-            def to_xml
-                labelset_s=(@labelset.nil?) ? "":"\n"+@labelset.parse_xml(@name)
-                missing_values=(@missing_values.size>0) ? @missing_values.collect {|m| m.to_xml}.join("\n"):""
-                "<variable aligment='#{@aligment}' displayWidth='#{@display_width}' label='#{@label}' measurementLevel='#{@measurement_level}' name='#{@name}' type='#{@type}'>\n<variableFormat decimals='#{@decimals}' width='#{@width}' type='#{@type_format}' />\n"+parse_elements(:to_xml)+missing_values+"</variable>"+labelset_s
-            end
-            def to_spss
-                out=<<HERE
+      end
+      def to_xml
+        "<missingValue data='#{@data}' "+(type.nil? ? "":"type='#{type}'")+"/>"
+      end
+    end
+    class LabelSet
+      attr_accessor
+      def initialize(labels)
+        @labels=labels
+      end
+      def parse_xml(name)
+        "<valueLabelSet>\n   "+@labels.collect{|key,value| "<valueLabel label='#{key}' value='#{value}' />"}.join("\n   ")+"\n   <valueLabelVariable name='#{name}' />\n</valueLabelSet>"
+      end
+      def parse_spss()
+        @labels.collect{|key,value| "#{key} '#{value}'"}.join("\n   ")
+      end
+    end
+    class Variable < Element
+      attr_accessor :aligment, :display_width, :label, :measurement_level, :name, :type, :decimals, :width, :type_format, :labelset, :missing_values
+      def initialize(config={})
+        super
+        @@var_number||=1
+        init_with({
+          :aligment           =>  "left",
+          :display_width      =>  8,
+          :label              =>  "Variable #{@@var_number}",
+          :measurement_level  =>  "SCALE",
+          :name               =>  "var#{@@var_number}",
+          :type               =>  0,
+          :decimals           =>  2,
+          :width              =>  10,
+          :type_format        =>  "F",
+          :labelset           => nil
+        })
+        init_with config
+        @missing_values=[]
+        @@var_number+=1
+      end
+      def to_xml
+        labelset_s=(@labelset.nil?) ? "":"\n"+@labelset.parse_xml(@name)
+        missing_values=(@missing_values.size>0) ? @missing_values.collect {|m| m.to_xml}.join("\n"):""
+        "<variable aligment='#{@aligment}' displayWidth='#{@display_width}' label='#{@label}' measurementLevel='#{@measurement_level}' name='#{@name}' type='#{@type}'>\n<variableFormat decimals='#{@decimals}' width='#{@width}' type='#{@type_format}' />\n"+parse_elements(:to_xml)+missing_values+"</variable>"+labelset_s
+      end
+      def to_spss
+        out=<<HERE
 VARIABLE LABELS #{@name} '#{label}' .
 VARIABLE ALIGMENT #{@name} (#{@aligment.upcase}) .
 VARIABLE WIDTH #{@name} (#{@display_width}) .
 VARIABLE LEVEL #{@name} (#{@measurement_level.upcase}) .
 HERE
-                if !@labelset.nil?
-                    out << "VALUE LABELS #{@name} "+labelset.parse_spss()+" ."
-                end
-                if @missing_values.size>0
-                    out << "MISSING VALUES #{@name} ("+@missing_values.collect{|m| m.data}.join(",")+") ."
-                end
-                out
-            end
+        if !@labelset.nil?
+            out << "VALUE LABELS #{@name} "+labelset.parse_spss()+" ."
+        end
+        if @missing_values.size>0
+            out << "MISSING VALUES #{@name} ("+@missing_values.collect{|m| m.data}.join(",")+") ."
         end
+        out
+      end
     end
+  end
 end
 n=SPSS::Dictionary::Dictionary.new
 ls=SPSS::Dictionary::LabelSet.new({1=>"Si",2=>"No"})

data/lib/statsample/bivariate/polychoric.rb

@@ -22,7 +22,7 @@ module Statsample
         end
       end
     end
-    # == Polychoric correlation.
+    # = Polychoric correlation.
     #
     # The <em>polychoric</em> correlation is a measure of 
     # bivariate association arising when both observed variates
@@ -36,10 +36,33 @@ module Statsample
     # 2. Two-step estimator and 
     # 3. Polychoric series estimate. 
     # 
-    # By default, Two-step estimation are used. You can select 
-    # the estimation method with method attribute
+    # By default, two-step estimation are used. You can select 
+    # the estimation method with method attribute. Joint estimate and polychoric series requires gsl library and rb-gsl.
     #
-    # See extensive documentation on Uebersax(2002) and Drasgow(2006)    
+    # == Use
+    #
+    # You should enter a Matrix with ordered data. For example:
+    #         -------------------
+    #         | y=0 | y=1 | y=2 | 
+    #         -------------------
+    #   x = 0 |  1  |  10 | 20  |
+    #         -------------------
+    #   x = 1 |  20 |  20 | 50  |
+    #         -------------------
+    # 
+    # The code will be
+    #
+    #   matrix=Matrix[[1,10,20],[20,20,50]]
+    #   poly=Statsample::Bivariate::Polychoric.new(matrix, :method=>:joint)
+    #   puts poly.r
+    # 
+    # See extensive documentation on Uebersax(2002) and Drasgow(2006)
+    #
+    # == References 
+    # 
+    # * Uebersax, J.S. (2006). The tetrachoric and polychoric correlation coefficients. Statistical Methods for Rater Agreement web site. 2006. Available at: http://john-uebersax.com/stat/tetra.htm . Accessed February, 11, 2010
+    # * Drasgow F. (2006). Polychoric and polyserial correlations. In Kotz L, Johnson NL (Eds.), Encyclopedia of statistical sciences. Vol. 7 (pp. 69-74). New York: Wiley.
+    
     class Polychoric
       include GetText
       bindtextdomain("statsample")
@@ -86,23 +109,10 @@ module Statsample
       def new_with_vectors(v1,v2)
         Polychoric.new(Crosstab.new(v1,v2).to_matrix)
       end
-      # Calculate Polychoric correlation
-      # You should enter a Matrix with ordered data. For 
-      #         -------------------
-      #         | y=0 | y=1 | y=2 | 
-      #         -------------------
-      #   x = 0 |  1  |  10 | 20  |
-      #         -------------------
-      #   x = 1 |  20 |  20 | 50  |
-      #         -------------------
-      # 
-      # The code will be
-      #
-      #   matrix=Matrix[[1,10,20],[20,20,50]]
-      #   poly=Statsample::Bivariate::Polychoric.new(matrix, :method=>:joint)
-      #   puts poly.r
-      
-      
+      # Params:
+      # * matrix: Contingence table
+      # * opts: Any attribute
+
       def initialize(matrix, opts=Hash.new)
         @matrix=matrix
         @n=matrix.column_size
@@ -309,7 +319,7 @@ module Statsample
       # * Uebersax, J.S. (2006). The tetrachoric and polychoric correlation coefficients. Statistical Methods for Rater Agreement web site. 2006. Available at: http://john-uebersax.com/stat/tetra.htm . Accessed February, 11, 2010
       #
       def compute_two_step_mle_drasgow
-        if HAS_GSL
+        if Statsample.has_gsl?
           compute_two_step_mle_drasgow_gsl
         else
           compute_two_step_mle_drasgow_ruby