symbolic 0.1.9 → 0.2.0

data/Rakefile

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

@@ -2,11 +2,4 @@ module Kernel
   def var(options={}, &proc)
     Symbolic::Variable.new options, &proc
   end
-
-  def symbolic
-    Symbolic::Core.enable
-    result = yield
-    Symbolic::Core.disable
-    return result
-  end
 end

data/lib/symbolic.rb

@@ -27,6 +27,10 @@ module Symbolic
     self
   end
 
+  def coerce(numeric)
+    return Coerced.new(self), numeric
+  end
+
   def undefined?
     !value
   end
@@ -36,13 +40,13 @@ module Symbolic
   end
 end
 
-require 'symbolic/core'
-require 'symbolic/optimizations'
-require 'symbolic/optimizations/base'
-require 'symbolic/optimizations/addition'
-require 'symbolic/optimizations/subtraction'
-require 'symbolic/optimizations/multiplication'
-require 'symbolic/optimizations/division'
+require 'symbolic/coerced'
+require 'symbolic/optimization'
+require 'symbolic/optimization/base'
+require 'symbolic/optimization/addition'
+require 'symbolic/optimization/subtraction'
+require 'symbolic/optimization/multiplication'
+require 'symbolic/optimization/division'
 require 'symbolic/variable'
 require 'symbolic/expression'
 require 'symbolic/method'

data/lib/symbolic/coerced.rb

@@ -0,0 +1,16 @@
+module Symbolic
+  class Coerced
+    def initialize(symbolic)
+      @symbolic = symbolic
+    end
+
+    Symbolic.operations.each do |sign, name|
+      method = <<-CODE
+        def #{sign}(numeric)
+          Optimization.#{name} numeric, @symbolic
+        end
+      CODE
+      class_eval method, __FILE__, __LINE__
+    end # Symbolic.operations.each
+  end # Coerced
+end # Symbolic

data/lib/symbolic/expression.rb

@@ -29,9 +29,7 @@ module Symbolic
     end
 
     def value
-      if undefined_variables.empty?
-        @var1.value.send @operation, @var2.value
-      end
+      @var1.value.send @operation, @var2.value if undefined_variables.empty?
     end
 
     def variables
@@ -48,9 +46,7 @@ module Symbolic
     end
 
     def detailed_operations
-      stats = operations_of(@var1).merge(operations_of @var2) {|k,v1,v2| v1 + v2 }
-      stats[@operation] += 1
-      stats
+      operations_of(@var1).tap {|it| it.merge!(operations_of @var2)[@operation] += 1 }
     end
 
     private

data/lib/symbolic/method.rb

@@ -23,9 +23,7 @@ module Symbolic
     end
 
     def detailed_operations
-      stats = @variable.detailed_operations.dup
-      stats[@operation] += 1
-      stats
+      @variable.detailed_operations.tap {|it| it[@operation] += 1}
     end
   end
 end

data/lib/symbolic/{optimizations → optimization}/multiplication.rb

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

data/lib/symbolic/unary_minus.rb

@@ -40,9 +40,7 @@ module Symbolic
     end
 
     def detailed_operations
-      stats = @variable.detailed_operations.dup
-      stats['-@'] += 1
-      stats
+      @variable.detailed_operations.tap {|it| it['-@'] += 1}
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'symbolic'
 require 'rubygems'
 require 'spec'
-require 'spec/autorun'
-
-Symbolic::Core.enable
+require 'spec/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: symbolic
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - brainopia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +03:00
+date: 2009-12-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,15 +38,15 @@ files:
 - lib/extensions/matrix.rb
 - lib/extensions/numeric.rb
 - lib/symbolic.rb
-- lib/symbolic/core.rb
+- lib/symbolic/coerced.rb
 - lib/symbolic/expression.rb
 - lib/symbolic/method.rb
-- lib/symbolic/optimizations.rb
-- lib/symbolic/optimizations/addition.rb
-- lib/symbolic/optimizations/base.rb
-- lib/symbolic/optimizations/division.rb
-- lib/symbolic/optimizations/multiplication.rb
-- lib/symbolic/optimizations/subtraction.rb
+- lib/symbolic/optimization.rb
+- lib/symbolic/optimization/addition.rb
+- lib/symbolic/optimization/base.rb
+- lib/symbolic/optimization/division.rb
+- lib/symbolic/optimization/multiplication.rb
+- lib/symbolic/optimization/subtraction.rb
 - lib/symbolic/unary_minus.rb
 - lib/symbolic/variable.rb
 - spec/spec.opts

data/lib/symbolic/core.rb

@@ -1,92 +0,0 @@
-module Symbolic
-  module Core
-    @enabled = false
-
-    class << self
-      def enable
-        if !@enabled
-          @enabled = true
-          redefine_numerical_methods
-          redefine_math_methods
-        end
-      end
-
-      def disable
-        if @enabled
-          @enabled = false
-          restore_numerical_methods
-          restore_math_methods
-        end
-      end
-
-      private
-
-      def numerical_eval(*args, &proc)
-        [Fixnum, Bignum, Float].each do |klass|
-          klass.class_eval *args, &proc
-        end
-      end
-
-      def redefine_numerical_methods
-        Symbolic.operations.each do |sign, name|
-          numerical_eval numerical_method(sign,name), __FILE__, __LINE__
-        end
-      end
-
-      def numerical_method(sign, name)
-        <<-CODE
-          alias non_symbolic_#{name} #{sign}
-
-          def #{sign}(value)
-            if value.is_a? Symbolic
-              Optimization.#{name} self, value
-            else
-              non_symbolic_#{name}(value)
-            end
-          end
-        CODE
-      end
-
-      def redefine_math_methods
-        Symbolic.math_operations.each do |operation|
-          Math.instance_eval math_method(operation), __FILE__, __LINE__
-        end
-      end
-
-      def math_method(operation)
-        <<-CODE
-          alias non_symbolic_#{operation} #{operation}
-
-          def #{operation}(value)
-            if value.is_a? Symbolic
-              Symbolic::Method.new value, :#{operation}
-            else
-              non_symbolic_#{operation} value
-            end
-          end
-        CODE
-      end
-
-      def restore_numerical_methods
-        numerical_eval do
-          Symbolic.operations.each do |operation_sign, operation_name|
-            alias_method operation_sign, "non_symbolic_#{operation_name}"
-            remove_method "non_symbolic_#{operation_name}"
-          end
-        end
-      end
-
-      def restore_math_methods
-        Math.module_eval do
-          class << self
-            Symbolic.math_operations.each do |operation|
-              non_symbolic_operation = "non_symbolic_#{operation}"
-              alias_method operation, non_symbolic_operation
-              remove_method non_symbolic_operation
-            end
-          end
-        end
-      end
-    end # class << self
-  end # Core
-end # Symbolic