statsample 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,5 @@
+=== 0.8.1 / 2010-03-29
+* Fixed Regression summaries
 === 0.8.0 / 2010-03-29
 * New Statsample::Test::T module, with classes and methods to do Student's t tests for one and two samples. 
 * Statsample::PromiseAfter module to set a number of variables without explicitly call the compute or iterate method

data/lib/statsample.rb

@@ -111,7 +111,7 @@ module Statsample
       false
     end
   end
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
   SPLIT_TOKEN = ","
   autoload(:Database, 'statsample/converters')
   autoload(:Anova, 'statsample/anova')

data/lib/statsample/dominanceanalysis.rb

@@ -313,59 +313,58 @@ module Statsample
       rp.add(self)
       rp.to_text
     end
-    def report_building(generator)
+    def report_building(g)
       compute if @models.nil?
       
-      anchor=generator.toc_entry(_("DA: ")+@name)
-      
-      generator.html "<div class='dominance-analysis'>#{@name}<a name='#{anchor}'></a>"
-      header=["","r2",_("sign")]+@predictors.collect {|c| DominanceAnalysis.predictor_name(c) }
-      t=ReportBuilder::Table.new(:name=>_("Dominance Analysis result"),:header=>header)
-      
-      row=[_("Model 0"),"",""]+@predictors.collect{|f|
-        sprintf("%0.3f", md([f]).r2)
-      }
-      
-      t.row(row)
-      t.hr
-      for i in 1..@predictors.size
-        mk=md_k(i)
-        mk.each{|m|
-          t.row(m.add_table_row)
-        }
-        # Report averages
-        a=average_k(i)
-        if !a.nil?
-            t.hr
-            row=[_("k=%d Average") % i,"",""] + @predictors.collect{|f|
-                sprintf("%0.3f",a[f])
+      g.section(:name=>@name) do |generator|
+        header=["","r2",_("sign")]+@predictors.collect {|c| DominanceAnalysis.predictor_name(c) }
+        
+        generator.table(:name=>_("Dominance Analysis result"), :header=>header) do |t|
+          
+          row=[_("Model 0"),"",""]+@predictors.collect{|f|
+            sprintf("%0.3f", md([f]).r2)
+          }
+          
+          t.row(row)
+          t.hr
+          for i in 1..@predictors.size
+            mk=md_k(i)
+            mk.each{|m|
+              t.row(m.add_table_row)
             }
+            # Report averages
+            a=average_k(i)
+            if !a.nil?
+                t.hr
+                row=[_("k=%d Average") % i,"",""] + @predictors.collect{|f|
+                    sprintf("%0.3f",a[f])
+                }
+                t.row(row)
+                t.hr
+                
+            end
+          end
+          
+          g=general_averages
+          t.hr
+          
+          row=[_("Overall averages"),"",""]+@predictors.collect{|f|
+                    sprintf("%0.3f",g[f])
+          }
+          t.row(row)
+        end        
+        
+        td=total_dominance
+        cd=conditional_dominance
+        gd=general_dominance
+        generator.table(:name=>_("Pairwise dominance"), :header=>[_("Pairs"),_("Total"),_("Conditional"),_("General")]) do |t|
+          pairs.each{|p|
+            name=p.join(" - ")
+            row=[name, sprintf("%0.1f",td[p]), sprintf("%0.1f",cd[p]), sprintf("%0.1f",gd[p])]
             t.row(row)
-            t.hr
-            
+          }
         end
       end
-      
-      g=general_averages
-      t.hr
-      
-      row=[_("Overall averages"),"",""]+@predictors.collect{|f|
-                sprintf("%0.3f",g[f])
-      }
-      t.row(row)
-      generator.parse_element(t)
-      
-      td=total_dominance
-      cd=conditional_dominance
-      gd=general_dominance
-      t=ReportBuilder::Table.new(:name=>_("Pairwise dominance"), :header=>[_("Pairs"),_("Total"),_("Conditional"),_("General")])
-      pairs.each{|p|
-        name=p.join(" - ")
-        row=[name, sprintf("%0.1f",td[p]), sprintf("%0.1f",cd[p]), sprintf("%0.1f",gd[p])]
-        t.row(row)
-      }
-      generator.parse_element(t)
-      generator.html("</div>")
     end
     class ModelData # :nodoc:
       attr_reader :contributions

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

@@ -172,9 +172,9 @@ module Statsample
             
             g.table(:name=>"ANOVA", :header=>%w{source ss df ms f s}) do |t|
               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.row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse),"",""])
       
-              t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
+              t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e,"","",""])
             end
             sc=standarized_coeffs
             cse=coeffs_se

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

@@ -206,9 +206,9 @@ class MatrixEngine < BaseEngine
       
       g.table(:name=>"ANOVA", :header=>%w{source ss df ms f s}) do |t|
         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.row([_("Error"), sprintf("%0.3f",sse), df_e, sprintf("%0.3f",mse),"",""])
       
-        t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e])
+        t.row([_("Total"), sprintf("%0.3f",sst), df_r+df_e,"","",""])
       end
       sc=standarized_coeffs
       cse=coeffs_se

data/test/test_promise_after.rb

@@ -4,7 +4,7 @@ require(File.dirname(__FILE__)+'/test_helpers.rb')
 class StatsamplePromiseAfterTestCase < MiniTest::Unit::TestCase
   class ExpensiveClass
     extend Statsample::PromiseAfter
-    attr_reader :a, :dirty
+    attr_reader  :dirty
     def initialize
       @a=nil
       @b=nil

data/test/test_regression.rb

@@ -18,7 +18,17 @@ class StatsampleRegressionTestCase < MiniTest::Unit::TestCase
     assert_in_delta(-0.957, reg.b,0.001)
     assert_in_delta(4.248,reg.standard_error,0.002)
   end
-
+  def test_summaries
+    a=100.times.map{rand(100)}.to_scale
+    b=100.times.map{rand(100)}.to_scale
+    y=100.times.map{rand(100)}.to_scale
+    ds={'a'=>a,'b'=>b,'y'=>y}.to_dataset
+    lr=Statsample::Regression::Multiple::RubyEngine.new(ds,'y')
+    assert(lr.summary.size>0)
+    
+    
+    
+  end
   def test_multiple_dependent
     complete=Matrix[
       [1,0.53,0.62,0.19,-0.09,0.08,0.02,-0.12,0.08],
@@ -40,8 +50,8 @@ class StatsampleRegressionTestCase < MiniTest::Unit::TestCase
     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)
@@ -67,6 +77,7 @@ class StatsampleRegressionTestCase < MiniTest::Unit::TestCase
       @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')
+      assert(lr.summary.size>0)
       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
@@ -148,6 +159,7 @@ class StatsampleRegressionTestCase < MiniTest::Unit::TestCase
 
     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)
+    assert(lr.summary.size>0)
 
     model_test(lr , "covariance matrix")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: statsample
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Claudio Bustos