statsample 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,5 @@
+=== 0.8.2 / 2010-04-01
+* Statsample::PromiseAfter replaced by external package DirtyMemoize [http://rubygems.org/gems/dirty-memoize]
 === 0.8.1 / 2010-03-29
 * Fixed Regression summaries
 === 0.8.0 / 2010-03-29

data/Manifest.txt

@@ -103,7 +103,6 @@ test/test_matrix.rb
 test/test_mle.rb
 test/test_multiset.rb
 test/test_permutation.rb
-test/test_promise_after.rb
 test/test_regression.rb
 test/test_reliability.rb
 test/test_resample.rb

data/Rakefile

@@ -42,7 +42,7 @@ 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", "~>1.0"] << ["minimization", "~>0.1.0"] << ["fastercsv"]
+	self.extra_deps << ["spreadsheet","~>0.6.0"] << ["svg-graph", "~>1.0"] << ["reportbuilder", "~>1.0"] << ["minimization", "~>0.1.0"] << ["fastercsv"] << ["dirty-memoize", "~>0.0"]
 	self.clean_globs << "test/images/*" << "demo/item_analysis/*" << "demo/Regression"
 	self.need_rdoc=false
 end

data/lib/statsample.rb

@@ -21,6 +21,7 @@
 #$:.unshift(File.dirname(__FILE__))
 require 'matrix'
 require 'distribution'
+require 'dirty-memoize'
 gem 'reportbuilder','~>1.0'
 require 'reportbuilder'
 class Numeric
@@ -111,7 +112,7 @@ module Statsample
       false
     end
   end
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
   SPLIT_TOKEN = ","
   autoload(:Database, 'statsample/converters')
   autoload(:Anova, 'statsample/anova')
@@ -204,55 +205,6 @@ module Statsample
     end
 	end
   
-  module PromiseAfter
-    # Like memoizable module (http://promise.rubyforge.org/Promise.html)
-    # but this applies to set a lot or variables with one expensive method
-    # with a direct calling of dependent methods.
-    # If one of the dependent methods returns nil or false, the main method 
-    # is called.
-    #
-    # Use when
-    # 1. You have one expensive operation which set many internal variables
-    # 2. This expensive operations depends on values which can set
-    #    anytime BEFORE calculation of main function
-    # 
-    # I use for classes which requires a iteration to set several variables,
-    # hiding to user the need to explicitily call the iterate method.
-    # 
-    # Example:
-    #  class ExpensiveCalculation
-    #   include PromiseAfter
-    #   attr_accessor :y, :z
-    #   def initialize(y=nil,z=nil)
-    #     @y=y
-    #     @z=z
-    #   def compute
-    #     @a=@y*1000+@z*1000
-    #   end
-    #   def a
-    #      @a.nil? nil : "This is the value: #{@a}"
-    #   end
-    #   promise_after :compute, :a, :b
-    #  end
-    #  puts ExpensiveCalculation.new(1,2).a
-    
-    def promise_after(function, *syms)
-      syms.each do |sym|
-        # You should doc the method!
-        raise NoMethodError, "Method `#{sym}' doesn't exists! Create it first " unless method_defined? sym
-        alias_method((sym.to_s+"_without_promise_after").intern, sym)
-        define_method(sym) {
-          #sym_to_iv="@#{sym.to_s.gsub(":","")}".intern
-          #if !instance_variable_defined?(sym_to_iv) or instance_variable_get(sym_to_iv).nil?
-          if(!send(sym.to_s+"_without_promise_after"))
-            send(function)
-          end
-          send(sym.to_s+"_without_promise_after")
-        }
-
-      end
-    end
-  end
   
   
   module Writable

data/lib/statsample/bivariate/polychoric.rb

@@ -65,7 +65,7 @@ module Statsample
     
     class Polychoric
       include GetText
-      extend Statsample::PromiseAfter
+      include DirtyMemoize
       bindtextdomain("statsample")
       # Name of the analysis
       attr_accessor :name
@@ -142,7 +142,8 @@ module Statsample
       # Returns the columns thresholds
       attr_reader :beta
       
-      promise_after :compute, :r, :alpha, :beta
+      dirty_writer :max_iterations, :epsilon, :minimizer_type_two_step, :minimizer_type_joint, :method
+      dirty_memoize :r, :alpha, :beta
       
       alias :threshold_x :alpha
       alias :threshold_y :beta
@@ -733,7 +734,7 @@ module Statsample
      
       
       def report_building(generator) # :nodoc: 
-        #compute if r.nil?
+        compute if dirty?
         section=ReportBuilder::Section.new(:name=>@name)
         t=ReportBuilder::Table.new(:name=>_("Contingence Table"), :header=>[""]+(@n.times.collect {|i| "Y=#{i}"})+["Total"])
         @m.times do |i|

data/lib/statsample/factor/rotation.rb

@@ -18,14 +18,15 @@ module Factor
   class Rotation
     EPSILON=1e-15
     MAX_ITERATIONS=25
-    extend Statsample::PromiseAfter
+    include DirtyMemoize
     attr_reader :iterations, :rotated, :component_transformation_matrix, :h2
     # Maximum number of iterations    
     attr_accessor :max_iterations
     # Maximum precision    
     attr_accessor :epsilon
     
-    promise_after :iterate, :iterations, :rotated, :component_transformation_matrix, :h2
+    dirty_writer :max_iterations, :epsilon
+    dirty_memoize :iterations, :rotated, :component_transformation_matrix, :h2
     
     def initialize(matrix, opts=Hash.new)
       @matrix=matrix
@@ -42,6 +43,9 @@ module Factor
     end
     alias_method :communalities, :h2
     alias_method :rotated_component_matrix, :rotated
+    def compute
+      iterate
+    end
     # Start iteration 
     def iterate
       t=Matrix.identity(@m)
@@ -52,7 +56,7 @@ module Factor
       @not_converged=true
       @iterations=0
       while @not_converged
-        break if iterations>@max_iterations
+        break if @iterations>@max_iterations
         @iterations+=1
         #puts "Iteration #{iterations}"
         num_pairs=@m*(@m-1).quo(2)

data/lib/statsample/test/t.rb

@@ -58,7 +58,7 @@ module Statsample
       class OneSample
         include Math
         include Statsample::Test
-        extend Statsample::PromiseAfter
+        include DirtyMemoize
         # Options
         attr_accessor :opts
         # Name of test
@@ -73,6 +73,10 @@ module Statsample
         attr_reader :probability
         # Tails for probability (:both, :left or :right)
         attr_accessor :tails 
+        
+        dirty_writer :u, :tails
+        dirty_memoize :t, :probability
+        
         def initialize(vector, opts=Hash.new)
           @vector=vector
           default={:u=>0, :name=>"One Sample T Test", :tails=>:both}
@@ -83,8 +87,7 @@ module Statsample
           @df= @vector.n_valid-1
           @t=nil
         end        
-
-        promise_after :compute, :t, :probability
+       
         
         # Set t and probability for given u
         def compute
@@ -102,7 +105,6 @@ module Statsample
             s.text "Population mean:#{u}"
             s.text "Tails: #{tails}"
             s.text sprintf("t = %0.4f, p=%0.4f, d.f=%d", t, probability, df)
-
           }
         end
       end
@@ -117,7 +119,7 @@ module Statsample
       class TwoSamplesIndependent
         include Math
         include Statsample::Test
-        extend Statsample::PromiseAfter
+        include DirtyMemoize
         # Options
         attr_accessor :opts
         # Name of test
@@ -137,6 +139,10 @@ module Statsample
         # Tails for probability (:both, :left or :right)
         attr_accessor :tails 
         # Create the object
+        
+        dirty_writer :tails
+        dirty_memoize :t_equal_variance, :t_not_equal_variance, :probability_equal_variance, :probability_not_equal_variance, :df_equal_variance, :df_not_equal_variance
+        
         def initialize(v1, v2, opts=Hash.new)
           @v1=v1
           @v2=v2
@@ -145,8 +151,8 @@ module Statsample
           @name=@opts[:name]
           @tails=@opts[:tails]          
         end        
-
-        promise_after :compute, :t_equal_variance, :t_not_equal_variance, :probability_equal_variance, :probability_not_equal_variance, :df_equal_variance, :df_not_equal_variance
+        
+        
         
         # Set t and probability for given u
         def compute

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: statsample
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Claudio Bustos
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhjbGJ1
+  c3RvczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTEwMDMyOTIxMzg1NVoXDTExMDMyOTIxMzg1NVowPzERMA8GA1UEAwwIY2xi
+  dXN0b3MxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf8JVMGqE7m5kYb+PNN
+  neZv2pcXV5fQCi6xkyG8bi2/SIFy/LyxuvLzEeOxBeaz1Be93bayIUquOIqw3dyw
+  /KXWa31FxuNuvAm6CN8fyeRYX/ou4cw3OIUUnIvB7RMNIu4wbgeM6htV/QEsNLrv
+  at1/mh9JpqawPrcjIOVMj4BIp67vmzJCaUf+S/H2uYtSO09F+YQE3tv85TPeRmqU
+  yjyXyTc/oJiw1cXskUL8UtMWZmrwNLHXuZWWIMzkjiz3UNdhJr/t5ROk8S2WPznl
+  0bMy/PMIlAbqWolRn1zl2VFJ3TaXScbqImY8Wf4g62b/1ZSUlGrtnLNsCYXrWiso
+  UPUCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGu9
+  rrJ1H64qRmNNu3Jj/Qjvh0u5MA0GCSqGSIb3DQEBBQUAA4IBAQCV0Unka5isrhZk
+  GjqSDqY/6hF+G2pbFcbWUpjmC8NWtAxeC+7NGV3ljd0e1SLfoyBj4gnFtFmY8qX4
+  K02tgSZM0eDV8TpgFpWXzK6LzHvoanuahHLZEtk/+Z885lFene+nHadkem1n9iAB
+  cs96JO9/JfFyuXM27wFAwmfHCmJfPF09R4VvGHRAvb8MGzSVgk2i06OJTqkBTwvv
+  JHJdoyw3+8bw9RJ+jLaNoQ+xu+1pQdS2bb3m7xjZpufml/m8zFCtjYM/7qgkKR8z
+  /ZZt8lCiKfFArppRrZayE2FVsps4X6WwBdrKTMZ0CKSXTRctbEj1BAZ67eoTvBBt
+  rpP0jjs0
+  -----END CERTIFICATE-----
 
-date: 2010-03-29 00:00:00 -03:00
+date: 2010-04-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +83,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dirty-memoize
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   type: :development
@@ -222,7 +253,6 @@ files:
 - test/test_mle.rb
 - test/test_multiset.rb
 - test/test_permutation.rb
-- test/test_promise_after.rb
 - test/test_regression.rb
 - test/test_reliability.rb
 - test/test_resample.rb
@@ -284,7 +314,6 @@ test_files:
 - test/test_mle.rb
 - test/test_resample.rb
 - test/test_stratified.rb
-- test/test_promise_after.rb
 - test/test_vector.rb
 - test/test_srs.rb
 - test/test_ggobi.rb

data/test/test_promise_after.rb

@@ -1,39 +0,0 @@
-require(File.dirname(__FILE__)+'/test_helpers.rb')
-
-
-class StatsamplePromiseAfterTestCase < MiniTest::Unit::TestCase
-  class ExpensiveClass
-    extend Statsample::PromiseAfter
-    attr_reader  :dirty
-    def initialize
-      @a=nil
-      @b=nil
-      @dirty=false
-    end
-    def compute
-      @a="After"
-      @b="After"
-      @dirty=true
-    end
-    def a
-      @a.nil? ? nil : "@a=#{@a}"
-    end
-    def b
-      "@b=#{@b}"
-    end
-    promise_after :compute, :a
-  end
-  def setup
-    @ec=ExpensiveClass.new
-  end
-  def test_promise_after_before
-    assert_equal(nil, @ec.instance_variable_get("@a")) 
-    assert_equal(nil, @ec.instance_variable_get("@b")) 
-    assert_equal("@b=",@ec.b)
-    refute(@ec.dirty) 
-    # Calling method a active compute
-    assert_equal("@a=After", @ec.a) 
-    assert(@ec.dirty)
-    assert_equal("@b=After", @ec.b) 
-  end
-end