dydx 0.1.412 → 0.1.41421

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05be03d422e433fa724050ae6c77c6de2044005d
-  data.tar.gz: 5a8ef94f9d271d9383ac3308c0f77acec91c6864
+  metadata.gz: 220e4986b77c2c86709b2fdd5c237c4bfdd14e7a
+  data.tar.gz: fdf1336073d4c594af4ff01b1818d86790ee821d
 SHA512:
-  metadata.gz: 9c2d8881754f7ee43700223926c2a249d91c3431bcc49ce9886c8c2991e5c58694a83626d5d1947c97c822208159d487343d8a85e353448ad7843177446757a7
-  data.tar.gz: 4a89a20e3810e52c23c97d88dd915e2a54263374e3f1a9b8a52ca444f9f1e3b219e63d1367be693a3787bf4f10f6e69f86baf6e9bc97ab1d2f2c7c5b46590760
+  metadata.gz: d0378ecf27babc0f72147e1c580d113aef606c4c75ce061df0bba1a98279615c6491900b7a9078f03cba499cd814c4574ab25b15fa572f17c0e41f64398074db
+  data.tar.gz: 43e1aeee044edb2b3e23fbe4c1f4e541d07c3584bc30d73a76283705b49029c24961cbad68e50d9328bfd479ab6c509a5201eca1ab737934535555991d9396d7

data/lib/dydx/algebra/formula.rb

@@ -31,6 +31,7 @@ module Dydx
 
       # TODO: Cylomatic complexity for differentiate is too high. [7/6]
       def differentiate(sym = :x)
+
         case @operator
         when :+ then f.d(sym) + g.d(sym)
         when :* then (f.d(sym) * g) + (f * g.d(sym))
@@ -38,8 +39,12 @@ module Dydx
           # TODO:
           if g.num?
             f.d(sym) * g * (f ** (g - 1))
-          elsif f == sym
-            g * (f ** (g - 1))
+          elsif (f == sym) && (
+              g.num? || (
+                g.is_a?(Symbol) && g != sym
+              )
+            )
+            g * f ** (g - 1)
           elsif f == e
             g.d(sym) * self
           else
@@ -50,12 +55,14 @@ module Dydx
       alias_method :d, :differentiate
 
       def to_s
-        if formula?(:*) && (f.minus1? || g.minus1?)
+        str = if formula?(:*) && (f.minus1? || g.minus1?)
           "( - #{g} )"
         elsif g.inverse?(operator)
           "( #{f} #{operator.inv} #{g.x} )"
         elsif f.inverse?(operator)
           "( #{g} #{operator.inv} #{f.x} )"
+        elsif f.negative?
+          "( #{g} - #{f.n.abs} )"
         elsif formula?(:*) && !rationals.empty?
           terms = [f, g]
           terms.delete(rationals.first)

data/lib/dydx/helper.rb

@@ -36,6 +36,10 @@ module Dydx
       [-1, -1.0].include?(self) || (is_a?(Num) && n.minus1?)
     end
 
+    def negative?
+      num? && self < 0
+    end
+
     def distributive?(ope1, ope2)
       [ope1.super, ope1.inv_super].include?(ope2)
     end

data/lib/dydx/version.rb

@@ -1,3 +1,3 @@
 module Dydx
-  VERSION = '0.1.412'
+  VERSION = '0.1.41421'
 end

data/spec/lib/delta_spec.rb

@@ -13,14 +13,16 @@ describe Dydx::Delta do
 
   it 'ex1' do
     $y = x ** n
-    expect(dy/dx).to eq( n * ( x ** ( n - 1 ) ) )
-    expect(d/dx($y)).to eq( n * ( x ** ( n - 1 ) ) )
+    expect(d/dx($y)).to eq( n * ( x ** ( n - 1 ) ))
   end
 
   it 'ex2' do
     $y = x ** (x * 2)
-    expect(dy/dx).to eq(( 2 * x ) * ( x ** ( ( 2 * x ) - 1 ) ))
-    expect(d/dx($y)).to eq(( 2 * x ) * ( x ** ( ( 2 * x ) - 1 ) ))
+    expect(
+      eval((d/dx($y)).to_s)
+    ).to eq(
+     ( ( x ** ( 2 * x ) ) * ( 2 * ( 1 + log( x ) ) ) )
+    )
   end
 
   it 'ex3' do
@@ -32,4 +34,14 @@ describe Dydx::Delta do
     $y = 2 * (e ** (2 * z))
     expect(dy/dz).to eq(4 * ( e ** ( 2 * z ) ))
   end
+
+  it 'ex5' do
+    $y = 2 ** x
+    expect(dy/dx).to eq(( 2 ** x ) * log( 2 ))
+  end
+
+  it 'ex6' do
+    $y = x ** x
+    expect(dy/dx).to eq(x ** x * (log(x) + 1))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.1.412
+  version: 0.1.41421
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler