dydx 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895af6b98a1440dd693b35dd9e697ee6838f3a23
-  data.tar.gz: 5f987b396090e719f7aa22a524db87f34299b8af
+  metadata.gz: 05d9adcc67c3ad1cbaf217f11bf2d71a5926588a
+  data.tar.gz: bd230293d17b20bf98ab7b6af22d03a544454f15
 SHA512:
-  metadata.gz: 88dbb76bf4c5927fee44379a563ace65744db1e39b9215a47f0f94cde888756ce34e203b30a60a02a47f8f2a4d66879c9d5a6d0987c3f4986b1e00cbcfd275e2
-  data.tar.gz: 7e879f730952367fd530e3f356292f17c45913eba3aaab1b8989951924da4772b8c1173e78486ee0636045d75e5b9c50d914bfcb3731882ef4497d4e02fb83b6
+  metadata.gz: 96db75da9bb34f1dd34b4f7dc725d380031fd3092d93062e7d9289a41c35132612521ece1e3770ed0649f3c936ebd0daea965b13465a9c060f7b63258e7aa882
+  data.tar.gz: 47038bba5523d403d3f07153e22236e6f71d15846256d9f2db0772bf679834ac4c0b3ec9a16bd2b86f953ad268ee831e9fb9c6257529e4fe2b35046befafebd5

data/lib/dydx.rb

@@ -13,12 +13,16 @@ module Dydx
         raise ArgumentError, "invalid number of values (#{vars.count} for #{function.vars.count})" unless function.vars.count == vars.count
         return function if function.vars == vars
         if function.algebra
-          string = function.algebra.to_s
-                     .gsub('cos', 'Math.cos')
-                     .gsub('sin', 'Math.sin')
-                     .gsub('log', 'Math.log')
-                     .gsub('e', 'Math::E')
-                     .gsub('pi', 'Math::PI')
+          if vars.all?{|v| v.is_a?(Numeric)}
+            string = function.algebra.to_s
+                       .gsub('cos', 'Math.cos')
+                       .gsub('sin', 'Math.sin')
+                       .gsub('log', 'Math.log')
+                       .gsub('e', 'Math::E')
+                       .gsub('pi', 'Math::PI')
+          else
+            string = function.algebra.to_s
+          end
           function.vars.each_with_index do |var, i|
             string.gsub!(var.to_s, vars[i].to_s)
           end

data/lib/dydx/helper.rb

@@ -125,5 +125,9 @@ module Dydx
         [:+, :*].include?(self)
       end
     end
+
+    def ==(x)
+      to_s == x.to_s
+    end
   end
 end

data/lib/dydx/version.rb

@@ -1,3 +1,3 @@
 module Dydx
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/function_spec.rb

@@ -30,4 +30,10 @@ describe Dydx:Function do
   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 'ex.4' do
+    $f = nil
+    f(x) <= log(x)
+    expect(f(a)).to eq(log(a))
+  end
 end

data/spec/lib/integrand_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Dydx:Integrand do
   it 'ex1' do
+    $f = nil
     f(x, y) <= x * y
     integrand = S(f(x, y), dx)
     expect(integrand.function).to eq(f(x, y))

metadata

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