dydx 0.1.25 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e18dda6ca41f30bb45fdbc2f73c906c6e01c94
-  data.tar.gz: 14094dd2083a888d715e93eb0a1faa8aa6f9cf13
+  metadata.gz: a53690ed9d47e90702608c9276bdf2dd76af42f4
+  data.tar.gz: eb525a3c66c33109a6c70a621c1dfaff1fe31bb4
 SHA512:
-  metadata.gz: abbe8199d94ede3e5568aaf41c5d4dba0996af0b2da53e8313372d96d67c401c64e802f30777995f92fc966cb4e81740ffae5228ce352f711856793615435d3c
-  data.tar.gz: 12087ca360a5da0e9fa6c32ed5818d8b40c3044a1f9efa2da4bbf75772fad9794a5b7660eb6239009c051ebe30ac7f8ef293611caf16b3610c265709a6f5e7c8
+  metadata.gz: afc1fabc722750af74ff12f064479928cbc3863066d76f20bb74aa46317bd556c3d90d92abf0365c528feaa76029c00e245b5ee31140a5ad2721e9145172b6c6
+  data.tar.gz: a1f587f80289788da9b414af04c3efe270a49b5a4e84287c88a6c58a3d7fc2bcb6619fb6e95b9a00650e2782f4ef0cf4749bac894d34790b5b80144561c094fe

data/README.md

@@ -1,115 +1,95 @@
-# Dydx
-It always happens you want to differentiate some formulas with ruby. right?.....
+# Dydx is new math DSL in Ruby
 
-After `inlcude Dydx` , ruby become like other language.
+### Since you report a bug, I will fix it within 24 hours.
+
+The most important thing in this DSL is
 
-## Dydx is new math DSL in Ruby
+we can handle math in the same sense sense of the math on paper.
 
-I'm going to add for more explanation.
+ex. limit, trigonometric functions and logarithmic.
 
 
+After `inlcude Dydx` , ruby become like other language.
 
+## Outline
 ```ruby:
 require 'dydx'
 include Dydx
 
+# Define the function. syntax is not good enough...
 f(x) <= x ^ 2
 
 f(3)
-# => 9
+=> 9
 
 f(x).to_s
-# => "( x ^ 2 )"
+=> "( x ^ 2 )"
 
 f(x) == eval('f(x).to_s')
-# => true
+=> true
 
+# Differentiate
 g(x) <= d/dx(f(x))
 
 g(3)
-# => 6
+=> 6
 
-# => '2 * x'
+g(x).to_s
+=> '2 * x'
 
+# Integrate
 S(f(x), dx)[0, 1]
-# => 0.3333333333333334
+=> 0.3333333333333334
+```
+
+
+#### limit, trigonometric functions and logarithmic.
+```ruby:
+
+f(z) <= log(z)
+S(f(z), dz)[0,1]
+=> -Infinity
 
 ( d/dx(log(x)) ).to_s
-# => "( 1 / x )"
+=> "( 1 / x )"
 
 ( d/dx(cos(x)) ).to_s
-# => "( - sin( x ) )"
+=> "( - sin( x ) )"
 
 ( d/dx(e ^ x) ).to_s
-# => "( e ^ x )"
+=> "( e ^ x )"
 
 f(x) <= sin(x)
 S(f(x), dx)[0, Math::PI/2]
-# => 1.000000000021139
+=> 1.000000000021139
 
+# standard normal distribution;
 f(x) <= (1.0 / ( ( 2.0 * pi ) ^ 0.5 ) ) * ( e ^ (- (x ^ 2) / 2) )
 S(f(x), dx)[-oo, oo]
-# => 0.9952054164466917
+=> 0.9952054164466917
+```
+
+#### it's like a magic...
 
+```ruby:
 f(x) <= x ^ 2
 
 f(a + b).to_s
-# => "( ( a + b ) ^ 2 )"
+=> "( ( a + b ) ^ 2 )"
 
+#↓it"s magic!!!
 g(a, b) <= f(a + b)
 
 g(a, b).to_s
-# => "( ( a + b ) ^ 2 )"
+=> "( ( a + b ) ^ 2 )"
 
 g(2, 2)
-# => 16
+=> 16
 
 ( d/da(g(a, b)) ).to_s
 => "( 2 * ( a + b ) )"
-```
-
-
-
-
-
-```
-require 'dydx'
-include Dydx
-
-# There are three types of differential interface
-
-( d/dx(x^2) ).to_s
-=> "( 2 * x )"
-
-log(z).d(z).to_s
-=> "( 1 / z )"
 
-$y = e ^ x
-(dy/dx).to_s
-=> "( e ^ x )"
-
-```
-
-You may wonder why undefined `x` , `e` and `z` are handleable?
-
-`method_missing` solve this problem by converting undefine variable into internal class object.
-
-Like this.
-
-```
- x + x
-=> #<Dydx::Algebra::Formula:0x007fb0a4039fb0 @f=#<Dydx::Algebra::Set::Num:0x007fb0a48169e0 @n=2>, @operator=:*, @g=:x>
-
-e
-=> #<Dydx::Algebra::Set::E:0x007fb0a383e9f0>
-
-log(sin(x))
-=> #<Dydx::Algebra::Set::Log:0x007fe7cd971528 @f=#<Dydx::Algebra::Set::Sin:0x007fe7cd971550 @x=:x>>
-```
-
-And this DSL has strong simplify.
-
-```
+# simplify
 ((x * y) + (z * x)).to_s
 => "( x * ( y + z ) )"
 
@@ -120,38 +100,30 @@ And this DSL has strong simplify.
 => "( 2 * x )"
 ```
 
-I show some differential calculus.
-
-```
-# pretermit '#to_s'
-
-d/dz(log(z))
-=> "( 1 / z )"
-
-d/dx(x^n)
-=> "( n * ( x ^ ( n - 1 ) ) )"
-
-$y = cos(x)
-dy/dx
-=> "( - sin( x ) )"
 
-$x = a * ( (t ^ 2) / 2 )
-dx/dt
-=> "( a * t )"
+## Documents
+I'm going to write now...cominng soon....
 
-d/dt(dx/dt)
-=>"a"
-
-((x ^ 2) * y).d(x)
-=> "( ( 2 * x ) * y )"
-
-((x ^ 2) * y).d(x).d(y)
-=> "( 2 * x )"
+### Module, class configuration
 
 ```
-
-
-(That's wonderful!!!!! ..............)
+Dydx
+  |- Algebra
+  |      |- Set
+  |      |   |- Num
+  |      |   |- ....
+  |      |
+  |      |- Operator
+  |      |   |- Interface
+  |      |   |- ....
+  |      |
+  |      |- Formula
+  |      |- inverse
+  |
+  |- Function
+  |- Delta
+  |- Integrand
+```
 
 ## Installation
 

data/lib/dydx/algebra/formula.rb

@@ -5,6 +5,7 @@ module Dydx
       attr_accessor :f, :operator, :g
 
       def initialize(f, g, operator)
+        g, f = f, g if g.is_num? && operator.commutative?
         @f, @g, @operator = f, g, operator
       end
 

data/lib/dydx/helper.rb

@@ -61,10 +61,8 @@ module Dydx
     def combinable?(x, operator)
       case operator
       when :+
-        self == x ||
         (is_num? && x.is_num?) ||
-        (multiplication? && (f == x || g == x)) ||
-        (x.multiplication? && (x.f == self || x.g == self)) ||
+        like_term?(x) ||
         inverse?(:+, x)
       when :*
         self == x ||
@@ -75,6 +73,18 @@ module Dydx
       end
     end
 
+    def like_term?(x)
+      boolean = if self == x
+      elsif formula?(:*) && include?(x)
+      elsif x.formula?(:*) && x.include?(self)
+      elsif ((formula?(:*) && formula?(:*)) && (([f, g] & [x.f, x.g]).any?{|x| x.is_a?(Symbol)}))
+      else
+        true
+      end
+
+     !boolean
+    end
+
     def is_multiple_of(x)
       if is_0?
         e0

data/lib/dydx/version.rb

@@ -1,3 +1,3 @@
 module Dydx
-  VERSION = "0.1.25"
+  VERSION = "0.1.28"
 end

data/spec/dydx_spec.rb

@@ -17,8 +17,8 @@ describe Dydx do
     $b = (:x ^ (:x * 2))
     let(:d1){ db/dx }
     let(:d2){ d/dx($b) }
-    it{ expect(d1.to_s).to eq('( ( x * 2 ) * ( x ^ ( ( x * 2 ) - 1 ) ) )') }
-    it{ expect(d2.to_s).to eq('( ( x * 2 ) * ( x ^ ( ( x * 2 ) - 1 ) ) )') }
+    it{ expect(d1.to_s).to eq('( ( 2 * x ) * ( x ^ ( ( 2 * x ) - 1 ) ) )') }
+    it{ expect(d2.to_s).to eq('( ( 2 * x ) * ( x ^ ( ( 2 * x ) - 1 ) ) )') }
   end
 
   context 'ex3' do

data/spec/lib/algebra/operator/parts/formula_spec.rb

@@ -47,10 +47,12 @@ describe Dydx::Algebra::Operator::Parts::Formula do
   it{ expect((:y - (:x - :y)).to_s).to eq('( ( 2 * y ) - x )') }
   it{ expect((:y - (:y - :x)).to_s).to eq('x') }
 
-  it{ expect(((:x * 2) ^ 2).to_s).to eq('( ( x ^ 2 ) * 4 )') }
+  it{ expect(((:x * 2) ^ 2).to_s).to eq('( 4 * ( x ^ 2 ) )') }
   it{ expect(((:x / 2) ^ 2).to_s).to eq('( ( x ^ 2 ) / 4 )') }
 
+  it{ expect((3*x + 4*(x^2)+ 4*x).to_s).to eq('( ( 7 * x ) + ( 4 * ( x ^ 2 ) ) )') }
+
   # TODO:
-  it{ expect((2 ^ (:x * 2)).to_s).to eq('( 2 ^ ( x * 2 ) )') }
+  it{ expect((2 ^ (:x * 2)).to_s).to eq('( 2 ^ ( 2 * x ) )') }
   it{ expect((2 ^ (:x / 2)).to_s).to eq('( 2 ^ ( x / 2 ) )') }
 end

data/spec/lib/helper_spec.rb

@@ -25,6 +25,11 @@ describe Helper do
     it{ expect((:x * :y).is_multiple_of(:z)).to be_false }
   end
 
+  context '#like_term?' do
+    it{ expect(x.like_term?(x)).to be_true }
+    it{ expect((2 * x).like_term?((3 * x))).to be_true }
+  end
+
   context '#combinable?' do
     it{ expect(:x.combinable?(:x, :+)).to be_true }
     it{ expect(:x.combinable?(2 * :x, :+)).to be_true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.28
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler