calculus 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b35d43f055328b7d3abdb3a3d3f1f126d19b33c
+  data.tar.gz: 38314dc9dac26b58ae7ccb5b41d1d6a7efea1a7c
+SHA512:
+  metadata.gz: 2be2752f313d8e107919f602ab980d22a52a060036c396ed03c66ebf7a66fd5b2ee46baf2a280e1fb95e0eb2b7e712740ae7d6e3277f9ba4896ae5ab7a8fe8d4
+  data.tar.gz: cf0451676cf5c4513eda0f6f4f0516bb582dbc4a07d4c65cc761c71c8c9c1bc30fa3501299c07c68ae258f3843924ee575fced2fa8660029d586ccb0a59df23a

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Calculus is utility library which allow to parse some subset of latex equations and store them in {Postfix notation}[http://en.wikipedia.org/wiki/Reverse_Polish_notation] It also allows translate it to {Abstract syntax tree}[http://en.wikipedia.org/wiki/Abstract_syntax_tree] and calculate (implemented for simple expressions).
 
+Build status: {<img src="http://travis-ci.org/avsej/calculus.png" />}[http://travis-ci.org/avsej/calculus]
+
 == Installation
 
  gem install calculus

data/calculus.gemspec

@@ -23,4 +23,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rake'
 end

data/lib/calculus/expression.rb

@@ -97,7 +97,7 @@ module Calculus
       @postfix_notation.each do |node|
         case node
         when Symbol
-          operation, right, left = node, stack.pop, stack.pop
+          operation, right, left = node, (node == :uminus ? nil : stack.pop), stack.pop
           stack.push(yield(operation, left, right, stack))
         when Numeric
           stack.push(node)
@@ -124,12 +124,13 @@ module Calculus
 
       traverse do |operation, left, right, stack|
         case operation
-        when :sqrt  then left ** (1.0 / right) # could cause some rounding errors
-        when :exp   then left ** right
-        when :plus  then left + right
-        when :minus then left - right
-        when :mul   then left * right
-        when :div   then left / right
+        when :uminus then -left
+        when :sqrt   then left ** (1.0 / right) # could cause some rounding errors
+        when :exp    then left ** right
+        when :plus   then left + right
+        when :minus  then left - right
+        when :mul    then left * right
+        when :div    then left / right
         end
       end
     end

data/lib/calculus/latex.rb

@@ -2,7 +2,7 @@ require 'tmpdir'
 
 module Calculus
 
-  # Renders expression to PNG image using <tt>latex<tt> and
+  # Renders expression to PNG image using <tt>latex</tt> and
   # <tt>dvipng</tt>
   module Latex
 

data/lib/calculus/parser.rb

@@ -46,9 +46,9 @@ module Calculus
 
     # Initialize parser with given source string. It could simple
     # (native expression like <tt>2 + 3 * (4 / 3)</tt>, but also in TeX
-    # style <tt>2 + 3 \cdot \frac{4}{3}.
+    # style <tt>2 + 3 \cdot \frac{4}{3}</tt>.
     def initialize(source)
-      @operators = {:sqrt => 3, :exp => 3, :div => 2, :mul => 2, :plus => 1, :minus => 1, :eql => 0}
+      @operators = {:uminus => 4, :sqrt => 3, :exp => 3, :div => 2, :mul => 2, :plus => 1, :minus => 1, :eql => 0}
 
       super(source.dup)
     end
@@ -61,18 +61,22 @@ module Calculus
     def parse
       exp = []
       stack = []
+      token = :none
       while true
-        case token = fetch_token
+        prev, token = token, fetch_token
+        case token
         when :open
           stack.push(token)
         when :close
           exp << stack.pop while operators.keys.include?(stack.last)
           stack.pop if stack.last == :open
         when :plus, :minus, :mul, :div, :exp, :sqrt, :eql
+          token = :uminus if prev && (prev == :none || prev != :close) && token == :minus
           exp << stack.pop while operators.keys.include?(stack.last) && operators[stack.last] >= operators[token]
           stack.push(token)
         when Numeric, String
           exp << token
+          token = nil
         when nil
           break
         else

data/lib/calculus/version.rb

@@ -1,3 +1,3 @@
 module Calculus
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/test/expression_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'calculus'
 
-class TestExpression < MiniTest::Unit::TestCase
+class TestExpression < MiniTest::Test
 
   def test_that_it_extract_variables_properly
     assert_equal ["x", "y"], expression("x + 2^x = y").variables
@@ -103,6 +103,10 @@ class TestExpression < MiniTest::Unit::TestCase
     assert_equal Hash.new, exp.instance_variable_get("@variables")
   end
 
+  def test_that_it_handles_unary_minus
+    assert_equal 6, expression("-3 * -2").calculate
+  end
+
   protected
 
   def expression(input, substitutions = {})

data/test/parser_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'calculus'
 
-class TestParser < MiniTest::Unit::TestCase
+class TestParser < MiniTest::Test
 
   def test_that_it_parses_simple_arithmetic
     assert_equal [1, 2, :plus], parse("1+2")
@@ -61,6 +61,11 @@ class TestParser < MiniTest::Unit::TestCase
     assert_raises(Calculus::ParserError) { assert_equal [2, "x__2", :mul, 16, :eql], parse("2 \\cdot x__2 = 16") }
   end
 
+  def test_that_it_handles_unary_minus
+    assert_equal [2, :uminus], parse("-2")
+    assert_equal [2, :uminus, 2, :uminus, :mul], parse("-2 * -2")
+  end
+
   protected
 
   def parse(input)

metadata

@@ -1,31 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: calculus
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Sergey Avseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-13 00:00:00 +03:00
-default_executable: 
-dependencies: []
-
-description: A ruby parser for TeX equations. It parses equations to postfix (reverse polish) notation and can build abstract syntax tree (AST). Also it can render images via latex. Requres modern ruby 1.9.x because of using advanced oniguruma regex engine
-email: 
+date: 2014-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A ruby parser for TeX equations. It parses equations to postfix (reverse
+  polish) notation and can build abstract syntax tree (AST). Also it can render images
+  via latex. Requres modern ruby 1.9.x because of using advanced oniguruma regex engine
+email:
 - sergey.avseyev@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -37,35 +61,32 @@ files:
 - lib/calculus/version.rb
 - test/expression_test.rb
 - test/parser_test.rb
-has_rdoc: true
 homepage: http://avsej.net/calculus
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.9"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '1.9'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: calculus
-rubygems_version: 1.6.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A ruby parser for TeX equations
-test_files: 
+test_files:
 - test/expression_test.rb
 - test/parser_test.rb
+has_rdoc: true