matlab-ruby 2.0.2 → 2.0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 2.0.3 / 2008-05-19
+
+* 2 bug fixes
+  * Empty matrices are converted to empty ruby arrays.
+  * Empty ruby arrays are converted to an empty MATLAB matrix
+
 == 2.0.2 / 2008-05-19
 
 * 1 bug fix

data/lib/matlab/driver/native/conversions.rb

@@ -50,7 +50,10 @@ end
 class Array
   # Converts the array into a 1 Dimensional MATLAB numeric or cell matrix
   def to_matlab
-    if all? { |value| value.kind_of?(Numeric) || value.nil? }
+    if empty?
+      matrix = Matlab::Matrix.new(0, 0)
+      matrix.to_matlab
+    elsif all? { |value| value.kind_of?(Numeric) || value.nil? }
       matrix = Matlab::Matrix.new(size, 1)
     
       each_with_index do |value, index|
@@ -231,7 +234,9 @@ class SWIG::TYPE_p_mxArray_tag
       mxArrayToString(self)
     when mxIsLogical(self)
       mxIsLogicalScalarTrue(self)
-    when (mxGetM(self) > 1 || mxGetN(self) > 1) || (mxGetM(self) == 0 && mxGetN(self) == 0)
+    when (mxGetM(self) == 0 && mxGetN(self) == 0)
+      []
+    when (mxGetM(self) > 1 || mxGetN(self) > 1)
       Matlab::Matrix.from_matlab(self)
     when mxIsDouble(self)
       mxGetScalar(self)

data/lib/matlab/version.rb

@@ -4,7 +4,7 @@ module Matlab
 
     MAJOR = 2
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
     #:beta-tag:

data/test/driver/native/test_conversions.rb

@@ -66,7 +66,13 @@ class ConversionsTest < Test::Unit::TestCase
   
   def test_should_convert_a_0x0_matlab_matrix
     matrix = Matlab::Matrix.new(0, 0)
-    assert_equal matrix, matrix.to_matlab.to_ruby
+    result = matrix.to_matlab.to_ruby
+    assert_equal [], result 
+  end
+  
+  def test_should_convert_an_empty_ruby_array
+    array = []
+    assert_equal array, array.to_matlab.to_ruby
   end
   
   def test_matlab_cell_matrix_to_matlab_to_ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matlab-ruby
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Jonathan Younger