dydx 0.0.2 → 0.0.3

data/lib/dydx/algebra.rb

@@ -20,6 +20,10 @@ module Dydx
               g.is_a?(Base)
 
               Num.new(self).send(operator.to_sym, g)
+            elsif operator == '^' && g.is_a?(Fixnum)
+              result = 1
+              g.times{ result *= self }
+              result
             else
               (to_f.send(operator.to_sym, g)).to_i
             end

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

@@ -3,7 +3,7 @@ module Dydx
     module Operator
       module Parts
         module Formula
-          %w(+ -).each do |operator|
+          %w(+ -).map(&:to_sym).each do |operator|
             define_method(operator) do |x|
               if multiplication? && x.multiplication?
                 if f == x.f
@@ -13,22 +13,46 @@ module Dydx
                 else
                   super(x)
                 end
+              elsif ([self.operator, operator].sort == [:+, :-]) && ( f == x || g == x )
+                if f == x
+                  g
+                elsif g == x
+                  f
+                end
+              elsif (self.operator == operator) && ( f == x || g == x )
+                if f == x
+                  f.send(operator, x).send(operator, g)
+                elsif g == x
+                  f.send(operator, g.send(:+, x))
+                end
               else
                 super(x)
               end
             end
           end
 
-          %w(* /).each do |operator|
+          %w(* /).map(&:to_sym).each do |operator|
             define_method(operator) do |x|
               if exponentiation? && x.exponentiation?
                 if f == x.f
-                  f ^ g.send({'*'=>'+', '/'=>'-'}[operator], x.g)
+                  f ^ g.send({'*'=>'+', '/'=>'-'}[operator.to_s], x.g)
                 elsif g == x.g
                   f.send(operator, x.f) ^ g
                 else
                   super(x)
                 end
+              elsif ([self.operator, operator].sort == [:*, :/]) && ( f == x || g == x )
+                if f == x
+                  g
+                elsif g == x
+                  f
+                end
+              elsif (self.operator == operator) && ( f == x || g == x )
+                if f == x
+                  f.send(operator, x).send(operator, g)
+                elsif g == x
+                  f.send(operator, g.send(:* , x))
+                end
               else
                 super(x)
               end

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

@@ -44,6 +44,8 @@ module Dydx
           def ^(x)
             if (n == 0) || (n == 1)
               self
+            elsif x.is_a?(Num)
+              _(n ^ x.n)
             else
               super(x)
             end

data/lib/dydx/algebra/set/num.rb

@@ -16,6 +16,10 @@ module Dydx
         def to_s
           @n.to_s
         end
+
+        def ==(x)
+          x.is_a?(Num) && n == x.n
+        end
       end
     end
   end

data/lib/dydx/version.rb

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

data/spec/lib/algebra/formula_spec.rb

@@ -65,4 +65,10 @@ describe Dydx::Algebra::Formula do
     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

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

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

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

@@ -12,6 +12,10 @@ describe Dydx::Algebra::Set::Num do
     it{ expect(_(1).d(:x).to_s).to eq(_(0).to_s) }
   end
 
+  describe '#==' do
+    it{ expect(_(1) == _(1)).to be_true }
+  end
+
   describe 'Calculate' do
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - gogotanaka
@@ -13,43 +14,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: It is possible to use the differential using the Symbol and Fixnum by
@@ -60,9 +67,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -113,26 +120,33 @@ files:
 homepage: https://github.com/gogotanaka
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3588905385522331028
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3588905385522331028
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: We can enjoy the derivative.
 test_files:
 - spec/dydx_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8ec6bd373a47873bdafe89c3d13330f76ba28e0c
-  data.tar.gz: d65b0b2e28ba2e7af9448fbc85faff29b469497f
-SHA512:
-  metadata.gz: 50c0d17b503141dffc4ee4268cfce736ba72c50e9eda312ecdfd4f6b8a121210132ec58142c6145cff4169337dac1386fc5d61fb576da63ddc2e92abfa5d3816
-  data.tar.gz: 065b046b6f972ffb1c46c2ff6312cd9c659be35dddc7ef39d189762b01ebff7a80df34ab3a304128b86d3addeb056057dd647e10ab32800d9f33e409248ddbd9