dydx 0.0.3 → 0.0.4

data/lib/dydx/algebra/formula.rb

@@ -37,6 +37,10 @@ module Dydx
           "( #{f.to_s} #{@operator} #{g.to_s} )"
         end
       end
+
+      def include?(x)
+        f == x || g == x
+      end
     end
   end
 end

data/lib/dydx/algebra/operator/parts/formula.rb

@@ -13,13 +13,13 @@ module Dydx
                 else
                   super(x)
                 end
-              elsif ([self.operator, operator].sort == [:+, :-]) && ( f == x || g == x )
+              elsif ([self.operator, operator].sort == [:+, :-]) &&  include?(x)
                 if f == x
                   g
                 elsif g == x
                   f
                 end
-              elsif (self.operator == operator) && ( f == x || g == x )
+              elsif (self.operator == operator) && include?(x)
                 if f == x
                   f.send(operator, x).send(operator, g)
                 elsif g == x
@@ -41,13 +41,13 @@ module Dydx
                 else
                   super(x)
                 end
-              elsif ([self.operator, operator].sort == [:*, :/]) && ( f == x || g == x )
+              elsif ([self.operator, operator].sort == [:*, :/]) &&  include?(x)
                 if f == x
                   g
                 elsif g == x
                   f
                 end
-              elsif (self.operator == operator) && ( f == x || g == x )
+              elsif (self.operator == operator) && include?(x)
                 if f == x
                   f.send(operator, x).send(operator, g)
                 elsif g == x

data/lib/dydx/version.rb

@@ -1,3 +1,3 @@
 module Dydx
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dydx_spec.rb

@@ -4,4 +4,28 @@ describe Dydx do
   it 'has a version number' do
     expect(Dydx::VERSION).not_to be nil
   end
+
+  context 'ex1' do
+    $a = (:x ^ :n)
+    let(:d1){ da/dx }
+    let(:d2){ d/dx($a) }
+    it{ expect(d1.to_s).to eq('( n * ( x ^ ( n - 1 ) ) )') }
+    it{ expect(d2.to_s).to eq('( n * ( x ^ ( n - 1 ) ) )') }
+  end
+
+  context 'ex2' 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 ) ) )') }
+  end
+
+  context 'ex3' do
+    $c = (:t ^ 2) / 2
+    let(:d1){ dc/dt }
+    let(:d2){ d/dt($c) }
+    it{ expect(d1.to_s).to eq('t') }
+    it{ expect(d2.to_s).to eq('t') }
+  end
 end

data/spec/lib/algebra/formula_spec.rb

@@ -50,25 +50,8 @@ describe Dydx::Algebra::Formula do
     it{ expect(exponentiation.d(:z).to_s).to eq('0') }
   end
 
-  context 'With Symbol' do
-    $a = (:x ^ :n)
-    let(:d1){ da/dx }
-    let(:d2){ d/dx($a) }
-    it{ expect(d1.to_s).to eq('( n * ( x ^ ( n - 1 ) ) )') }
-    it{ expect(d2.to_s).to eq('( n * ( x ^ ( n - 1 ) ) )') }
+  describe '#include?' do
+    it{ expect(addition.include?(:x)).to be_true }
+    it{ expect(addition.include?(:z)).to be_false }
   end
-
-  context 'With Symbol' 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 ) ) )') }
-  end
-
-  $c = (:t ^ 2) / 2
-  let(:d1){ dc/dt }
-  let(:d2){ d/dt($c) }
-  it{ expect(d1.to_s).to eq('t') }
-  it{ expect(d2.to_s).to eq('t') }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3588905385522331028
+      hash: -708242121294730939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3588905385522331028
+      hash: -708242121294730939
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23