dydx 0.1.28 → 0.1.29

data/dydx.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["gogotanaka"]
   spec.email         = ["qlli.illb@gmail.com"]
   spec.homepage      = "https://github.com/gogotanaka"
-  spec.summary       = %q{We can enjoy the derivative.}
-  spec.description   = %q{It is possible to use the differential using the Symbol and Fixnum by including the Dydx. And, we can use the natural logarithm and log.}
+  spec.summary       = %q{We can enjoy the math.}
+  spec.description   = %q{Dydx is new math DSL in Ruby. The most important thing in this DSL is we can handle math in the same sense sense of the math on paper.}
 
   spec.license       = "MIT"
 

data/lib/dydx/algebra/formula.rb

@@ -11,10 +11,8 @@ module Dydx
 
       def differentiate(sym=:x)
         case @operator
-        when :+
-          f.d(sym) + g.d(sym)
-        when :*
-          (f.d(sym) * g) + (f * g.d(sym))
+        when :+ then f.d(sym) + g.d(sym)
+        when :* then (f.d(sym) * g) + (f * g.d(sym))
         when :^
           # TODO:
           if g.is_num?
@@ -31,18 +29,14 @@ module Dydx
       alias_method :d, :differentiate
 
       def to_s
-        if (multiplication? && (f.is_minus1? || g.is_minus1?)  )
+        if (formula?(:*) && (f.is_minus1? || g.is_minus1?)  )
           "( - #{g.to_s} )"
-        elsif multiplication? && g.inverse?(:*)
-          "( #{f.to_s} / #{g.x.to_s} )"
-        elsif multiplication? && f.inverse?(:*)
-          "( #{g.to_s} / #{f.x.to_s} )"
-        elsif addition? && g.inverse?(:+)
-          "( #{f.to_s} - #{g.x.to_s} )"
-        elsif addition? && f.inverse?(:+)
-          "( #{g.to_s} - #{f.x.to_s} )"
+        elsif g.inverse?(operator)
+          "( #{f.to_s} #{inverse_ope(operator)} #{g.x.to_s} )"
+        elsif f.inverse?(operator)
+          "( #{g.to_s} #{inverse_ope(operator)} #{f.x.to_s} )"
         else
-          "( #{f.to_s} #{@operator} #{g.to_s} )"
+          "( #{f.to_s} #{operator} #{g.to_s} )"
         end
       end
 

data/lib/dydx/algebra/inverse.rb

@@ -9,12 +9,9 @@ module Dydx
       end
 
       def to_s
-        # sym = {'*'=>'/', '+'=>'-'}[operator.to_s]
         case operator
-        when :+
-          "( - #{x} )"
-        when :*
-          "( 1 / #{x} )"
+        when :+ then "( - #{x} )"
+        when :* then "( 1 / #{x} )"
         end
       end
 
@@ -27,10 +24,6 @@ module Dydx
         end
       end
       alias_method :d, :differentiate
-
-      def ==(x)
-        to_s == x.to_s
-      end
     end
   end
-end
+end

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

@@ -13,6 +13,8 @@ module Dydx
                 else
                   super(x)
                 end
+              elsif formula?(sub_ope(operator)) && openable?(operator, x)
+                f.send(operator, x).send(sub_ope(operator), g.send(operator, x))
               elsif formula?(super_ope(operator)) && x.formula?(super_ope(operator))
                 w1, w2 = common_factors(x)
                 return super(x) unless (w1 && w2) && (super_ope(operator).commutative? || w1 == w2)
@@ -49,11 +51,13 @@ module Dydx
             end
           end
 
-          def ^(x)
-            if multiplication? && openable?(:^, x)
-              (f ^ x).send(self.operator, (g ^ x))
-            else
-              super(x)
+          %w(^).map(&:to_sym).each do |operator|
+            define_method(operator) do |x|
+              if formula?(sub_ope(operator)) && openable?(operator, x)
+                f.send(operator, x).send(sub_ope(operator), g.send(operator, x))
+              else
+                super(x)
+              end
             end
           end
         end

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

@@ -43,8 +43,8 @@ module Dydx
                 else
                   super(x)
                 end
-              elsif [:*].include?(operator) && x.inverse?(:+)
-                inverse(::Algebra::Formula.new(self, x.x, operator.to_sym), :+)
+              elsif operator == :* && x.inverse?(:+)
+                -(self * x.x)
               else
                 super(x)
               end

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

@@ -4,7 +4,7 @@ module Dydx
       module Parts
         module Symbol
           def *(x)
-            if x.exponentiation? &&
+            if x.formula?(:^) &&
               self == x.f
 
               self ^ (1 + x.g)

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

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

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

@@ -12,10 +12,11 @@ module Dydx
           "sin( #{x.to_s} )"
         end
 
-        def d(sym=:x)
+        def differentiate(sym=:x)
           cos(x) * x.d(sym)
         end
+        alias_method :d, :differentiate
       end
     end
   end
-end
+end

data/lib/dydx/helper.rb

@@ -62,6 +62,7 @@ module Dydx
       case operator
       when :+
         (is_num? && x.is_num?) ||
+        (formula?(:*) && (f.is_num? || g.is_num?)) && x.is_num? ||
         like_term?(x) ||
         inverse?(:+, x)
       when :*
@@ -110,9 +111,6 @@ module Dydx
       ([:f, :g] - [f_or_g]).first
     end
 
-    def commutative?
-    end
-
     def distributable?(operator)
     end
 

data/lib/dydx/version.rb

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

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

@@ -47,6 +47,11 @@ 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 + 3) * 2).to eq(x * 2 + 6) }
+  # it{ expect((x - 3) * 2).to eq(x * 2 - 6) }
+  it{ expect((x + 3) * 2).to eq(x * 2 + 6) }
+  it{ expect((x + 3) * 2).to eq(x * 2 + 6) }
+
   it{ expect(((:x * 2) ^ 2).to_s).to eq('( 4 * ( x ^ 2 ) )') }
   it{ expect(((:x / 2) ^ 2).to_s).to eq('( ( x ^ 2 ) / 4 )') }
 

data/spec/lib/function_spec.rb

@@ -28,8 +28,8 @@ describe Dydx:Function do
 
   it{ expect(h(a, b, c) <= d/db(g(a, b))).to eq(h(a, b, c)) }
   it{ expect(h(a, b, c) <= d/db(g(a, b))).to eq($h) }
-  it{ expect(h(a, b, c)).to eq(( ( 2 * b ) + a )) }
-  it{ expect(h(a, b, c).algebra).to eq(( ( 2 * b ) + a )) }
+  it{ expect(h(a, b, c)).to eq(( a + ( 2 * b ) )) }
+  it{ expect(h(a, b, c).algebra).to eq(( a + ( 2 * b ) )) }
 
   it 'ex.4' do
     $f = nil

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dydx
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
+  prerelease: 
 platform: ruby
 authors:
 - gogotanaka
@@ -13,56 +14,62 @@ 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
-  including the Dydx. And, we can use the natural logarithm and log.
+description: Dydx is new math DSL in Ruby. The most important thing in this DSL is
+  we can handle math in the same sense sense of the math on paper.
 email:
 - qlli.illb@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,27 +132,34 @@ 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: -4040478879646027093
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4040478879646027093
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: We can enjoy the derivative.
+specification_version: 3
+summary: We can enjoy the math.
 test_files:
 - spec/dydx_spec.rb
 - spec/lib/algebra/formula_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a53690ed9d47e90702608c9276bdf2dd76af42f4
-  data.tar.gz: eb525a3c66c33109a6c70a621c1dfaff1fe31bb4
-SHA512:
-  metadata.gz: afc1fabc722750af74ff12f064479928cbc3863066d76f20bb74aa46317bd556c3d90d92abf0365c528feaa76029c00e245b5ee31140a5ad2721e9145172b6c6
-  data.tar.gz: a1f587f80289788da9b414af04c3efe270a49b5a4e84287c88a6c58a3d7fc2bcb6619fb6e95b9a00650e2782f4ef0cf4749bac894d34790b5b80144561c094fe