dydx 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de4b80471ef9ac33664da33ff3f4a17a4c02714
-  data.tar.gz: e367d55b3bd7f8a59c1f7a0168f5a37e4d4c4881
+  metadata.gz: 895af6b98a1440dd693b35dd9e697ee6838f3a23
+  data.tar.gz: 5f987b396090e719f7aa22a524db87f34299b8af
 SHA512:
-  metadata.gz: ff580a632c292dc3bed05f880fc641d2308d96237e5c268d6d8a2f2353c0c7c520dc5422e810a39d572bd8ef33374d75f34a1f4615a32d393754a5cd0e108995
-  data.tar.gz: 8fcfb84b585244622fa596cdb08c2e0419af96d8e5bc384be9a3793e24ace35ad13474edc57301bbb53f7fd5664e0fe8226fd17f59cf20e5368bb1f443c14b3d
+  metadata.gz: 88dbb76bf4c5927fee44379a563ace65744db1e39b9215a47f0f94cde888756ce34e203b30a60a02a47f8f2a4d66879c9d5a6d0987c3f4986b1e00cbcfd275e2
+  data.tar.gz: 7e879f730952367fd530e3f356292f17c45913eba3aaab1b8989951924da4772b8c1173e78486ee0636045d75e5b9c50d914bfcb3731882ef4497d4e02fb83b6

data/lib/dydx.rb

@@ -18,7 +18,7 @@ module Dydx
                      .gsub('sin', 'Math.sin')
                      .gsub('log', 'Math.log')
                      .gsub('e', 'Math::E')
-                     .gsub('pi', 'Math::Pi')
+                     .gsub('pi', 'Math::PI')
           function.vars.each_with_index do |var, i|
             string.gsub!(var.to_s, vars[i].to_s)
           end

data/lib/dydx/algebra.rb

@@ -16,6 +16,18 @@ module Dydx
       # TODO: Refactor
       Symbol.class_eval{ include Operator::Symbol }
       Fixnum.class_eval do
+        alias_method :addition, :+
+        alias_method :subtraction, :-
+        alias_method :multiplication, :*
+        alias_method :division, :/
+        alias_method :exponentiation, :**
+        ope_to_str = {
+          addition: :+,
+          subtraction: :-,
+          multiplication: :*,
+          division: :/,
+          exponentiation: :^
+        }
         %w(+ - * / ^).each do |operator|
           define_method(operator) do |g|
             if g.is_a?(Symbol) ||
@@ -23,25 +35,35 @@ module Dydx
               g.is_a?(Base)
 
               Num.new(self).send(operator.to_sym, g)
-            elsif operator == '^' && g.is_a?(Fixnum) || g.is_a?(Float)
-              self ** g
-            elsif operator == '^' && g.is_a?(Num)
-              self ** g.n
             else
-              (to_f.send(operator.to_sym, g)).to_i
+              send(ope_to_str.key(operator.to_sym), g)
             end
           end
         end
       end
+
       Float.class_eval do
-        %w(^).each do |operator|
+        alias_method :addition, :+
+        alias_method :subtraction, :-
+        alias_method :multiplication, :*
+        alias_method :division, :/
+        alias_method :exponentiation, :**
+        ope_to_str = {
+          addition: :+,
+          subtraction: :-,
+          multiplication: :*,
+          division: :/,
+          exponentiation: :^
+        }
+        %w(+ - * / ^).each do |operator|
           define_method(operator) do |g|
-            if g.is_a?(Fixnum) || g.is_a?(Float)
-              self ** g
-            elsif g.is_a?(Num)
-              self ** g.n
-            else
+            if g.is_a?(Symbol) ||
+              g.is_a?(Formula) ||
+              g.is_a?(Base)
+
               Num.new(self).send(operator.to_sym, g)
+            else
+              send(ope_to_str.key(operator.to_sym), g)
             end
           end
         end

data/lib/dydx/algebra/set.rb

@@ -36,6 +36,10 @@ module Dydx
         $e ||= E.new
       end
 
+      def oo
+        Float::INFINITY
+      end
+
       def log(formula)
         if formula.multiplication?
           f, g = formula.f, formula.g

data/lib/dydx/helper.rb

@@ -47,11 +47,11 @@ module Dydx
     end
 
     def is_1?
-      self == 1 || (is_a?(Num) && n == 1)
+      [1, 1.0].include?(self) || (is_a?(Num) && n.is_1?)
     end
 
     def is_minus1?
-      self == -1 || (is_a?(Num) && n == -1)
+      [1, -1.0].include?(self)|| (is_a?(Num) && n.is_minus1?)
     end
 
     def distributive?(ope1, ope2)

data/lib/dydx/integrand.rb

@@ -10,11 +10,15 @@ module Dydx
       f = function
       a, b = [a, b].map(&:to_f)
       raise ArgumentError, 'b should be greater than a' if a > b
+      # HOT FIX: should implement Infinity class
+      a = - 1000 if a == - Float::INFINITY
+      b = 1000 if b == Float::INFINITY
+
       h = (b - a) / n
       sum = 0.0
       xi = ->(i){ a + h * i }
       n.to_i.times do |i|
-        sum += ( f(xi.(i)) + 4.0 * f(xi.(i) + h / 2.0 ) + f(xi.(i) + h) ) rescue binding.pry
+        sum += ( f(xi.(i)) + 4.0 * f(xi.(i) + h / 2.0 ) + f(xi.(i) + h) )
       end
       ( h * sum ) / 6.0
     end

data/lib/dydx/version.rb

@@ -1,3 +1,3 @@
 module Dydx
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/algebra/set/fixnum_spec.rb

@@ -49,7 +49,7 @@ describe Fixnum do
       it{ expect(3 * 2).to eq(6) }
 
       it{ expect((0 / 3).to_s).to eq('0') }
-      it{ expect{(3 / 0).to_s}.to raise_error(FloatDomainError) }
+      it{ expect{(3 / 0).to_s}.to raise_error(ZeroDivisionError) }
       it{ expect((3 / 1).to_s).to eq('3') }
       # TODO:
       it{ expect((2 / 3).to_s).to eq('0') }

data/spec/lib/algebra/set/float_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Float do
+  describe '#to_s' do
+    it{ expect(1.0.to_s).to eq('1.0') }
+  end
+
+  describe '#differentiate' do
+    it{ expect(3.0.d(:x).to_s).to eq('0') }
+  end
+
+  describe 'Calculate' do
+    context 'With Formula' do
+      let(:formula) { (:x + :y) }
+      it{ expect((0.0 + formula).to_s).to eq(formula.to_s) }
+      it{ expect((0.0 - formula).to_s).to eq('( - ( x + y ) )') }
+      it{ expect((0.0 * formula).to_s).to eq('0') }
+      it{ expect((1.0 * formula).to_s).to eq(formula.to_s) }
+      it{ expect((0.0 / formula).to_s).to eq('0') }
+      it{ expect((1.0 / formula).to_s).to eq('( 1 / ( x + y ) )') }
+      it{ expect((0.0 ^ formula).to_s).to eq('0') }
+      it{ expect((1.0 ^ formula).to_s).to eq('1') }
+    end
+
+    context 'With Symbol' do
+      it{ expect(0.0 + :x).to eq(:x) }
+      it{ expect((0.0 - :x).to_s).to eq('( - x )') }
+      it{ expect((0.0 * :x).to_s).to eq('0') }
+      it{ expect(1.0 * :x).to eq(:x) }
+      it{ expect((0.0 / :x).to_s).to eq('0') }
+      it{ expect((1.0 / :x).to_s).to eq('( 1 / x )') }
+      it{ expect((0.0 ^ :x).to_s).to eq('0') }
+      it{ expect((1.0 ^ :x).to_s).to eq('1') }
+    end
+
+    context 'With Float' do
+      it{ expect(0.0 + 3.0).to eq(3.0) }
+      it{ expect(3.0 + 0.0).to eq(3.0) }
+      it{ expect(2.0 + 3.0).to eq(5.0) }
+
+      it{ expect(0.0 - 3.0).to eq(-3.0) }
+      it{ expect(3.0 - 0.0).to eq(3.0) }
+      it{ expect(2.0 - 3.0).to eq(-1.0) }
+
+      it{ expect(0.0 * 3.0).to eq(0.0) }
+      it{ expect(3.0 * 0.0).to eq(0.0) }
+      it{ expect(1.0 * 3.0).to eq(3.0) }
+      it{ expect(3.0 * 1.0).to eq(3.0) }
+      it{ expect(3.0 * 2.0).to eq(6.0) }
+
+      it{ expect(0.0 / 3.0).to eq(0.0) }
+      it{ expect(3.0 / 0.0).to eq(oo) }
+      it{ expect(3.0 / 1.0).to eq(3.0) }
+      # TODO:
+      it{ expect(2.0 / 3.0).to eq(0.6666666666666666) }
+
+
+      it{ expect(0.0 ^ 3.0).to eq(0.0) }
+      it{ expect(3.0 ^ 0.0).to eq(1.0) }
+      it{ expect(1.0 ^ 3.0).to eq(1.0) }
+      it{ expect(3.0 ^ 1.0).to eq(3.0) }
+      it{ expect(3.0 ^ 2.0).to eq(9.0) }
+    end
+  end
+end

data/spec/lib/integrand_spec.rb

@@ -30,13 +30,27 @@ describe Dydx:Integrand do
   it 'ex5' do
     $f = nil
     f(x) <= log(x)
-    expect(S(f(x), dx)[0, 1]).to eq(- Float::INFINITY)
+    expect(S(f(x), dx)[0, 1]).to eq(-oo)
   end
 
-  # TODO
   it 'ex6' do
     $f = nil
-    f(x) <= e ^ (- (x^2))
-    expect(S(f(x), dx)[-100, 100]).to eq(1.672428604536991)
+    f(x) <= e ^ (- (x ^ 2))
+    expect(f(0)).to eq(1)
+    expect(f(1)).to eq(1.0/Math::E)
+    expect(f(1000)).to eq(0)
+    expect(S(f(x), dx)[-1000, 1000, 3000]).to eq(1.7724538506374117)
+  end
+
+  it 'ex7' do
+    $f = nil
+    f(x) <= (1.0 / ( ( 2.0 * Math::PI ) ^ 0.5 ) ) * ( e ^ (- (x ^ 2) / 2) )
+    expect(S(f(x), dx)[-1000, 1000, 1000]).to eq(0.9952054164466917)
+  end
+
+  it 'ex8' do
+    $f = nil
+    f(x) <= (1.0 / ( ( 2.0 * pi ) ^ 0.5 ) ) * ( e ^ (- (x ^ 2) / 2) )
+    expect(S(f(x), dx)[-oo, oo, 1000]).to eq(0.9952054164466917)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gogotanaka
@@ -110,6 +110,7 @@ files:
 - spec/lib/algebra/set/cos_spec.rb
 - spec/lib/algebra/set/e_spec.rb
 - spec/lib/algebra/set/fixnum_spec.rb
+- spec/lib/algebra/set/float_spec.rb
 - spec/lib/algebra/set/log_spec.rb
 - spec/lib/algebra/set/num_spec.rb
 - spec/lib/algebra/set/pi_spec.rb
@@ -154,6 +155,7 @@ test_files:
 - spec/lib/algebra/set/cos_spec.rb
 - spec/lib/algebra/set/e_spec.rb
 - spec/lib/algebra/set/fixnum_spec.rb
+- spec/lib/algebra/set/float_spec.rb
 - spec/lib/algebra/set/log_spec.rb
 - spec/lib/algebra/set/num_spec.rb
 - spec/lib/algebra/set/pi_spec.rb