matrix_dsl 1.0.0 → 1.1.0

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/README.markdown

@@ -11,8 +11,8 @@ You can execute script similar to:
          ]
 
     Transform M1:
-      R2 <- 2R2 + R3
-      C3 <- C3 - C1
+      R2 -> 2R2 + R3
+      C3 -> C3 - C1
 
     det_m1 = det M1
 
@@ -37,7 +37,7 @@ Usage
 ==========
 
     gem install matrix_dsl
-    matrix_dsl_run < curl http://github.com/jasim/matrix_transformations/blob/master/example.matrix_dsl
+    matrix_dsl_run < curl http://github.com/jasim/matrix_transformations/blob/master/examples/simple_example.matrix_dsl
 
 To integrate Matrix DSL scripts into your code, please have a look at http://github.com/jasim/matrix_transformations/blob/master/tests/basic_test.rb
 

data/Rakefile

@@ -0,0 +1,56 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "matrix_dsl"
+    gem.summary = %Q{A simple DSL for expressing and evaluating basic Matrix transformations and arithmetic operations}
+    gem.description = gem.summary
+    gem.email = "jasim.ab@gmail.com"
+    gem.homepage = "http://github.com/jasim/matrix_dsl"
+    gem.authors = ["Jasim A Basheer"]
+    gem.add_dependency "treetop"
+    gem.add_dependency "colorize"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "matrix_dsl #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+1.1.0

data/examples/simple_example.matrix_dsl

@@ -0,0 +1,17 @@
+A = [
+	[1 -1 0 2 1]
+	[3 1 1 -1 2]
+	[4 0 1 0 3]
+	[9 -1 2 3 7]
+	]
+
+Transform A:
+ R2 -> R2 - 3R1
+ R3 -> R3 - 4R1
+ R4 -> R4 - 9R1
+
+ R3 -> R3 - R2
+ R4 -> R4 - 2R2
+
+ R3 -> R3 - R4
+

data/lib/matrix_dsl_def.treetop

@@ -12,9 +12,9 @@ grammar MatrixTransformations
 	# === Matrix transformation grammar ===
 	# ie those inside the 'Transform' block: 
 	# Transform M1:
-	#	R1 <- R1 + R2
-	#   R3 <- 3R3
-	#   R4 <- R4/2
+	#	R1 -> R1 + R2
+	#   R3 -> 3R3
+	#   R4 -> R4/2
 	# etc.		
 	
 	rule transformation
@@ -30,7 +30,7 @@ grammar MatrixTransformations
 	end
 	
 	rule transform_operator
-		space "<-" space
+		space "->" space
 	end
 	
 	rule transform_expression
@@ -89,7 +89,7 @@ grammar MatrixTransformations
 	
 	#-- Rest of the stuff:
 	rule number
-	   [0-9]+ <MatrixDSL::NodeNumber>
+	   [\-]? [0-9]+ <MatrixDSL::NodeNumber>
 	end
 
 	rule function

data/lib/matrix_dsl_helpers.rb

@@ -14,7 +14,7 @@ module MatrixDSL_Helpers
     error_found=false
 
     script.rstrip!
-    print "\n\nExecuting script:".yellow
+    print "\nExecuting script:\n".yellow
     puts script.blue
     
     $matrix_dsl_vars.clear     # Start with a fresh state.
@@ -46,7 +46,7 @@ module MatrixDSL_Helpers
     
     
     puts "success".green
-    return !error_found
+    return true
   end
     
   # Displays given script, but highlights the character at supplied offset in red color.

data/matrix_dsl.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{matrix_dsl}
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jasim A Basheer"]
+  s.date = %q{2010-10-26}
+  s.description = %q{A simple DSL for expressing and evaluating basic Matrix transformations and arithmetic operations}
+  s.email = %q{jasim.ab@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "examples/simple_example.matrix_dsl",
+     "lib/matrix_dsl.rb",
+     "lib/matrix_dsl_def.treetop",
+     "lib/matrix_dsl_helpers.rb",
+     "matrix_dsl.gemspec",
+     "matrix_dsl_run.rb",
+     "tests/basic_test.rb"
+  ]
+  s.homepage = %q{http://github.com/jasim/matrix_dsl}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A simple DSL for expressing and evaluating basic Matrix transformations and arithmetic operations}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<treetop>, [">= 0"])
+      s.add_runtime_dependency(%q<colorize>, [">= 0"])
+    else
+      s.add_dependency(%q<treetop>, [">= 0"])
+      s.add_dependency(%q<colorize>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<treetop>, [">= 0"])
+    s.add_dependency(%q<colorize>, [">= 0"])
+  end
+end

data/matrix_dsl_run.rb

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'ruby-debug'
 require 'colorize'
 
-require 'lib/matrix_dsl.rb'
-require 'lib/matrix_dsl_helpers.rb'
+$:.unshift File.join(File.dirname(__FILE__),'lib')
+require 'matrix_dsl.rb'
+require 'matrix_dsl_helpers.rb'
 include MatrixDSL
 include MatrixDSL_Helpers
 

data/tests/basic_test.rb

@@ -67,9 +67,9 @@ class BasicTest < Test::Unit::TestCase
     det2 = det M1
 
     Transform M1: 
-      R1 <- R1 + R2
-      R3 <- R3 - R2
-      R2 <- 2R2
+      R1 -> R1 + R2
+      R3 -> R3 - R2
+      R2 -> 2R2
     "
     
     expected = {"M1"=>Matrix[[4.0, 4.0, 4.0], [6.0, 4.0, 2.0], [2.0, -1.0, 1.0]], "det1"=>-20.0, "det2"=>-20.0}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: matrix_dsl
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jasim A Basheer
@@ -56,14 +56,18 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .gitignore
+- LICENSE
 - README.markdown
-- example.matrix_dsl
+- Rakefile
+- VERSION
+- examples/simple_example.matrix_dsl
 - lib/matrix_dsl.rb
 - lib/matrix_dsl_def.treetop
 - lib/matrix_dsl_helpers.rb
+- matrix_dsl.gemspec
 - matrix_dsl_run.rb
 - tests/basic_test.rb
-- LICENSE
 has_rdoc: true
 homepage: http://github.com/jasim/matrix_dsl
 licenses: []

data/example.matrix_dsl

@@ -1,11 +0,0 @@
-
-x=33
-m1=[ [10 23]
-     [45 33]
-   ]
-
-d_m1 = det m1
-rank_m1 = rank m1
-
-m2 = m1 * x
-d_m2 = det m2