statsample 0.6.7 → 0.7.0

data/lib/statsample/factor/pca.rb

@@ -124,20 +124,20 @@ module Factor
       rp.add(self)
       rp.to_text
     end
-    def to_reportbuilder(generator) # :nodoc:
-      anchor=generator.add_toc_entry(_("PCA: ")+name)
-      generator.add_html "<div class='pca'>"+_("PCA")+" #{@name}<a name='#{anchor}'></a>"
+    def report_building(generator) # :nodoc:
+      anchor=generator.toc_entry(_("PCA: ")+name)
+      generator.html "<div class='pca'>"+_("PCA")+" #{@name}<a name='#{anchor}'></a>"
 
-      generator.add_text "Number of factors: #{m}"
+      generator.text "Number of factors: #{m}"
       t=ReportBuilder::Table.new(:name=>_("Communalities"), :header=>["Variable","Initial","Extraction"])
       communalities(m).each_with_index {|com,i|
-        t.add_row([i, 1.0, sprintf("%0.3f", com)])
+        t.row([i, 1.0, sprintf("%0.3f", com)])
       }
       generator.parse_element(t)
       
       t=ReportBuilder::Table.new(:name=>_("Eigenvalues"), :header=>["Variable","Value"])
       eigenvalues.each_with_index {|eigenvalue,i|
-        t.add_row([i, sprintf("%0.3f",eigenvalue)])
+        t.row([i, sprintf("%0.3f",eigenvalue)])
       }
       generator.parse_element(t)
       
@@ -145,11 +145,11 @@ module Factor
       
       i=0
       component_matrix(m).to_a.each do |row|
-        t.add_row([i]+row.collect {|c| sprintf("%0.3f",c)})
+        t.row([i]+row.collect {|c| sprintf("%0.3f",c)})
         i+=1
       end
       generator.parse_element(t)
-      generator.add_html("</div>")
+      generator.html("</div>")
     end
     private :calculate_eigenpairs, :create_centered_ds
   end

data/lib/statsample/factor/principalaxis.rb

@@ -171,23 +171,23 @@ module Factor
       rp.add(self)
       rp.to_text
     end
-    def to_reportbuilder(generator)
+    def report_building(generator)
       iterate if @clean
-      anchor=generator.add_toc_entry(_("Factor Analysis: ")+name)
-      generator.add_html "<div class='pca'>"+_("Factor Analysis")+" #{@name}<a name='#{anchor}'></a>"
+      anchor=generator.toc_entry(_("Factor Analysis: ")+name)
+      generator.html "<div class='pca'>"+_("Factor Analysis")+" #{@name}<a name='#{anchor}'></a>"
      
-      generator.add_text "Number of factors: #{m}"
-      generator.add_text "Iterations: #{@iterations}"
+      generator.text "Number of factors: #{m}"
+      generator.text "Iterations: #{@iterations}"
       
       t=ReportBuilder::Table.new(:name=>_("Communalities"), :header=>["Variable","Initial","Extraction"])
       communalities(m).each_with_index {|com,i|
-        t.add_row([i, sprintf("%0.4f", initial_communalities[i]), sprintf("%0.3f", com)])
+        t.row([i, sprintf("%0.4f", initial_communalities[i]), sprintf("%0.3f", com)])
       }
       generator.parse_element(t)
       
       t=ReportBuilder::Table.new(:name=>_("Eigenvalues"), :header=>["Variable","Value"])
       @initial_eigenvalues.each_with_index {|eigenvalue,i|
-        t.add_row([i, sprintf("%0.3f",eigenvalue)])
+        t.row([i, sprintf("%0.3f",eigenvalue)])
       }
       generator.parse_element(t)
       
@@ -195,11 +195,11 @@ module Factor
       
       i=0
       component_matrix(m).to_a.each do |row|
-        t.add_row([i]+row.collect {|c| sprintf("%0.3f",c)})
+        t.row([i]+row.collect {|c| sprintf("%0.3f",c)})
         i+=1
       end
       generator.parse_element(t)
-      generator.add_html("</div>")
+      generator.html("</div>")
     end
     
     

data/lib/statsample/graph/svggraph.rb

@@ -22,11 +22,16 @@ module Statsample
       :data => data1,
       :title => "Frequencies"
       )
-
-      File.open(file,"w") {|f|
-        f.puts(graph.burn)
-      }
+      if file.respond_to? :write
+        file.write(graph.burn)
+      else
+        File.open(file.to_s,"wb") {|f|
+          f.puts(graph.burn)
+        }
+      end
+      
     end
+    
     def svggraph_histogram(bins, options={})
       check_type :scale
       options={:graph_title=>"Histogram", :show_graph_title=>true,:show_normal=>true, :mean=>self.mean, :sigma=>sdp }.merge! options
@@ -94,18 +99,18 @@ module SVG #:nodoc:
     class BarNoOp < Bar # :nodoc:
       def get_css; SVG::Graph.get_css_standard; end
     end
-    class BarHorizontalNoOp < BarHorizontal
+    class BarHorizontalNoOp < BarHorizontal # :nodoc:
       def get_css; SVG::Graph.get_css_standard; end
     end
 
-    class LineNoOp < Line
+    class LineNoOp < Line # :nodoc:
       def get_css; SVG::Graph.get_css_standard; end
 
     end
-    class PlotNoOp < Plot
+    class PlotNoOp < Plot # :nodoc:
       def get_css; SVG::Graph.get_css_standard; end
     end
-    class PieNoOp < Pie
+    class PieNoOp < Pie # :nodoc:
       def get_css; SVG::Graph.get_css_standard; end
 
     end

data/lib/statsample/histogram.rb

@@ -88,11 +88,11 @@ module Statsample
         raise "Range size should be bin+1" if range.size!=@bin.size+1
         @range=range
       end
-      def to_reportbuilder_text(generator)
-        anchor=generator.add_toc_entry(_("Histogram %s") % [@name])
+      def report_building_text(generator)
+        anchor=generator.toc_entry(_("Histogram %s") % [@name])
         range.each_with_index do |r,i|
           next if i==@bin.size
-          generator.add_text(sprintf("%4.2f : %d", r, @bin[i]))
+          generator.text(sprintf("%4.2f : %d", r, @bin[i]))
         end
       end
     end

data/lib/statsample/matrix.rb

@@ -209,11 +209,11 @@ module Statsample
       matrix.type=type
       matrix
     end
-    def to_reportbuilder(generator)
+    def report_building(generator)
       @name||= (type==:correlation ? "Correlation":"Covariance")+" Matrix"
       t=ReportBuilder::Table.new(:name=>@name, :header=>[""]+fields_y)
       row_size.times {|i|
-        t.add_row([fields_x[i]]+@rows[i].collect {|i1| sprintf("%0.3f",i1).gsub("0.",".")})
+        t.row([fields_x[i]]+@rows[i].collect {|i1| sprintf("%0.3f",i1).gsub("0.",".")})
       }
       generator.parse_element(t)
     end

data/lib/statsample/regression/multiple/baseengine.rb

@@ -160,34 +160,34 @@ module Statsample
           rp.add(self)
           rp.to_text
         end
-        def to_reportbuilder(generator)
-          anchor=generator.add_toc_entry(_("Multiple Regression: ")+@name)
-          generator.add_html "<div class='multiple-regression'>#{@name}<a name='#{anchor}'></a>"
+        def report_building(generator)
+          anchor=generator.toc_entry(_("Multiple Regression: ")+@name)
+          generator.html "<div class='multiple-regression'>#{@name}<a name='#{anchor}'></a>"
           c=coeffs
-          generator.add_text(_("Engine: %s") % self.class)
-          generator.add_text(_("Cases(listwise)=%d(%d)") % [@ds.cases, @ds_valid.cases])
-          generator.add_text("R=#{sprintf('%0.3f',r)}")
-          generator.add_text("R^2=#{sprintf('%0.3f',r2)}")
+          generator.text(_("Engine: %s") % self.class)
+          generator.text(_("Cases(listwise)=%d(%d)") % [@ds.cases, @ds_valid.cases])
+          generator.text("R=#{sprintf('%0.3f',r)}")
+          generator.text("R^2=#{sprintf('%0.3f',r2)}")
           
-          generator.add_text(_("Equation")+"="+ sprintf('%0.3f',constant) +" + "+ @fields.collect {|k| sprintf('%0.3f%s',c[k],k)}.join(' + ') )
+          generator.text(_("Equation")+"="+ sprintf('%0.3f',constant) +" + "+ @fields.collect {|k| sprintf('%0.3f%s',c[k],k)}.join(' + ') )
           
           t=ReportBuilder::Table.new(:name=>"ANOVA", :header=>%w{source ss df ms f s})
-          t.add_row([_("Regression"), sprintf("%0.3f",ssr), df_r, sprintf("%0.3f",msr), sprintf("%0.3f",f), sprintf("%0.3f", significance)])
-          t.add_row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse)])
+          t.row([_("Regression"), sprintf("%0.3f",ssr), df_r, sprintf("%0.3f",msr), sprintf("%0.3f",f), sprintf("%0.3f", significance)])
+          t.row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse)])
   
-          t.add_row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
+          t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
           generator.parse_element(t)
           sc=standarized_coeffs
           cse=coeffs_se
           t=ReportBuilder::Table.new(:name=>"Beta coefficients", :header=>%w{coeff b beta se t}.collect{|field| _(field)} )
           
-            t.add_row([_("Constant"), sprintf("%0.3f", constant), "-", sprintf("%0.3f", constant_se), sprintf("%0.3f", constant_t)])
+            t.row([_("Constant"), sprintf("%0.3f", constant), "-", sprintf("%0.3f", constant_se), sprintf("%0.3f", constant_t)])
           
           @fields.each do |f|
-            t.add_row([f, sprintf("%0.3f", c[f]), sprintf("%0.3f", sc[f]), sprintf("%0.3f", cse[f]), sprintf("%0.3f", c[f].quo(cse[f]))])
+            t.row([f, sprintf("%0.3f", c[f]), sprintf("%0.3f", sc[f]), sprintf("%0.3f", cse[f]), sprintf("%0.3f", c[f].quo(cse[f]))])
           end  
           generator.parse_element(t)
-          generator.add_html("</div>")
+          generator.html("</div>")
         end
         
         

data/lib/statsample/regression/multiple/matrixengine.rb

@@ -194,38 +194,38 @@ class MatrixEngine < BaseEngine
     matrix.collect {|i| Math::sqrt(i) if i>0 }[0,0]
   end
   
-  def to_reportbuilder(generator) # :nodoc:
-    anchor=generator.add_toc_entry(_("Multiple Regression: ")+@name)
-    generator.add_html "<div class='multiple-regression'>#{@name}<a name='#{anchor}'></a>"
+  def report_building(generator) # :nodoc:
+    anchor=generator.toc_entry(_("Multiple Regression: ")+@name)
+    generator.html "<div class='multiple-regression'>#{@name}<a name='#{anchor}'></a>"
     c=coeffs
-    generator.add_text(_("Engine: %s") % self.class)
-    generator.add_text(_("Cases=%d") % [@cases])
-    generator.add_text("R=#{sprintf('%0.3f',r)}")
-    generator.add_text("R^2=#{sprintf('%0.3f',r2)}")
+    generator.text(_("Engine: %s") % self.class)
+    generator.text(_("Cases=%d") % [@cases])
+    generator.text("R=#{sprintf('%0.3f',r)}")
+    generator.text("R^2=#{sprintf('%0.3f',r2)}")
     
-    generator.add_text(_("Equation")+"="+ sprintf('%0.3f',constant) +" + "+ @fields.collect {|k| sprintf('%0.3f%s',c[k],k)}.join(' + ') )
+    generator.text(_("Equation")+"="+ sprintf('%0.3f',constant) +" + "+ @fields.collect {|k| sprintf('%0.3f%s',c[k],k)}.join(' + ') )
     
     t=ReportBuilder::Table.new(:name=>"ANOVA", :header=>%w{source ss df ms f s})
-    t.add_row([_("Regression"), sprintf("%0.3f",ssr), df_r, sprintf("%0.3f",msr), sprintf("%0.3f",f), sprintf("%0.3f", significance)])
-    t.add_row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse)])
+    t.row([_("Regression"), sprintf("%0.3f",ssr), df_r, sprintf("%0.3f",msr), sprintf("%0.3f",f), sprintf("%0.3f", significance)])
+    t.row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse)])
   
-    t.add_row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
+    t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
     generator.parse_element(t)
     sc=standarized_coeffs
     cse=coeffs_se
     t=ReportBuilder::Table.new(:name=>"Beta coefficients", :header=>%w{coeff b beta se t}.collect{|field| _(field)} )
     
     if (constant_se.nil?)
-      t.add_row([_("Constant"), sprintf("%0.3f", constant),"--","?","?"])
+      t.row([_("Constant"), sprintf("%0.3f", constant),"--","?","?"])
     else
-      t.add_row([_("Constant"), sprintf("%0.3f", constant), "-", sprintf("%0.3f", constant_se), sprintf("%0.3f", constant_t)])
+      t.row([_("Constant"), sprintf("%0.3f", constant), "-", sprintf("%0.3f", constant_se), sprintf("%0.3f", constant_t)])
     end
     
     @fields.each do |f|
-      t.add_row([f, sprintf("%0.3f", c[f]), sprintf("%0.3f", sc[f]), sprintf("%0.3f", cse[f]), sprintf("%0.3f", c[f].quo(cse[f]))])
+      t.row([f, sprintf("%0.3f", c[f]), sprintf("%0.3f", sc[f]), sprintf("%0.3f", cse[f]), sprintf("%0.3f", c[f].quo(cse[f]))])
     end  
     generator.parse_element(t)
-    generator.add_html("</div>")
+    generator.html("</div>")
   end
   
   

data/lib/statsample/test/levene.rb

@@ -39,8 +39,8 @@ module Statsample
         @w
       end
       
-      def to_reportbuilder(generator) # :nodoc:
-        generator.add_text(summary)
+      def report_building(generator) # :nodoc:
+        generator.text(summary)
         
       end
       # Summary of results

data/lib/statsample/test/umannwhitney.rb

@@ -147,8 +147,8 @@ Z: #{sprintf("%0.3f",z)} (p: #{sprintf("%0.3f",z_probability)})
         end
           out
       end
-      def to_reportbuilder(generator) # :nodoc:
-        generator.add_text(summary)
+      def report_building(generator) # :nodoc:
+        generator.text(summary)
       end
       # Exact probability of finding values of U lower or equal to sample on U distribution. Use with caution with m*n>100000.
       # Uses u_sampling_distribution_as62

data/lib/statsample/vector.rb

@@ -92,12 +92,7 @@ module Statsample
     raise NoMethodError if (t==:scale and @type!=:scale) or (t==:ordinal and @type==:nominal) or (t==:date)
     end
     private :check_type
-    
-    # Return a vector usign the standarized values for data
-    # with sd with denominator N
-    def vector_standarized_pop
-      vector_standarized(true)
-    end
+
     # Return a vector usign the standarized values for data
     # with sd with denominator n-1
     

data/po/es/statsample.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: statsample 0.6.2\n"
-"POT-Creation-Date: 2010-02-11 18:44-0300\n"
-"PO-Revision-Date: 2010-02-11 18:48-0300\n"
+"Project-Id-Version: statsample 0.6.8\n"
+"POT-Creation-Date: 2010-03-25 17:55-0300\n"
+"PO-Revision-Date: 2010-03-25 17:56-0300\n"
 "Last-Translator: Claudio Bustos <clbustos@gmail.com>\n"
 "Language-Team: Desarrollador\n"
 "MIME-Version: 1.0\n"
@@ -11,137 +11,157 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: lib/statsample/regression/multiple/baseengine.rb:14
+#: lib/statsample/regression/multiple/baseengine.rb:23
 msgid "Multiple Regression:  %s over %s"
 msgstr "Regresión Múltiple: %s sobre %s"
 
-#: lib/statsample/regression/multiple/baseengine.rb:150
+#: lib/statsample/regression/multiple/baseengine.rb:164
+#: lib/statsample/regression/multiple/matrixengine.rb:198
 msgid "Multiple Regression: "
 msgstr "Regresión Múltiple:"
 
-#: lib/statsample/regression/multiple/baseengine.rb:153
+#: lib/statsample/regression/multiple/baseengine.rb:167
+#: lib/statsample/regression/multiple/matrixengine.rb:201
 msgid "Engine: %s"
 msgstr "Motor: %s"
 
-#: lib/statsample/regression/multiple/baseengine.rb:154
+#: lib/statsample/regression/multiple/baseengine.rb:168
 msgid "Cases(listwise)=%d(%d)"
 msgstr "Casos (sólo válidos)=%d(%d)"
 
-#: lib/statsample/regression/multiple/baseengine.rb:158
+#: lib/statsample/regression/multiple/baseengine.rb:172
+#: lib/statsample/regression/multiple/matrixengine.rb:206
 msgid "Equation"
 msgstr "Ecuación"
 
-#: lib/statsample/regression/multiple/baseengine.rb:161
+#: lib/statsample/regression/multiple/baseengine.rb:175
+#: lib/statsample/regression/multiple/matrixengine.rb:209
 msgid "Regression"
 msgstr "Regresión"
 
-#: lib/statsample/regression/multiple/baseengine.rb:162
+#: lib/statsample/regression/multiple/baseengine.rb:176
+#: lib/statsample/regression/multiple/matrixengine.rb:210
 msgid "Error"
 msgstr "Error"
 
-#: lib/statsample/regression/multiple/baseengine.rb:164
+#: lib/statsample/regression/multiple/baseengine.rb:178
+#: lib/statsample/regression/multiple/matrixengine.rb:212
 #: lib/statsample/crosstab.rb:108
 #: lib/statsample/crosstab.rb:123
 #: lib/statsample/crosstab.rb:159
 #: lib/statsample/crosstab.rb:181
-#: lib/statsample/dominanceanalysis.rb:281
+#: lib/statsample/dominanceanalysis.rb:361
 msgid "Total"
 msgstr "Total"
 
-#: lib/statsample/regression/multiple/baseengine.rb:170
+#: lib/statsample/regression/multiple/baseengine.rb:184
+#: lib/statsample/regression/multiple/matrixengine.rb:219
+#: lib/statsample/regression/multiple/matrixengine.rb:221
 msgid "Constant"
 msgstr "Constante"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:42
+#: lib/statsample/regression/multiple/matrixengine.rb:75
+msgid "Multiple reggresion of %s on %s"
+msgstr "Regresión Múltiple de %s en %s"
+
+#: lib/statsample/regression/multiple/matrixengine.rb:202
+msgid "Cases=%d"
+msgstr "Casos=%d"
+
+#: lib/statsample/dominanceanalysis/bootstrap.rb:117
 msgid "Bootstrap dominance Analysis:  %s over %s"
 msgstr "Resultados del Análisis de Dominancia Bootstrap: %s en %s"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:65
+#: lib/statsample/dominanceanalysis/bootstrap.rb:140
 msgid "Bootstrap %d of %d"
 msgstr "Bootstrap: %d de %d"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:106
+#: lib/statsample/dominanceanalysis/bootstrap.rb:183
 msgid "DAB: "
-msgstr ""
+msgstr "RAD:"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:109
+#: lib/statsample/dominanceanalysis/bootstrap.rb:186
 msgid "Sample size: %d\n"
 msgstr "Tamaño de muestra: %d\n"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:111
+#: lib/statsample/dominanceanalysis/bootstrap.rb:188
 msgid "Linear Regression Engine: %s"
 msgstr "Motor de Regresión Linear: %s"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:113
+#: lib/statsample/dominanceanalysis/bootstrap.rb:190
 msgid "pairs"
 msgstr "pares"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:113
+#: lib/statsample/dominanceanalysis/bootstrap.rb:190
 msgid "SE(Dij)"
 msgstr "EE(Dij)"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:113
+#: lib/statsample/dominanceanalysis/bootstrap.rb:190
 msgid "Reproducibility"
 msgstr "Reproducibilidad"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:114
+#: lib/statsample/dominanceanalysis/bootstrap.rb:191
 msgid "Complete dominance"
 msgstr "Dominancia Completa"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:122
+#: lib/statsample/dominanceanalysis/bootstrap.rb:199
 msgid "Conditional dominance"
 msgstr "Dominancia Condicional"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:131
+#: lib/statsample/dominanceanalysis/bootstrap.rb:208
 msgid "General Dominance"
 msgstr "Dominancia General"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "General averages"
 msgstr "Promedios generales"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "var"
 msgstr "var"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "mean"
 msgstr "promedio"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "se"
 msgstr "de"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "p.5"
 msgstr "p.5"
 
-#: lib/statsample/dominanceanalysis/bootstrap.rb:140
+#: lib/statsample/dominanceanalysis/bootstrap.rb:217
 msgid "p.95"
 msgstr "p.95"
 
-#: lib/statsample/bivariate/polychoric.rb:560
-#: lib/statsample/bivariate/tetrachoric.rb:118
+#: lib/statsample/bivariate/polychoric.rb:750
+#: lib/statsample/bivariate/tetrachoric.rb:124
 msgid "Contingence Table"
 msgstr "Tabla de Contingencia"
 
-#: lib/statsample/bivariate/polychoric.rb:569
+#: lib/statsample/bivariate/polychoric.rb:759
 msgid "Thresholds"
 msgstr "Umbrales"
 
-#: lib/statsample/bivariate/tetrachoric.rb:126
+#: lib/statsample/bivariate/polychoric.rb:767
+msgid "Test of bivariate normality: X2 = %0.3f, df = %d, p= %0.5f"
+msgstr "Prueba de normalidad bivariada: X2 = %0.3f, g.l. = %d, p= %0.5f"
+
+#: lib/statsample/bivariate/tetrachoric.rb:132
 msgid "SE: %0.3f"
 msgstr "EE: %0.3f"
 
-#: lib/statsample/bivariate/tetrachoric.rb:127
+#: lib/statsample/bivariate/tetrachoric.rb:133
 msgid "Threshold X: %0.3f "
 msgstr "Umbral X: %0.3f"
 
-#: lib/statsample/bivariate/tetrachoric.rb:128
+#: lib/statsample/bivariate/tetrachoric.rb:134
 msgid "Threshold Y: %0.3f "
 msgstr "Umbral Y:%0.3f"
 
-#: lib/statsample/bivariate/tetrachoric.rb:134
+#: lib/statsample/bivariate/tetrachoric.rb:141
 msgid "Tetrachoric correlation"
 msgstr "Correlación tetracórica"
 
@@ -149,34 +169,34 @@ msgstr "Correlación tetracórica"
 msgid "Histogram %s"
 msgstr "Histograma: %s"
 
-#: lib/statsample/factor/pca.rb:99
+#: lib/statsample/factor/pca.rb:128
 msgid "PCA: "
 msgstr "ACP:"
 
-#: lib/statsample/factor/pca.rb:100
+#: lib/statsample/factor/pca.rb:129
 msgid "PCA"
 msgstr "ACP"
 
-#: lib/statsample/factor/pca.rb:103
-#: lib/statsample/factor/principalaxis.rb:106
+#: lib/statsample/factor/pca.rb:132
+#: lib/statsample/factor/principalaxis.rb:182
 msgid "Communalities"
 msgstr "Comunalidades"
 
-#: lib/statsample/factor/pca.rb:109
-#: lib/statsample/factor/principalaxis.rb:112
+#: lib/statsample/factor/pca.rb:138
+#: lib/statsample/factor/principalaxis.rb:188
 msgid "Eigenvalues"
 msgstr "Eigenvalues"
 
-#: lib/statsample/factor/pca.rb:115
-#: lib/statsample/factor/principalaxis.rb:118
+#: lib/statsample/factor/pca.rb:144
+#: lib/statsample/factor/principalaxis.rb:194
 msgid "Component Matrix"
 msgstr "Matriz de componentes"
 
-#: lib/statsample/factor/principalaxis.rb:97
+#: lib/statsample/factor/principalaxis.rb:176
 msgid "Factor Analysis: "
 msgstr "Análisis de Factores:"
 
-#: lib/statsample/factor/principalaxis.rb:98
+#: lib/statsample/factor/principalaxis.rb:177
 msgid "Factor Analysis"
 msgstr "Análisis de Factores"
 
@@ -217,53 +237,53 @@ msgstr "% Columna"
 msgid "% Total"
 msgstr "% Total"
 
-#: lib/statsample/dominanceanalysis.rb:79
+#: lib/statsample/dominanceanalysis.rb:123
 msgid "Dominance Analysis:  %s over %s"
 msgstr "Análisis de dominancia: %s en %s"
 
-#: lib/statsample/dominanceanalysis.rb:241
+#: lib/statsample/dominanceanalysis.rb:319
 msgid "DA: "
 msgstr "AD:"
 
-#: lib/statsample/dominanceanalysis.rb:243
-msgid "Dominance Analysis result"
-msgstr "Resultados del análisis de dominancia"
-
-#: lib/statsample/dominanceanalysis.rb:244
+#: lib/statsample/dominanceanalysis.rb:322
 msgid "sign"
 msgstr "signo"
 
-#: lib/statsample/dominanceanalysis.rb:245
+#: lib/statsample/dominanceanalysis.rb:323
+msgid "Dominance Analysis result"
+msgstr "Resultados del análisis de dominancia"
+
+#: lib/statsample/dominanceanalysis.rb:325
 msgid "Model 0"
 msgstr "Modelo 0"
 
-#: lib/statsample/dominanceanalysis.rb:259
+#: lib/statsample/dominanceanalysis.rb:340
 msgid "k=%d Average"
 msgstr "k=%d Promedio"
 
-#: lib/statsample/dominanceanalysis.rb:272
+#: lib/statsample/dominanceanalysis.rb:352
 msgid "Overall averages"
 msgstr "Promedios generales"
 
-#: lib/statsample/dominanceanalysis.rb:281
+#: lib/statsample/dominanceanalysis.rb:361
 msgid "Pairwise dominance"
 msgstr "Dominancia en pares"
 
-#: lib/statsample/dominanceanalysis.rb:281
+#: lib/statsample/dominanceanalysis.rb:361
 msgid "Pairs"
 msgstr "Pares"
 
-#: lib/statsample/dominanceanalysis.rb:281
+#: lib/statsample/dominanceanalysis.rb:361
 msgid "Conditional"
 msgstr "Condicional"
 
-#: lib/statsample/dominanceanalysis.rb:281
+#: lib/statsample/dominanceanalysis.rb:361
 msgid "General"
 msgstr "General"
 
-#: lib/statsample/converters.rb:317
+#: lib/statsample/converters.rb:321
 msgid ")}"
-msgstr ""
+msgstr ")}"
 
 #~ msgid "Pairwise"
 #~ msgstr "De a pares"