octave-ruby 1.0.8 → 1.0.9

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.9 / 2008-12-30
+
+* 1 major bug fix
+  * 1xn matrices are converted to Octave::*Matrix instead of Ruby arrays
+  
 == 1.0.8 / 2008-11-26
 
 * 1 major bug fix

data/Manifest.txt

@@ -32,6 +32,7 @@ lib/octave/driver/native/driver.rb
 lib/octave/engine.rb
 lib/octave/matrix.rb
 lib/octave/version.rb
+octave-ruby.gemspec
 setup.rb
 test/driver/native/test_conversions.rb
 test/driver/native/test_driver.rb

data/README.txt

@@ -1,6 +1,6 @@
 octave-ruby
     http://octave-ruby.rubyforge.org/
-    jonathan.younger@lipomics.com
+    jonathan@daikini.com
     A big thank you to Lipomics Technologies, Inc. http://www.lipomics.com for sponsoring this project.
     
 == DESCRIPTION:

data/Rakefile

@@ -7,7 +7,7 @@ require './lib/octave/version.rb'
 Hoe.new('octave-ruby', Octave::Version::STRING) do |p|
   p.rubyforge_name = 'octave-ruby'
   p.author = ["Jonathan Younger"]
-  p.email = ["jonathan.younger@lipomics.com"]
+  p.email = ["jonathan@daikini.com"]
   p.summary = "A Ruby interface to the Octave interpreted language."
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   p.url = "http://octave-ruby.rubyforge.org/"

data/ext/octave_api/or-cell_matrix.cpp

@@ -12,8 +12,6 @@ VALUE OR_CellMatrix::to_ruby()
   
   if (number_of_rows == 1 && number_of_columns == 1) {
     return OR_Variable(cell(0)).to_ruby();
-  } else if (number_of_rows == 1) {
-    number_of_values = number_of_columns;
   } else if (number_of_columns == 1) {
     number_of_values = number_of_rows;
   } else {

data/ext/octave_api/or-matrix.cpp

@@ -16,8 +16,6 @@ VALUE OR_Matrix::to_ruby()
   
   if ((number_of_rows == 0) && (number_of_columns == 0)) {
     return rb_ary_new2(0);
-  } else if (number_of_rows == 1) {
-    values = matrix.row(0);
   } else if (number_of_columns == 1) {
     values = matrix.column(0);
   } else {

data/lib/octave/version.rb

@@ -4,7 +4,7 @@ module Octave
 
     MAJOR = 1
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
     #:beta-tag:

data/octave-ruby.gemspec

@@ -0,0 +1,21 @@
+Gem::Specification.new do |s|
+  s.name = %q{octave-ruby}
+  s.version = "1.0.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jonathan Younger"]
+  s.date = %q{2008-12-30}
+  s.description = %q{== USAGE:  require 'octave'  engine = Octave::Engine.new engine.eval "123.456 * 789.101112" engine.rand(10)  matrix = Octave::Matrix.new(20, 400) 20.times { |m| 400.times { |n| matrix[m, n] = rand } } engine.put_variable("m", matrix)  engine.save "/tmp/20_x_400_matrix"  == REQUIREMENTS:  * Octave * GCC or some other compiler to build the included extension * Mocha (For testing only)}
+  s.email = ["jonathan@daikini.com"]
+  s.extensions = ["ext/octave_api/extconf.rb"]
+  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.txt"]
+  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.txt", "Rakefile", "ext/octave_api/MANIFEST", "ext/octave_api/Makefile", "ext/octave_api/extconf.rb", "ext/octave_api/octave-includes.h", "ext/octave_api/octave-ruby.cpp", "ext/octave_api/octave-ruby.h", "ext/octave_api/octave_api.c", "ext/octave_api/octave_api.h", "ext/octave_api/or-array.cpp", "ext/octave_api/or-array.h", "ext/octave_api/or-boolean_matrix.cpp", "ext/octave_api/or-boolean_matrix.h", "ext/octave_api/or-cell_matrix.cpp", "ext/octave_api/or-cell_matrix.h", "ext/octave_api/or-hash.cpp", "ext/octave_api/or-hash.h", "ext/octave_api/or-matrix.cpp", "ext/octave_api/or-matrix.h", "ext/octave_api/or-string.cpp", "ext/octave_api/or-string.h", "ext/octave_api/or-struct_matrix.cpp", "ext/octave_api/or-struct_matrix.h", "ext/octave_api/or-variable.cpp", "ext/octave_api/or-variable.h", "lib/octave.rb", "lib/octave/driver/native/driver.rb", "lib/octave/engine.rb", "lib/octave/matrix.rb", "lib/octave/version.rb", "octave-ruby.gemspec", "setup.rb", "test/driver/native/test_conversions.rb", "test/driver/native/test_driver.rb", "test/test_engine.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://octave-ruby.rubyforge.org/}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{octave-ruby}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{A Ruby interface to the Octave interpreted language.}
+  s.test_files = ["test/driver/native/test_conversions.rb", "test/driver/native/test_driver.rb", "test/test_engine.rb"]
+end

data/test/driver/native/test_conversions.rb

@@ -101,17 +101,18 @@ class ConversionsTest < Test::Unit::TestCase
     assert_octave_and_ruby_equal []
   end
   
-  def test_should_convert_a_1xn_octave_matrix_to_an_array
+  def test_should_convert_a_1xn_octave_matrix_to_an_octave_matrix
     matrix = Octave::Matrix.new(1, 3)
     matrix[0, 0] = 1
     matrix[0, 1] = 2
     matrix[0, 2] = 3
     
-    expected_array = [1,2,3]
-    result = to_octave_to_ruby(matrix)
-    
-    assert_equal expected_array, result
-    assert_instance_of Array, result
+    result = @driver.put_variable "octave_matrix", matrix
+
+    assert_instance_of Octave::Matrix, result
+    assert_equal matrix, result
+    assert_equal 1, @driver.feval("rows", result)
+    assert_equal 3, @driver.feval("columns", result)
   end
   
   def test_should_convert_an_nx1_octave_matrix_to_an_array
@@ -125,6 +126,8 @@ class ConversionsTest < Test::Unit::TestCase
     
     assert_equal expected_array, result
     assert_instance_of Array, result
+    assert_equal 3, @driver.feval("rows", result)
+    assert_equal 1, @driver.feval("columns", result)
   end
   
   def test_should_convert_octave_struct_matrix
@@ -169,13 +172,18 @@ class ConversionsTest < Test::Unit::TestCase
     assert_equal [1, 2, 3], to_octave_to_ruby(cell_matrix)
   end
   
-  def test_should_convert_a_1xn_cell_matrix_to_an_array
+  def test_should_convert_a_1xn_cell_matrix_to_an_octave_cell_matrix
     cell_matrix = Octave::CellMatrix.new(1, 3)
     cell_matrix[0,0] = "foo"
     cell_matrix[0,1] = "bar"
     cell_matrix[0,2] = "baz"
     
-    assert_equal %w(foo bar baz), to_octave_to_ruby(cell_matrix)
+    result = @driver.put_variable "octave_cell_matrix", cell_matrix
+
+    assert_instance_of Octave::CellMatrix, result
+    assert_equal cell_matrix, result
+    assert_equal 1, @driver.feval("rows", result)
+    assert_equal 3, @driver.feval("columns", result)
   end
   
   def test_should_convert_a_nx1_cell_matrix_to_an_array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-26 00:00:00 -07:00
+date: 2008-12-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     version: 
 description: "== USAGE:  require 'octave'  engine = Octave::Engine.new engine.eval \"123.456 * 789.101112\" engine.rand(10)  matrix = Octave::Matrix.new(20, 400) 20.times { |m| 400.times { |n| matrix[m, n] = rand } } engine.put_variable(\"m\", matrix)  engine.save \"/tmp/20_x_400_matrix\"  == REQUIREMENTS:  * Octave * GCC or some other compiler to build the included extension * Mocha (For testing only)"
 email: 
-- jonathan.younger@lipomics.com
+- jonathan@daikini.com
 executables: []
 
 extensions: 
@@ -69,6 +69,7 @@ files:
 - lib/octave/engine.rb
 - lib/octave/matrix.rb
 - lib/octave/version.rb
+- octave-ruby.gemspec
 - setup.rb
 - test/driver/native/test_conversions.rb
 - test/driver/native/test_driver.rb