symbolic 0.3.7 → 0.3.8

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'symbolic'
-require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'

data/spec/symbolic/equal_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe Symbolic do
+  let(:x) { var :name => :x, :value => 1 }
+
+  it 'variables equality is instance equality' do
+    x.should_not == var(:name => :x, :value => 1)
+  end
+
+  it 'should be equal (sub-groups)' do
+    s = 3 + x
+    a = s*3
+    b = s*3
+    a.should == a
+    a.should == b
+    b.should == a
+  end
+end

data/spec/symbolic_spec.rb

@@ -1,141 +1,49 @@
-require File.expand_path(File.dirname(__FILE__) +'/spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
-describe "Symbolic" do
-  before(:all) do
-    @x = var :name => :x, :value => 1
-    @y = var :name => :y, :value => 2
-  end
+describe Symbolic do
+  let(:var) { Object.new.extend Symbolic }
 
-  def expression(string)
-    eval string.gsub(/[xy]/, '@\0')
+  it 'should handle unary plus' do
+    (+var).should == var
   end
 
-  def self.should_equal(conditions)
-    conditions.each do |non_optimized, optimized|
-      it non_optimized do
-        expression(non_optimized).should == expression(optimized)
-      end
-    end
+  it 'should handle unary minus' do
+    Symbolic::Factors.should_receive(:add).with(var, -1).and_return(:negative_value)
+    (-var).should == :negative_value
   end
 
-  def self.should_evaluate_to(conditions)
-    conditions.each do |symbolic_expression, result|
-      it symbolic_expression do
-        expression(symbolic_expression).value.should == result
-      end
-    end
+  it 'should handle binary plus' do
+    Symbolic::Summands.should_receive(:add).with(var, :other_var).and_return(:result)
+    (var + :other_var).should == :result
   end
 
-  def self.should_print(conditions)
-    conditions.each do |symbolic_expression, result|
-      it symbolic_expression do
-        expression(symbolic_expression).to_s.should == result
-      end
-    end
+  it 'should handle binary minus' do
+    Symbolic::Summands.should_receive(:subtract).with(var, :other_var).and_return(:result)
+    (var - :other_var).should == :result
   end
 
-  describe "evaluation (x=1, y=2):" do
-     should_evaluate_to \
-     'x'         => 1,
-     'y'         => 2,
-     '+x'        => 1,
-     '-x'        => -1,
-     'x + 4'     => 5,
-     '3 + x'     => 4,
-     'x + y'     => 3,
-     'x - 1'     => 0,
-     '1 - x'     => 0,
-     'x - y'     => -1,
-     '-x + 3'    => 2,
-     '-y - x'    => -3,
-     'x*3'       => 3,
-     '4*y'       => 8,
-     '(+x)*(-y)' => -2,
-     'x/2'       => 0.5,
-     'y/2'       => 1,
-     '-2/x'      => -2,
-     '4/(-y)'    => -2,
-     'x**2'      => 1,
-     '4**y'      => 16,
-     'y**x'      => 2
-   end
-
-  describe "optimization:" do
-    should_equal \
-    '-(-x)'       => 'x',
-
-    '0 + x'       => 'x',
-    'x + 0'       => 'x',
-    'x + (-2)'    => 'x - 2',
-    '-2 + x'      => 'x - 2',
-    '-x + 2'      => '2 - x',
-    'x + (-y)'    => 'x - y',
-    '-y + x'      => 'x - y',
-
-    '0 - x'       => '-x',
-    'x - 0'       => 'x',
-    'x - (-2)'    => 'x + 2',
-    '-2 - (-x)'   => 'x - 2',
-    'x - (-y)'    => 'x + y',
-
-    '0 * x'       => '0',
-    'x * 0'       => '0',
-    '1 * x'       => 'x',
-    'x * 1'       => 'x',
-    '-1 * x'      => '-x',
-    'x * (-1)'    => '-x',
-    'x * (-3)'    => '-(x*3)',
-    '-3 * x'      => '-(x*3)',
-    '-3 * (-x)'   => 'x*3',
-    'x*(-y)'      => '-(x*y)',
-    '-x*y'        => '-(x*y)',
-    '(-x)*(-y)'   => 'x*y',
-
-    '0 / x'       => '0',
-    'x / 1'       => 'x',
+  it 'should handle multiplication' do
+    Symbolic::Factors.should_receive(:add).with(var, :other_var).and_return(:result)
+    (var * :other_var).should == :result
+  end
 
-    '0**x'        => '0',
-    '1**x'        => '1',
-    'x**0'        => '1',
-    'x**1'        => 'x',
-    '(-x)**1'     => '-x',
-    '(-x)**2'     => 'x**2',
-    '(x**2)**y'   => 'x**(2*y)',
+  it 'should handle division' do
+    Symbolic::Factors.should_receive(:subtract).with(var, :other_var).and_return(:result)
+    (var / :other_var).should == :result
+  end
 
-    'x*4*x'       => '4*x**2',
-    'x*(-1)*x**(-1)' => '-1',
-    'x**2*(-1)*x**(-1)' => '-x',
-    'x + y - x' => 'y',
-    '2*x + x**1 - y**2/y - y' => '3*x - 2*y',
-    '-(x+4)' => '-x-4'
+  it 'should handle exponentation' do
+    Symbolic::Factors.should_receive(:power).with(var, :other_var).and_return(:result)
+    (var ** :other_var).should == :result
   end
 
-  describe 'general methods:' do
-    should_equal \
-    'x.variables' => '[x]',
-    '(-(x+y)).variables' => '[x,y]',
-    '(-x**y-4*y+5-y/x).operations' =>
-    '{"+" => 1, "-" => 2, "*" => 1, "/" => 1, "-@" => 1, "**" => 1}'
+  it 'should delegate string representation to Printer' do
+    Symbolic::Printer.should_receive(:print).with(var).and_return(:string)
+    var.to_s.should == :string
   end
 
-  describe "to_s:" do
-    should_print \
-    'x' => 'x',
-    '-x' => '-x',
-    'x+1' => 'x+1',
-    'x-4' => 'x-4',
-    '-x-4' => '-x-4',
-    '-(x+y)' => '-x-y',
-    '-(x-y)' => '-x+y',
-    'x*y' => 'x*y',
-    '(-x)*y' => '-x*y',
-    '(x+2)*(y+3)*4' => '4*(x+2)*(y+3)',
-    '4/x' => '4/x',
-    '2*x**(-1)*y**(-1)' => '2/(x*y)',
-    '(-(2+x))/(-(-y))' => '(-x-2)/y',
-    'x**y' => 'x**y',
-    'x**(y-4)' => 'x**(y-4)',
-    '(x+1)**(y*2)' => '(x+1)**(2*y)',
-    '-(x**y -2)+5' => '-x**y+7'
+  it 'should redefine inspect' do
+    var.should_receive(:to_s).and_return(:string)
+    var.inspect.should == "Symbolic(string)"
   end
 end

data/symbolic.gemspec

@@ -0,0 +1,64 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "symbolic"
+  s.version = "0.3.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["brainopia"]
+  s.date = "2012-10-30"
+  s.description = "Symbolic math for ruby. This gem can help if you want to get a simplified form of a big equation or to speed up similar calculations or you need an abstraction layer for math. Symbolic does not have any external dependencies. It uses only pure ruby (less than 400 lines of code)."
+  s.email = "ravwar@gmail.com"
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "README.rdoc",
+    "Rakefile",
+    "lib/symbolic.rb",
+    "lib/symbolic/coerced.rb",
+    "lib/symbolic/constant.rb",
+    "lib/symbolic/constants.rb",
+    "lib/symbolic/expression.rb",
+    "lib/symbolic/extensions/kernel.rb",
+    "lib/symbolic/extensions/matrix.rb",
+    "lib/symbolic/extensions/module.rb",
+    "lib/symbolic/extensions/numeric.rb",
+    "lib/symbolic/extensions/rational.rb",
+    "lib/symbolic/factors.rb",
+    "lib/symbolic/function.rb",
+    "lib/symbolic/math.rb",
+    "lib/symbolic/misc.rb",
+    "lib/symbolic/plugins/var_name.rb",
+    "lib/symbolic/printer.rb",
+    "lib/symbolic/statistics.rb",
+    "lib/symbolic/sum.rb",
+    "lib/symbolic/summands.rb",
+    "lib/symbolic/variable.rb",
+    "spec/integration_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/symbolic/equal_spec.rb",
+    "spec/symbolic_spec.rb",
+    "symbolic.gemspec"
+  ]
+  s.homepage = "http://brainopia.github.com/symbolic"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Symbolic math for ruby"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.4"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.4"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.4"])
+  end
+end
+

metadata

@@ -1,83 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: symbolic
-version: !ruby/object:Gem::Version 
-  version: 0.3.7
+version: !ruby/object:Gem::Version
+  version: 0.3.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-12-31 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-description: Symbolic math for ruby. This gem can help if you want to get a simplified form of a big equation or to speed up similar calculations or you need an abstraction layer for math. Symbolic does not have any external dependencies. It uses only pure ruby (less than 400 lines of code).
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.4'
+description: Symbolic math for ruby. This gem can help if you want to get a simplified
+  form of a big equation or to speed up similar calculations or you need an abstraction
+  layer for math. Symbolic does not have any external dependencies. It uses only pure
+  ruby (less than 400 lines of code).
 email: ravwar@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- .gitignore
+files:
 - README.rdoc
 - Rakefile
 - lib/symbolic.rb
 - lib/symbolic/coerced.rb
+- lib/symbolic/constant.rb
+- lib/symbolic/constants.rb
 - lib/symbolic/expression.rb
 - lib/symbolic/extensions/kernel.rb
 - lib/symbolic/extensions/matrix.rb
+- lib/symbolic/extensions/module.rb
 - lib/symbolic/extensions/numeric.rb
 - lib/symbolic/extensions/rational.rb
 - lib/symbolic/factors.rb
 - lib/symbolic/function.rb
 - lib/symbolic/math.rb
+- lib/symbolic/misc.rb
+- lib/symbolic/plugins/var_name.rb
+- lib/symbolic/printer.rb
 - lib/symbolic/statistics.rb
+- lib/symbolic/sum.rb
 - lib/symbolic/summands.rb
 - lib/symbolic/variable.rb
-- spec/spec.opts
+- spec/integration_spec.rb
 - spec/spec_helper.rb
+- spec/symbolic/equal_spec.rb
 - spec/symbolic_spec.rb
-has_rdoc: true
+- symbolic.gemspec
 homepage: http://brainopia.github.com/symbolic
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Symbolic math for ruby
-test_files: 
-- spec/spec_helper.rb
-- spec/symbolic_spec.rb
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gemspec
-
-## PROJECT::SPECIFIC

data/spec/spec.opts

@@ -1 +0,0 @@
---color