symbolic 0.1.6 → 0.1.7

data/README.rdoc

@@ -8,7 +8,7 @@ gem install symbolic
 
 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.
 
-Currently I've implemented only naive optimizations to simplify math expressions, but it's pretty simple to add your own - see Symbolic::Optimizations module for examples.
+Currently I've implemented only naive optimizations to simplify math expressions, but it's pretty simple to add your own - see Symbolic::Optimization module for examples.
 
 == Examples:
   x = var :name => 'x'

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "symbolic"
-    gem.version = '0.1.6'
+    gem.version = '0.1.7'
     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/extensions/matrix.rb

@@ -2,4 +2,12 @@ class Matrix
   def value
     map {|it| it.value }
   end
+
+  def variables
+    map {|it| it.variables }.to_a.flatten.uniq
+  end
+
+  def symbolic?
+    !variables.empty?
+  end
 end

data/lib/extensions/numeric.rb

@@ -2,4 +2,12 @@ class Numeric
   def value
     self
   end
+
+  def variables
+    []
+  end
+
+  def symbolic?
+    false
+  end
 end

data/lib/symbolic/core.rb

@@ -38,8 +38,8 @@ module Symbolic
           alias non_symbolic_#{name} #{sign}
 
           def #{sign}(value)
-            if value.is_a?(Operatable)
-              Optimizations.#{name} self, value
+            if value.symbolic?
+              Optimization.#{name} self, value
             else
               non_symbolic_#{name}(value)
             end
@@ -58,7 +58,7 @@ module Symbolic
           alias non_symbolic_#{operation} #{operation}
 
           def #{operation}(value)
-            if value.is_a?(Operatable)
+            if value.symbolic?
               Symbolic::Method.new value, :#{operation}
             else
               non_symbolic_#{operation} value

data/lib/symbolic/expression.rb

@@ -3,7 +3,6 @@ module Symbolic
     attr_reader :var1, :var2, :operation
 
     def initialize(var1, var2, operation)
-      var1, var2 = var2, var1 if operation == '*' && var2.is_a?(Numeric)
       @var1, @var2, @operation = var1, var2, operation
     end
 
@@ -23,19 +22,27 @@ module Symbolic
       @operation == '*'
     end
 
+    def divide?
+      @operation == '/'
+    end
+
     def value
       if undefined_variables.empty?
-        value_of(@var1).send @operation, value_of(@var2)
+        @var1.value.send @operation, @var2.value
       end
     end
 
+    def variables
+      variables_of(@var1) | variables_of(@var2)
+    end
+
     def undefined_variables
-      (undefined_variables_of(@var1) + undefined_variables_of(@var2)).uniq
+      variables.select &:undefined?
     end
 
     def ==(object)
       object.is_a?(Expression) && (object.operation == @operation) &&
-      ((object.var1 == @var1 && object.var2 == @var2) || ((%w(+ *).include? @operation) && (object.var1 == @var2 && object.var2 == @var1)))
+      ((object.var1 == @var1 && object.var2 == @var2) || ((plus? || multiply?) && (object.var1 == @var2 && object.var2 == @var1)))
     end
 
     private
@@ -48,12 +55,8 @@ module Symbolic
       %w(* /).include?(@operation) && (var.is_a?(UnaryMinus) || var.is_a?(Expression) && (var.plus? || var.minus?))
     end
 
-    def undefined_variables_of(variable)
-      variable.is_a?(Operatable) ? variable.undefined_variables : []
-    end
-
-    def value_of(variable)
-      variable.is_a?(Operatable) ? variable.value : variable
+    def variables_of(object)
+      object.symbolic? ? object.variables : []
     end
   end
 end

data/lib/symbolic/operatable.rb

@@ -11,10 +11,18 @@ module Symbolic
     Symbolic.operations.each do |operation_sign, operation_name|
       method = <<-CODE
         def #{operation_sign}(value)
-          Optimizations.#{operation_name} self, value
+          Optimization.#{operation_name} self, value
         end
       CODE
       class_eval method, __FILE__, __LINE__
     end
+
+    def undefined?
+      !value
+    end
+
+    def symbolic?
+      true
+    end
   end
 end

data/lib/symbolic/optimizations.rb

@@ -1,5 +1,5 @@
 module Symbolic
-  module Optimizations
+  module Optimization
     Symbolic.operations.each do |operation_sign, operation_name|
       method = <<-CODE
         def #{operation_name}(var1, var2)

data/lib/symbolic/optimizations/addition.rb

@@ -1,5 +1,5 @@
-module Symbolic::Optimizations::Addition
-  extend Symbolic::Optimizations::Base
+module Symbolic::Optimization::Addition
+  extend Symbolic::Optimization::Base
 
   def self.optimize_first_arg(var1, var2)
     if var1 == 0

data/lib/symbolic/optimizations/base.rb

@@ -1,4 +1,4 @@
-module Symbolic::Optimizations::Base
+module Symbolic::Optimization::Base
   def optimize(var1, var2)
     optimize_first_arg(var1, var2) || optimize_second_arg(var1, var2)
   end

data/lib/symbolic/optimizations/division.rb

@@ -1,5 +1,5 @@
-module Symbolic::Optimizations::Division
-  extend Symbolic::Optimizations::Base
+module Symbolic::Optimization::Division
+  extend Symbolic::Optimization::Base
 
   def self.optimize_first_arg(var1, var2)
     if var1 == 0

data/lib/symbolic/optimizations/multiplication.rb

@@ -1,5 +1,5 @@
-module Symbolic::Optimizations::Multiplication
-  extend Symbolic::Optimizations::Base
+module Symbolic::Optimization::Multiplication
+  extend Symbolic::Optimization::Base
 
   def self.optimize_first_arg(var1, var2)
     if var1 == 0
@@ -12,6 +12,10 @@ module Symbolic::Optimizations::Multiplication
   end
 
   def self.optimize_second_arg(var1, var2)
-    optimize_first_arg var2, var1
+    if var2.is_a? Numeric
+      var2 * var1
+    else
+      optimize_first_arg var2, var1
+    end
   end
 end

data/lib/symbolic/optimizations/subtraction.rb

@@ -1,5 +1,5 @@
-module Symbolic::Optimizations::Subtraction
-  extend Symbolic::Optimizations::Base
+module Symbolic::Optimization::Subtraction
+  extend Symbolic::Optimization::Base
 
   def self.optimize_first_arg(var1, var2)
     -var2 if var1 == 0

data/lib/symbolic/unary_minus.rb

@@ -1,14 +1,7 @@
 module Symbolic
   class UnaryMinus < Operatable
-    attr_reader :variable
-
-    def self.create(expression)
-      # move to optimizations module
-      if expression.is_a? UnaryMinus
-        expression.variable
-      else
-        new expression
-      end
+    def self.create(var)
+      var.is_a?(UnaryMinus) ? var.abs : new(var)
     end
 
     def initialize(variable)
@@ -24,6 +17,7 @@ module Symbolic
     end
 
     def abs
+      # add a common method for Operatable which will point to an instance of Abs(magnitude) class
       @variable
     end
 
@@ -31,12 +25,16 @@ module Symbolic
       -@variable.value if undefined_variables.empty?
     end
 
+    def variables
+      [@variable]
+    end
+
     def undefined_variables
       @variable.undefined_variables
     end
 
     def ==(object)
-      object.is_a?(UnaryMinus) && object.variable == @variable
+      object.is_a?(UnaryMinus) && object.abs == @variable
     end
   end
 end

data/lib/symbolic/variable.rb

@@ -16,8 +16,12 @@ module Symbolic
       @name || 'unnamed_variable'
     end
 
+    def variables
+      [self]
+    end
+
     def undefined_variables
-      value ? [] : [self]
+      value ? [] : variables
     end
   end
 end

metadata

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