symbolic 0.1.8 → 0.1.9

data/README.rdoc

@@ -17,6 +17,8 @@ Currently I've implemented only naive optimizations to simplify math expressions
   f = symbolic { (4 - 2*(-x) + y*(-1.0))*x - 0*y + 0 - 2 }
   puts f # => (4+2*x-y)*x-2
 
+  p f.detailed_operations # => {"+"=>1, "-"=>2, "*"=>2}
+  p f.operations # => 5
   p f.undefined_variables.map &:name # => ["x", "y"]
   x.value = 2
   y.value = 4

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "symbolic"
-    gem.version = '0.1.8'
+    gem.version = '0.1.9'
     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

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

data/lib/extensions/numeric.rb

@@ -6,8 +6,4 @@ class Numeric
   def variables
     []
   end
-
-  def symbolic?
-    false
-  end
 end

data/lib/symbolic/core.rb

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

data/lib/symbolic/expression.rb

@@ -1,5 +1,7 @@
 module Symbolic
-  class Expression < Operatable
+  class Expression
+    include Symbolic
+
     attr_reader :var1, :var2, :operation
 
     def initialize(var1, var2, operation)
@@ -33,7 +35,7 @@ module Symbolic
     end
 
     def variables
-      variables_of(@var1) | variables_of(@var2)
+      @var1.variables | @var2.variables
     end
 
     def undefined_variables
@@ -45,6 +47,12 @@ module Symbolic
       ((object.var1 == @var1 && object.var2 == @var2) || ((plus? || multiply?) && (object.var1 == @var2 && object.var2 == @var1)))
     end
 
+    def detailed_operations
+      stats = operations_of(@var1).merge(operations_of @var2) {|k,v1,v2| v1 + v2 }
+      stats[@operation] += 1
+      stats
+    end
+
     private
 
     def brackets(var)
@@ -55,8 +63,8 @@ module Symbolic
       %w(* /).include?(@operation) && (var.is_a?(UnaryMinus) || var.is_a?(Expression) && (var.plus? || var.minus?))
     end
 
-    def variables_of(object)
-      object.symbolic? ? object.variables : []
+    def operations_of(var)
+      var.is_a?(Symbolic) ? var.detailed_operations : Hash.new(0)
     end
   end
 end

data/lib/symbolic/method.rb

@@ -1,5 +1,7 @@
 module Symbolic
-  class Method < Operatable
+  class Method
+    include Symbolic
+
     def initialize(variable, operation)
       @variable, @operation = variable, operation
     end
@@ -19,5 +21,11 @@ module Symbolic
     def undefined_variables
       @variable.undefined_variables
     end
+
+    def detailed_operations
+      stats = @variable.detailed_operations.dup
+      stats[@operation] += 1
+      stats
+    end
   end
 end

data/lib/symbolic/unary_minus.rb

@@ -1,5 +1,7 @@
 module Symbolic
-  class UnaryMinus < Operatable
+  class UnaryMinus
+    include Symbolic
+
     def self.create(var)
       var.is_a?(UnaryMinus) ? var.abs : new(var)
     end
@@ -17,7 +19,7 @@ module Symbolic
     end
 
     def abs
-      # add a common method for Operatable which will point to an instance of Abs(magnitude) class
+      # TODO: add a common method for Symbolic which will point to an instance of Abs(magnitude) class
       @variable
     end
 
@@ -36,5 +38,11 @@ module Symbolic
     def ==(object)
       object.is_a?(UnaryMinus) && object.abs == @variable
     end
+
+    def detailed_operations
+      stats = @variable.detailed_operations.dup
+      stats['-@'] += 1
+      stats
+    end
   end
 end

data/lib/symbolic/variable.rb

@@ -1,5 +1,7 @@
 module Symbolic
-  class Variable < Operatable
+  class Variable
+    include Symbolic
+
     attr_accessor :name, :proc
     attr_writer :value
 
@@ -23,5 +25,9 @@ module Symbolic
     def undefined_variables
       value ? [] : variables
     end
+
+    def detailed_operations
+      Hash.new 0
+    end
   end
 end

data/lib/symbolic.rb

@@ -6,13 +6,37 @@ module Symbolic
       :/ => :division }
   end
 
+  operations.each do |sign, name|
+    method = <<-CODE
+      def #{sign}(value)
+        Optimization.#{name} self, value
+      end
+    CODE
+    class_eval method, __FILE__, __LINE__
+  end
+
   def self.math_operations
     [:cos, :sin]
   end
+
+  def -@
+    UnaryMinus.create self
+  end
+
+  def +@
+    self
+  end
+
+  def undefined?
+    !value
+  end
+
+  def operations
+    detailed_operations.values.inject(0) {|sum,it| sum + it }
+  end
 end
 
 require 'symbolic/core'
-require 'symbolic/operatable'
 require 'symbolic/optimizations'
 require 'symbolic/optimizations/base'
 require 'symbolic/optimizations/addition'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: symbolic
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - brainopia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +03:00
+date: 2009-12-04 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,6 @@ files:
 - lib/symbolic/core.rb
 - lib/symbolic/expression.rb
 - lib/symbolic/method.rb
-- lib/symbolic/operatable.rb
 - lib/symbolic/optimizations.rb
 - lib/symbolic/optimizations/addition.rb
 - lib/symbolic/optimizations/base.rb

data/lib/symbolic/operatable.rb

@@ -1,28 +0,0 @@
-module Symbolic
-  class Operatable
-    def -@
-      UnaryMinus.create self
-    end
-
-    def +@
-      self
-    end
-
-    Symbolic.operations.each do |operation_sign, operation_name|
-      method = <<-CODE
-        def #{operation_sign}(value)
-          Optimization.#{operation_name} self, value
-        end
-      CODE
-      class_eval method, __FILE__, __LINE__
-    end
-
-    def undefined?
-      !value
-    end
-
-    def symbolic?
-      true
-    end
-  end
-end