octave-ruby 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.3 / 2008-02-29
+
+* 1 major bug fix
+  * Hashes and struct matrices now convert with proper dimensions
+  
+  
 == 1.0.2 / 2008-02-28
 
 * 1 minor enhancement

data/ext/octave_api/or-hash.cpp

@@ -14,9 +14,9 @@ octave_value OR_Hash::to_octave()
     keys.append(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr));
   }
 
-  Octave_map struct_matrix = Octave_map(dim_vector(number_of_keys, 1), Cell(keys));
+  Octave_map struct_matrix = Octave_map(dim_vector(0, 1), Cell(keys));
   for (i = 0; i < number_of_keys; i++) {
-    struct_matrix.contents(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr))(i, 0) = OR_Variable(rb_hash_aref(ruby_val, rb_str_new2(RSTRING(RARRAY(names)->ptr[i])->ptr))).to_octave();
+    struct_matrix.contents(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr)) = OR_Variable(rb_hash_aref(ruby_val, rb_str_new2(RSTRING(RARRAY(names)->ptr[i])->ptr))).to_octave();
   }
 
   return struct_matrix;

data/ext/octave_api/or-struct_matrix.cpp

@@ -13,10 +13,15 @@ VALUE OR_StructMatrix::to_ruby()
   int i;
   VALUE cells, row, cell;
 
-  if (number_of_columns == 1) {
+  if (number_of_rows == 0 && number_of_columns == 1) {
     ruby_val = rb_hash_new();
     for (i = 0; i < number_of_keys; i++) {
-      rb_hash_aset(ruby_val, rb_str_new2(keys[i].c_str()), OR_Variable(struct_matrix.contents(keys[i])(i)).to_ruby());
+      rb_hash_aset(ruby_val, rb_str_new2(keys[i].c_str()), OR_Variable(struct_matrix.contents(keys[i])).to_ruby());
+    }
+  } else if (number_of_rows == 1 && number_of_columns == 1) {
+    ruby_val = rb_hash_new();
+    for (i = 0; i < number_of_keys; i++) {
+      rb_hash_aset(ruby_val, rb_str_new2(keys[i].c_str()), OR_Variable(struct_matrix.contents(keys[i])(0)).to_ruby());
     }
   } else {
     int number_of_arguments_to_struct_matrix = number_of_keys + 2;

data/lib/octave/version.rb

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

data/test/driver/native/test_conversions.rb

@@ -4,6 +4,7 @@ require 'octave'
 require 'octave/driver/native/driver'
 require 'rubygems'
 require 'mocha'
+require 'yaml'
 
 class ConversionsTest < Test::Unit::TestCase
   def setup
@@ -57,7 +58,7 @@ class ConversionsTest < Test::Unit::TestCase
     assert_octave_and_ruby_equal "foo" => "bar"
     assert_octave_and_ruby_equal "foo" => [1,2,3]
     assert_octave_and_ruby_equal "foo" => { "bar" => [1,2,3, [4,5,6]] }
-    assert_octave_and_ruby_equal "foo" => { "bar" => [1,2,3, [4,5,6]], "baz" => "buz" }
+    assert_octave_and_ruby_equal "foo" => { "bar" => [1,2,3, [4,5,6]], "baz" => "buz", "bob" => [7,8,9] }
   end
   
   def test_should_convert_octave_matrix
@@ -153,4 +154,28 @@ class ConversionsTest < Test::Unit::TestCase
     
     assert_equal %w(foo bar baz), to_octave_to_ruby(cell_matrix)
   end
-end
+  
+  def test_hmm
+    struct_matrix = Octave::StructMatrix.new(17, 2, "name", "age", "married", "cats", "car")
+    17.times do |m|
+      2.times do |n|
+        struct_matrix[m, n]["name"] = "Bob #{m}.#{n}"
+        struct_matrix[m, n]["age"] = (rand * 100).to_i
+        struct_matrix[m, n]["married"] = (rand > 0.5)
+        struct_matrix[m, n]["cats"] = { "name" => "Kitty #{m}.#{n}" }
+        struct_matrix[m, n]["car"] = nil
+      end
+    end
+    
+    data = {
+      "foo" => struct_matrix,
+      "bar" => [1,2,3,4],
+      "baz" => struct_matrix
+    }
+    
+    @driver.put_variable "data", data
+    @driver.feval "save", "-V7", "/tmp/hmm.mat", "data"
+    # assert_octave_and_ruby_equal data
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 -07:00
+date: 2008-02-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency