ChebyRuby 0.0.2.pre → 0.0.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9e90673dcb994d2b9e512a949a173a875c3264
-  data.tar.gz: bd39e0f58ac5668df89c99ae1f255c1eea25458c
+  metadata.gz: 7a3b71091027ccab487114bd6bbdeb2dd47dddce
+  data.tar.gz: 9545f1e34a6e515bdb9343e893852a1acb3b1b10
 SHA512:
-  metadata.gz: 25c353b12eee3bc7c9799b319fe04c469d53b9c3db0cc80eae5f4d97b1d7f2a7606c78ebe780d617e2f5b027f3ae2047248ae03a53efcbcc9d28830fcf46409a
-  data.tar.gz: 053d27aac92aed0404ee6c49f4700917ac609594a9e18263c46c22af27745b5e22a967f6d96adc6ee3d3084b1ef34919140a9664ef01eea0945de4da3a8df76d
+  metadata.gz: 5de743407a61d1199cea8a825a94a8f83f29c78bb34419cbb07195c74fc37faf74293432d7d13c50106921d4e8266d368cdb372a1e3061bb89fb27c477583be6
+  data.tar.gz: a509277ec4e7dec53edd9d78fe3d9b8bfe4df9d3a3516147d419f9832166f891d3e1e1dc10bb7b8dd411f6367430d48d9c546529b60e153b35005191b027273c

data/lib/chebyruby/expression.rb

@@ -0,0 +1,43 @@
+# require_relative 'univariate_function'
+
+class Expression
+  attr_accessor :left, :op, :right
+
+  def initialize(left, op, right)
+    @left = left
+    @op = op
+    @right = right
+  end
+
+  def method_missing(method, *args)
+    Expression.new(self, method, Variable.new(args[0]))
+  end
+
+  def vars
+    a = []
+    nested?[:left] ? a << left.vars : a << left.x
+    nested?[:right] ? a << right.vars : a << right.x
+    a.flatten
+  end
+
+  def nested?
+    {:right => (Expression === right),
+     :left => (Expression === left)}
+  end
+
+  def to_s
+    if nested?[:left]
+      s = "#{left.to_s} #{op}"
+    else
+      s = "#{left} #{op}"
+    end
+    case right
+    when Variable then "#{s} #{right.x}".strip
+    when Expression then "#{s} #{right.to_s}".strip
+    else "#{s} #{right}".strip
+    end
+  end
+
+  def to_func
+  end
+end

data/lib/chebyruby/univariate_function.rb

@@ -18,4 +18,5 @@ class ChebyRuby::UnivariateFunction
   def value(x)
     func.call(x.to_f)
   end
-end
+
+end

data/lib/chebyruby/variable.rb

@@ -0,0 +1,64 @@
+require_relative 'expression'
+
+class Variable
+  attr_accessor :x, :neg
+
+  def initialize(x)
+    @x = x
+    @neg = false
+  end
+
+  def method_missing(method, *args)
+    Expression.new(self, method, Variable.new(args[0]))
+  end
+
+  def to_a
+    if x.class == Array
+      x
+    else
+      [x]
+    end
+  end
+
+  def -@
+    @neg = true
+  end
+
+  def to_enum
+    Array.new(to_ary).to_enum
+  end
+
+  def right
+    nil
+  end
+
+  def to_s
+    "#{x}"
+  end
+
+  def parseable
+    to_enum.map do |i|
+      if Array === i
+        i.parseable
+      elsif Symbol === i
+        i
+      else
+        i.x
+      end
+    end
+  end
+
+  alias to_ary to_a
+end
+
+class Array
+  def parseable
+    Variable.new(self).parseable
+  end
+end
+
+class Symbol
+  def parseable
+    self
+  end
+end

data/test/test_integration.rb

@@ -0,0 +1,16 @@
+require 'minitest/autorun'
+require 'chebyruby'
+
+class TestIntegration < Minitest::Test
+  include ChebyRuby::Integration
+  def setup
+    @sin = ChebyRuby::UnivariateFunction.new {|x| Math.sin(x)}
+    @exp = ChebyRuby::UnivariateFunction.new {|x| Math.exp(x)}
+    @pol = ChebyRuby::UnivariateFunction.new {|x| x**2 + 2*x + 1}
+    @x   = ChebyRuby::UnivariateFunction.new {|x| x}
+  end
+
+  def test_integration
+    assert_in_delta 0, trap_integrate(@sin, 0, Math::PI * 2), 1e-8
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ChebyRuby
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre
+  version: 0.0.3.pre
 platform: ruby
 authors:
 - Eli Sadoff
@@ -20,12 +20,15 @@ files:
 - bin/chebyruby
 - lib/chebyruby.rb
 - lib/chebyruby/differentiation.rb
+- lib/chebyruby/expression.rb
 - lib/chebyruby/finite_differencing.rb
 - lib/chebyruby/integration.rb
 - lib/chebyruby/romberg_integration.rb
 - lib/chebyruby/simpsons_integration.rb
 - lib/chebyruby/univariate_function.rb
+- lib/chebyruby/variable.rb
 - test/test_function.rb
+- test/test_integration.rb
 homepage: https://github.com/snood1205/chebyruby
 licenses:
 - MIT
@@ -46,10 +49,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A gem for numerical analysis and scientific computing.This is a pre-release
   so beware.
 test_files:
 - test/test_function.rb
+- test/test_integration.rb