symbolic 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,12 +1,14 @@
 Symbolic math for ruby.
 
+Installation: 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.
 
-Available as gem from gemcutter: gem install symbolic
-
 Simple example:
+  require 'rubygems'
+  require 'symbolic'
 
   Symbolic.enabled = true
 

data/Rakefile

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

@@ -0,0 +1,11 @@
+module Kernel
+  def var(options={})
+    Symbolic::Variable.new options
+  end
+
+  def symbolic
+    Symbolic.enabled = true
+    yield
+    Symbolic.enabled = false
+  end
+end

data/lib/symbolic.rb

@@ -1,3 +1,11 @@
+require 'symbolic/operatable'
+require 'symbolic/optimizations'
+require 'symbolic/variable'
+require 'symbolic/expression'
+require 'symbolic/method'
+require 'symbolic/unary_minus'
+require 'extensions/kernel'
+
 module Symbolic
   @enabled = false
   class << self
@@ -100,212 +108,4 @@ module Symbolic
       end
     end # disable
   end # class << self
-
-  class Operatable
-    def -@
-      UnaryMinus.create self
-    end
-
-    def *(value)
-      Optimizations.multiply self, value
-    end
-
-    def +(value)
-      Optimizations.plus self, value
-    end
-
-    def -(value)
-      Optimizations.minus self, value
-    end
-  end # Operations
-
-  module Optimizations
-    def self.plus(symbolic_var, var, reverse=false)
-      if var == 0
-        symbolic_var
-      elsif var.is_a? UnaryMinus
-        symbolic_var - var.variable
-      elsif reverse && symbolic_var.is_a?(UnaryMinus)
-        var - symbolic_var.variable
-      else
-        if reverse
-          Expression.new var, symbolic_var, '+'
-        else
-          Expression.new symbolic_var, var, '+'
-        end
-      end
-    end
-
-    def self.minus(symbolic_var, var, reverse=false)
-      if var == 0
-        symbolic_var
-      elsif var.is_a? UnaryMinus
-        symbolic_var + var.variable
-      elsif reverse && symbolic_var.is_a?(UnaryMinus)
-        var + symbolic_var.variable
-      else
-        if reverse
-          Expression.new var, symbolic_var, '-'
-        else
-          Expression.new symbolic_var, var, '-'
-        end
-      end
-    end
-
-    def self.multiply(symbolic_var, var, reverse=false)
-      if var == 0
-        var
-      elsif var == 1
-        symbolic_var
-      elsif var == -1
-        -symbolic_var
-      elsif var.is_a?(Numeric) && var < 0
-        -(-var*symbolic_var)
-      elsif var.is_a? UnaryMinus
-        UnaryMinus.create symbolic_var*var.variable
-      elsif symbolic_var.is_a? UnaryMinus
-        UnaryMinus.create symbolic_var.variable*var
-      else
-        if reverse
-          Expression.new var, symbolic_var, '*'
-        else
-          Expression.new symbolic_var, var, '*'
-        end
-      end
-    end
-  end
-
-  class Variable < Operatable
-    attr_accessor :value, :name
-
-    @@index = 0
-
-    def initialize(options)
-      unless @name = options[:name]
-        @@index += 1
-        @name = "var#{@@index}"
-      end
-
-      @value = options[:value]
-    end
-
-    def to_s
-      @name
-    end
-
-    def undefined_variables
-      @value ? [] : [self]
-    end
-  end
-
-  class Expression < Operatable
-    def initialize(var1, var2, operation)
-      var1, var2 = var2, var1 if operation == '*' && var2.is_a?(Numeric)
-      @var1, @var2, @operation = var1, var2, operation
-    end
-
-    def to_s
-      var1 = "#{@var1}"
-      var2 = "#{@var2}"
-      if @operation == '*'
-        var1 = "(#{@var1})" if @var1.is_a?(Expression) && (@var1.plus? || @var1.minus?)
-        var2 = "(#{@var2})" if @var2.is_a?(Expression) && (@var2.plus? || @var1.minus?)
-      end
-      "#{var1}#{@operation}#{var2}"
-    end
-
-    def plus?
-      @operation == '+'
-    end
-
-    def minus?
-      @operation == '-'
-    end
-
-    def multiply?
-      @operation == '*'
-    end
-
-    def value
-      if undefined_variables.empty?
-        value_of(@var1).send @operation, value_of(@var2)
-      end
-    end
-
-    def undefined_variables
-      (undefined_variables_of(@var1) + undefined_variables_of(@var2)).uniq
-    end
-
-    private
-
-    def undefined_variables_of(variable)
-      variable.is_a?(Operatable) ? variable.undefined_variables : []
-    end
-
-    def value_of(variable)
-      variable.is_a?(Operatable) ? variable.value : variable
-    end
-  end
-
-  class Method < Operatable
-    def initialize(variable, operation)
-      @variable, @operation = variable, operation
-    end
-
-    def to_s
-      "#{@operation}(#{@variable})"
-    end
-
-    def value
-      Math.send @operation, @variable.value if undefined_variables.empty?
-    end
-
-    def undefined_variables
-      @variable.undefined_variables
-    end
-  end
-
-  class UnaryMinus < Operatable
-    attr_reader :variable
-
-    def self.create(expression)
-      if expression.is_a? UnaryMinus
-        expression.variable
-      else
-        new expression
-      end
-    end
-
-    def initialize(variable)
-      @variable = variable
-    end
-
-    def to_s
-      if @variable.is_a? Variable
-        "-#{@variable}"
-      else
-        "(-#{@variable})"
-      end
-    end
-
-    def value
-      -@variable.value if undefined_variables.empty?
-    end
-
-    def undefined_variables
-      @variable.undefined_variables
-    end
-  end
-end
-
-module Kernel
-  def var(options={})
-    Symbolic::Variable.new options
-  end
-
-  def symbolic
-    Symbolic.enabled = true
-    yield
-    Symbolic.enabled = false
-  end
 end

data/lib/symbolic/expression.rb

@@ -0,0 +1,50 @@
+module Symbolic
+  class Expression < Operatable
+    def initialize(var1, var2, operation)
+      var1, var2 = var2, var1 if operation == '*' && var2.is_a?(Numeric)
+      @var1, @var2, @operation = var1, var2, operation
+    end
+
+    def to_s
+      var1 = "#{@var1}"
+      var2 = "#{@var2}"
+      if @operation == '*'
+        var1 = "(#{@var1})" if @var1.is_a?(Expression) && (@var1.plus? || @var1.minus?)
+        var2 = "(#{@var2})" if @var2.is_a?(Expression) && (@var2.plus? || @var1.minus?)
+      end
+      "#{var1}#{@operation}#{var2}"
+    end
+
+    def plus?
+      @operation == '+'
+    end
+
+    def minus?
+      @operation == '-'
+    end
+
+    def multiply?
+      @operation == '*'
+    end
+
+    def value
+      if undefined_variables.empty?
+        value_of(@var1).send @operation, value_of(@var2)
+      end
+    end
+
+    def undefined_variables
+      (undefined_variables_of(@var1) + undefined_variables_of(@var2)).uniq
+    end
+
+    private
+
+    def undefined_variables_of(variable)
+      variable.is_a?(Operatable) ? variable.undefined_variables : []
+    end
+
+    def value_of(variable)
+      variable.is_a?(Operatable) ? variable.value : variable
+    end
+  end
+end

data/lib/symbolic/method.rb

@@ -0,0 +1,19 @@
+module Symbolic
+  class Method < Operatable
+    def initialize(variable, operation)
+      @variable, @operation = variable, operation
+    end
+
+    def to_s
+      "#{@operation}(#{@variable})"
+    end
+
+    def value
+      Math.send @operation, @variable.value if undefined_variables.empty?
+    end
+
+    def undefined_variables
+      @variable.undefined_variables
+    end
+  end
+end

data/lib/symbolic/operatable.rb

@@ -0,0 +1,19 @@
+module Symbolic
+  class Operatable
+    def -@
+      UnaryMinus.create self
+    end
+
+    def *(value)
+      Optimizations.multiply self, value
+    end
+
+    def +(value)
+      Optimizations.plus self, value
+    end
+
+    def -(value)
+      Optimizations.minus self, value
+    end
+  end
+end

data/lib/symbolic/optimizations.rb

@@ -0,0 +1,57 @@
+module Symbolic
+  module Optimizations
+    def self.plus(symbolic_var, var, reverse=false)
+      if var == 0
+        symbolic_var
+      elsif var.is_a? UnaryMinus
+        symbolic_var - var.variable
+      elsif reverse && symbolic_var.is_a?(UnaryMinus)
+        var - symbolic_var.variable
+      else
+        if reverse
+          Expression.new var, symbolic_var, '+'
+        else
+          Expression.new symbolic_var, var, '+'
+        end
+      end
+    end
+
+    def self.minus(symbolic_var, var, reverse=false)
+      if var == 0
+        symbolic_var
+      elsif var.is_a? UnaryMinus
+        symbolic_var + var.variable
+      elsif reverse && symbolic_var.is_a?(UnaryMinus)
+        var + symbolic_var.variable
+      else
+        if reverse
+          Expression.new var, symbolic_var, '-'
+        else
+          Expression.new symbolic_var, var, '-'
+        end
+      end
+    end
+
+    def self.multiply(symbolic_var, var, reverse=false)
+      if var == 0
+        var
+      elsif var == 1
+        symbolic_var
+      elsif var == -1
+        -symbolic_var
+      elsif var.is_a?(Numeric) && var < 0
+        -(-var*symbolic_var)
+      elsif var.is_a? UnaryMinus
+        UnaryMinus.create symbolic_var*var.variable
+      elsif symbolic_var.is_a? UnaryMinus
+        UnaryMinus.create symbolic_var.variable*var
+      else
+        if reverse
+          Expression.new var, symbolic_var, '*'
+        else
+          Expression.new symbolic_var, var, '*'
+        end
+      end
+    end
+  end
+end

data/lib/symbolic/unary_minus.rb

@@ -0,0 +1,33 @@
+module Symbolic
+  class UnaryMinus < Operatable
+    attr_reader :variable
+
+    def self.create(expression)
+      if expression.is_a? UnaryMinus
+        expression.variable
+      else
+        new expression
+      end
+    end
+
+    def initialize(variable)
+      @variable = variable
+    end
+
+    def to_s
+      if @variable.is_a? Variable
+        "-#{@variable}"
+      else
+        "(-#{@variable})"
+      end
+    end
+
+    def value
+      -@variable.value if undefined_variables.empty?
+    end
+
+    def undefined_variables
+      @variable.undefined_variables
+    end
+  end
+end

data/lib/symbolic/variable.rb

@@ -0,0 +1,24 @@
+module Symbolic
+  class Variable < Operatable
+    attr_accessor :value, :name
+
+    @@index = 0
+
+    def initialize(options)
+      unless @name = options[:name]
+        @@index += 1
+        @name = "var#{@@index}"
+      end
+
+      @value = options[:value]
+    end
+
+    def to_s
+      @name
+    end
+
+    def undefined_variables
+      @value ? [] : [self]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: symbolic
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - brainopia
@@ -34,7 +34,14 @@ files:
 - .gitignore
 - README.rdoc
 - Rakefile
+- lib/extensions/kernel.rb
 - lib/symbolic.rb
+- lib/symbolic/expression.rb
+- lib/symbolic/method.rb
+- lib/symbolic/operatable.rb
+- lib/symbolic/optimizations.rb
+- lib/symbolic/unary_minus.rb
+- lib/symbolic/variable.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/symbolic_spec.rb