solver 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/solver/base.rb

@@ -13,18 +13,23 @@ class Base
     @x = @default_guesses.first
     @f = eqn || blk
     @tol = tol # user-requested tolerance
+    @max_it = 8192
+    reset
+  end
+
+  def reset
     @l_x = nil
     @fx = nil
     @l_fx = nil
     @ok = true
     @conv = false
-    @max_it = 8192
   end
 
   # value of parameters[var] is used as a guess in precedence to the pre-guesses if not nil
   # use Array for two guesses
   def root(*guesses)
     @guess = (guesses + @default_guesses).map{|g| num(g)}
+    reset
     @l_x = @x = @guess.first
     @l_fx = @fx = eval_f(@x)
     @ok = true
@@ -44,7 +49,6 @@ class Base
       @l_fx = @fx
       @x = next_x
       @fx = eval_f(@x)
-      # puts "X=#{@x.inspect}[#{@fx.inspect}]"
       @conv = test_conv() if @ok
       break if @conv
       @iteration += 1

data/lib/solver/rfsecant.rb

@@ -23,9 +23,14 @@ module Flt::Solver
 
     def initialize(context, default_guesses, tol, eqn=nil, &blk)
       super context, default_guesses, tol, eqn, &blk
+      @half = num(Rational(1,2))
+      reset
+    end
+    
+    def reset
+      super
       @a = @b = @fa = @fb = nil
       @bracketing = false
-      @half = num(Rational(1,2))
     end
 
     def step

data/lib/solver/secant.rb

@@ -24,9 +24,14 @@ module Flt::Solver
 
     def initialize(context, default_guesses, tol, eqn=nil, &blk)
       super context, default_guesses, tol, eqn, &blk
+      @half = num(Rational(1,2))
+      reset
+    end
+    
+    def reset
+      super
       @a = @b = @fa = @fb = nil
       @bracketing = false
-      @half = num(Rational(1,2))
     end
 
     def step

data/solver.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solver}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
@@ -45,7 +45,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Numeric solver to exercise the Flt library}
   s.test_files = [
-    "test/helper.rb",
+    "test/chk.rb",
+     "test/helper.rb",
      "test/test_function.rb",
      "test/test_psolver.rb",
      "test/test_rfsecant.rb",

data/test/chk.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'helper'))
+require 'flt/float'
+require 'flt/tolerance'
+
+include Flt
+
+@context = Float.context
+@tolerance = Flt.Tolerance(3,:decimals)
+@delta = 5E-4        
+@tvm = Flt::Solver::TVM.new(@tolerance, @context)
+
+puts "-----------------"
+
+sol = @tvm.solve(:t=>63, :m0=>0, :pmt=>-1000000, :i=>@context.Num('0.00000161')*12, :p=>12)
+puts sol.inspect
+
+puts "-----------------"
+n = 31536000
+sol = @tvm.solve(:t=>n, :m0=>0, :pmt=>-@context.Num('0.01'), :i=>@context.Num(10)/n, :p=>1)
+puts sol.inspect
+
+puts "-----------------"
+@tvm = Flt::Solver::TVM.new(@tolerance, @context)
+n = 31536000
+sol = @tvm.solve(:t=>n, :m0=>0, :pmt=>-@context.Num('0.01'), :i=>@context.Num(10)/n, :p=>1)
+puts sol.inspect

data/test/test_tvm.rb

@@ -12,8 +12,8 @@ class TestTVM < Test::Unit::TestCase
     
       setup do
         @context = Float.context
-        @tolerance = Flt.Tolerance(3,:decimals)
-        @delta = 5E-4        
+        @tolerance = Flt.Tolerance(2,:decimals)
+        @delta = 5E-3     
         @tvm = Flt::Solver::TVM.new(@tolerance, @context)
       end
       
@@ -29,6 +29,17 @@ class TestTVM < Test::Unit::TestCase
         assert_in_delta 240, sol[:t], @delta
       end
   
+      should "solve correclty for :m" do
+        sol = @tvm.solve(:t=>63, :m0=>0, :pmt=>-1000000, :i=>@context.Num('0.00000161')*12, :p=>12)
+        assert_equal [:m], sol.keys
+        assert_in_delta @context.Num('63000031.4433'), sol[:m],  @delta
+
+        n = 31536000
+        sol = @tvm.solve(:t=>n, :m0=>0, :pmt=>-@context.Num('0.01'), :i=>@context.Num(10)/n, :p=>1)
+        assert_equal [:m], sol.keys
+        assert_in_delta @context.Num('331667.006691'), sol[:m], @delta
+      end
+  
     end
     
   end
@@ -36,9 +47,9 @@ class TestTVM < Test::Unit::TestCase
   context "using DecNum arithmetic" do
   
     setup do
-      @context = Float.context
+      @context = Flt::DecNum.context
       @tolerance = Flt.Tolerance(3,:decimals)
-      @delta = 5E-4        
+      @delta = @context.Num('5E-4')        
       @tvm = Flt::Solver::TVM.new(@tolerance, @context)
     end
 
@@ -49,10 +60,56 @@ class TestTVM < Test::Unit::TestCase
     end
 
     should "solve correclty for :t" do
-      sol = @tvm.solve(:pmt=>-55.45975978539105, :m0=>10000, :m=>0, :i=>3, :p=>12)
+      sol = @tvm.solve(:pmt=>@context.Num('-55.45975978539105'), :m0=>10000, :m=>0, :i=>3, :p=>12)
       assert_equal [:t], sol.keys
       assert_in_delta 240, sol[:t], @delta
     end
-  
+
+    should "solve correclty for :m" do
+      sol = @tvm.solve(:t=>63, :m0=>0, :pmt=>-1000000, :i=>@context.Num('0.00000161')*12, :p=>12)
+      assert_equal [:m], sol.keys
+      assert_in_delta @context.Num('63000031.4433'), sol[:m], @delta
+      
+      n = 31536000
+      sol = @tvm.solve(:t=>n, :m0=>0, :pmt=>-@context.Num('0.01'), :i=>@context.Num(10)/n, :p=>1)
+      assert_equal [:m], sol.keys
+      assert_in_delta @context.Num('331667.006691'), sol[:m], @delta
+    end
+    
+    context "and high precision" do
+      setup do
+        @context.precision = 28
+        @tolerance = Tolerance(12, :sig_decimals)
+        @tvm = Flt::Solver::TVM.new(@tolerance, @context)        
+      end
+    
+      should "solve correclty for :pmt" do
+        sol = @tvm.solve(:t=>240, :m0=>10000, :m=>0, :i=>3, :p=>12)
+        assert_equal [:pmt], sol.keys
+        expected = @context.Num('-55.45975978539105')
+        assert_in_delta expected, sol[:pmt], @tolerance.value(expected)
+      end
+
+      should "solve correclty for :t" do
+        sol = @tvm.solve(:pmt=>@context.Num('-55.45975978539105'), :m0=>10000, :m=>0, :i=>3, :p=>12)
+        assert_equal [:t], sol.keys
+        expected = @context.Num('240')
+        assert_in_delta expected, sol[:t], @tolerance.value(expected)
+      end
+
+      should "solve correclty for :m" do
+        sol = @tvm.solve(:t=>63, :m0=>0, :pmt=>-1000000, :i=>@context.Num('0.00000161')*12, :p=>12)
+        assert_equal [:m], sol.keys
+        expected = @context.Num('63000031.4433')
+        assert_in_delta expected, sol[:m], @tolerance.value(expected)
+
+        n = 31536000
+        sol = @tvm.solve(:t=>n, :m0=>0, :pmt=>-@context.Num('0.01'), :i=>@context.Num(10)/n, :p=>1)
+        assert_equal [:m], sol.keys
+        expected = @context.Num('331667.006691')
+        assert_in_delta expected, sol[:m], @tolerance.value(expected)
+      end
+      
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -75,6 +75,7 @@ files:
 - test/test_rfsecant.rb
 - test/test_secant.rb
 - test/test_tvm.rb
+- test/chk.rb
 has_rdoc: true
 homepage: http://github.com/jgoizueta/solver
 licenses: []
@@ -110,6 +111,7 @@ signing_key:
 specification_version: 3
 summary: Numeric solver to exercise the Flt library
 test_files: 
+- test/chk.rb
 - test/helper.rb
 - test/test_function.rb
 - test/test_psolver.rb