calculus 0.1.1 → 0.1.2

data/README.rdoc

@@ -34,6 +34,11 @@ You can also render expression to PNG image if you have <tt>latex</tt> and <tt>d
 
 {2 + 3 \cdot x}[http://files.avsej.net/expression.png]
 
+Also you can skip parser if you need only png generation
+ 011:0> Calculus::Expression.new("\\hat{f}(\\xi) = \\int_{-\\infty}^{\\infty} f(x)\\ e^{- 2\\pi i x \\xi}\\,dx", :parse => false).to_png
+
+{\hat{f}(\xi) = \int_{-\infty}^{\infty} f(x)\ e^{- 2\pi i x \xi}\,dx}[http://files.avsej.net/expression-without-parser.png]
+
 Don't forget to cleanup file after using.
 
 == Hacking

data/lib/calculus/expression.rb

@@ -11,12 +11,19 @@ module Calculus
     attr_reader :postfix_notation
     alias :rpn :postfix_notation
 
-    def initialize(source)
-      @postfix_notation = Parser.new(@source = source).parse
+    def initialize(source, options = {})
+      options = {:parse => true}.merge(options)
+      @source = source
+      @postfix_notation = options[:parse] ? Parser.new(source).parse : []
+      raise ArgumentError, "Should be no more that one equals sign" if @postfix_notation.count(:eql) > 1
       @variables = extract_variables
       update_sha1
     end
 
+    def parsed?
+      !@postfix_notation.empty?
+    end
+
     def variables
       @variables.keys
     end
@@ -80,7 +87,14 @@ module Calculus
     alias :ast :abstract_syntax_tree
 
     def to_s
-      source
+      result = source.dup
+      (variables - unbound_variables).each do |var|
+        result.gsub!(/(\W)#{var}(\W)/, "\\1#{@variables[var]}\\2")
+        result.gsub!(/^#{var}(\W)/, "#{@variables[var]}\\1")
+        result.gsub!(/(\W)#{var}$/, "\\1#{@variables[var]}")
+        result.gsub!(/^#{var}$/, @variables[var].to_s)
+      end
+      result
     end
 
     def inspect

data/lib/calculus/parser.rb

@@ -8,7 +8,7 @@ module Calculus
     def initialize(source)
       @operators = {:sqrt => 3, :exp => 3, :div => 2, :mul => 2, :plus => 1, :minus => 1, :eql => 0}
 
-      super(source)
+      super(source.dup)
     end
 
     def parse

data/lib/calculus/version.rb

@@ -1,3 +1,3 @@
 module Calculus
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/expression_test.rb

@@ -84,10 +84,33 @@ class TestExpression < MiniTest::Unit::TestCase
     refute_equal old_sha1, exp.sha1
   end
 
+  def test_that_it_raises_error_if_there_are_more_than_one_equals_sign
+    assert_raises(ArgumentError) { expression("2 * 3 = 2 + 2 + 2 = 6") }
+  end
+
+  def test_it_substitutes_variables_for_string_representation
+    assert_equal "2 + 2 * 4", expression("2 + 2 * x", "x" => 4).to_s
+    assert_equal "2 + 2*4-3", expression("2 + 2*x-3", "x" => 4).to_s
+    assert_equal "\\frac{1}{3}", expression("\\frac{1}{x}", "x" => 3).to_s
+    assert_equal "2 + 2^4", expression("2 + 2^x", "x" => 4).to_s
+    assert_equal "2 + 2 * 4 + x_2", expression("2 + 2 * x_1 + x_2", "x_1" => 4).to_s
+  end
+
+  def test_that_it_allow_skip_parser
+    exp = Calculus::Expression.new("\\hat{f}(\\xi) = \\int_{-\\infty}^{\\infty} f(x)\\ e^{- 2\\pi i x \\xi}\\,dx", :parse => false)
+    refute exp.parsed?
+    assert_equal [], exp.postfix_notation
+    assert_equal Hash.new, exp.instance_variable_get("@variables")
+  end
+
   protected
 
-  def expression(input)
-    Calculus::Expression.new(input)
+  def expression(input, substitutions = {})
+    exp = Calculus::Expression.new(input)
+    substitutions.keys.each do |var|
+      exp[var] = substitutions[var]
+    end
+    exp
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: calculus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sergey Avseyev