symbolic 0.2.1 → 0.2.2

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "symbolic"
-    gem.version = '0.2.1'
+    gem.version = '0.2.2'
     gem.summary = 'Symbolic math for ruby'
     gem.description = %Q{Symbolic math can be really helpful if you want to simplify some giant equation or if you don't want to get a performance hit re-evaluating big math expressions every time when few variables change.}
     gem.email = "ravwar@gmail.com"

data/lib/symbolic/operation.rb

@@ -11,7 +11,7 @@ class Symbolic::Operation
 
   private
 
-  def operation(expression)
+  def self.operation(expression)
     case expression
     when Unary::Minus           then :unary_minus
     when Binary::Addition       then :addition
@@ -22,6 +22,10 @@ class Symbolic::Operation
     end
   end
 
+  def operation(expression)
+    self.class.operation expression
+  end
+
   def unary_minus?(expression)
     operation(expression) == :unary_minus
   end
@@ -45,4 +49,12 @@ class Symbolic::Operation
   def variable?(expression)
     operation(expession) == :variable
   end
+
+  def brackets(var)
+    brackets_for.include?(operation var) ? "(#{var})" : var.to_s
+  end
+
+  def brackets_for
+    []
+  end
 end

data/lib/symbolic/operation/binary.rb

@@ -14,12 +14,6 @@ class Symbolic::Operation::Binary < Symbolic::Operation
     end
   end
 
-  def self.brackets_for(*operations)
-    def brackets(var)
-      operations.include?(operation var) ? "(#{var})" : var.to_s
-    end
-  end
-
   def initialize(var1, var2)
     @var1, @var2 = var1, var2
   end
@@ -57,8 +51,4 @@ class Symbolic::Operation::Binary < Symbolic::Operation
   def operations_of(var)
     var.is_a?(Symbolic) ? var.detailed_operations : Hash.new(0)
   end
-
-  def brackets(var)
-    var.to_s
-  end
 end

data/lib/symbolic/operation/binary/division.rb

@@ -1,6 +1,4 @@
 class Symbolic::Operation::Binary::Division < Symbolic::Operation::Binary
-  brackets_for :unary_minus, :addition, :subtraction
-  
   def self.simplify_first_arg(var1, var2)
     if var1 == 0
       0
@@ -20,4 +18,8 @@ class Symbolic::Operation::Binary::Division < Symbolic::Operation::Binary
   def sign
     '/'
   end
+
+  def brackets_for
+    [:unary_minus, :addition, :subtraction]
+  end
 end

data/lib/symbolic/operation/binary/exponentiation.rb

@@ -1,6 +1,4 @@
 class Symbolic::Operation::Binary::Exponentiation < Symbolic::Operation::Binary
-  brackets_for :unary_minus, :addition, :subtraction, :multiplication, :division
-
   def self.simplify_first_arg(var1, var2)
     # add conditional for negative?(var1) and even or odd values of var2
     if var1 == 0
@@ -18,6 +16,10 @@ class Symbolic::Operation::Binary::Exponentiation < Symbolic::Operation::Binary
     end
   end
 
+  def brackets_for
+    [:unary_minus, :addition, :subtraction, :multiplication, :division]
+  end
+
   def sign
     '**'
   end

data/lib/symbolic/operation/binary/multiplication.rb

@@ -1,6 +1,5 @@
 class Symbolic::Operation::Binary::Multiplication < Symbolic::Operation::Binary
   symmetric
-  brackets_for :unary_minus, :addition, :subtraction
 
   def self.simplify_first_arg(var1, var2)
     if var1 == 0
@@ -16,6 +15,9 @@ class Symbolic::Operation::Binary::Multiplication < Symbolic::Operation::Binary
     '*'
   end
 
+  def brackets_for
+    [:unary_minus, :addition, :subtraction]
+  end
   # def initialize(var1, var2)
   #   super
   #   coef, numerators, denominators = unite_factors factors_of(var1), factors_of(var2)

data/lib/symbolic/operation/binary/subtraction.rb

@@ -8,6 +8,8 @@ class Symbolic::Operation::Binary::Subtraction < Symbolic::Operation::Binary
       var1
     elsif negative?(var2)
       var1 + var2.abs
+    elsif [:addition, :subtraction].include? operation(var2)
+      var1 + (-var2)
     end
   end
 

data/lib/symbolic/operation/unary/minus.rb

@@ -1,7 +1,14 @@
 class Symbolic::Operation
   class Unary::Minus < Unary
     def self.simplify(expression)
-      expression.abs if expression.is_a? Unary::Minus
+      case operation(expression)
+      when :unary_minus
+        expression.abs
+      when :addition
+        -expression.send(:var1)-expression.send(:var2)
+      when :subtraction
+        expression.send(:var2) - expression.send(:var1)
+      end
     end
 
     def abs
@@ -9,12 +16,8 @@ class Symbolic::Operation
       @expression
     end
 
-    def to_s
-      if [:variable, :multiplication, :division].include? operation(@expression)
-        "-#{@expression}"
-      else
-        "(-#{@expression})"
-      end
+    def brackets_for
+      [:addition, :subtraction]
     end
 
     def value
@@ -28,5 +31,9 @@ class Symbolic::Operation
     def detailed_operations
       @expression.detailed_operations.tap {|it| it['-@'] += 1}
     end
+
+    def to_s
+      "-#{brackets @expression}"
+    end
   end
 end

data/lib/symbolic/variable.rb

@@ -6,6 +6,7 @@ module Symbolic
 
     def initialize(options={}, &proc)
       @name, @value = options.values_at(:name, :value)
+      @name = @name.to_s if @name
       @proc = proc
     end
 

data/spec/symbolic_spec.rb

@@ -96,12 +96,37 @@ describe "Symbolic" do
   describe 'general methods:' do
     should_equal \
     'x.variables' => '[x]',
-    '(-(x-y)).variables' => '[x,y]',
+    '(-(x+y)).variables' => '[x,y]',
     '(x+y).undefined_variables' => '[]',
-    '(-x-4*y+5-y/x).detailed_operations' =>
-    '{"+" => 1, "-" => 2, "*" => 1, "/" => 1, "-@" => 1}'
+    '(-x**y-4*y+5-y/x).detailed_operations' =>
+    '{"+" => 1, "-" => 2, "*" => 1, "/" => 1, "-@" => 1, "**" => 1}',
+    '(-x**y-4*y+5-y/x).operations' => '7'
   end
 
-  describe "formulas" do
+  describe "to_s:" do
+    def self.should_print(conditions)
+      conditions.each do |symbolic_expression, result|
+        it symbolic_expression do
+          expression(symbolic_expression).to_s.should == result
+        end
+      end
+    end
+
+    should_print \
+    'x' => 'x',
+    '-x' => '-x',
+    'x+1' => 'x+1',
+    'x-4' => 'x-4',
+    '-(x+y)' => '-x-y',
+    '-(x-y)' => 'y-x',
+    'x*y' => 'x*y',
+    '(-x)*y' => '-x*y',
+    '(x+2)*(y+3)*4' => '(x+2)*(y+3)*4',
+    '4/x' => '4/x',
+    '(-(2+x))/(-(-y))' => '(-2-x)/y',
+    'x**y' => 'x**y',
+    'x**(y-4)' => 'x**(y-4)',
+    '(x+1)**(y*2)' => '(x+1)**(y*2)',
+    '-(x**y -2)+5' => '2-x**y+5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: symbolic
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - brainopia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +03:00
+date: 2009-12-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency