octave-ruby 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.1 / 2008-02-28
+
+* 2 major bug fixes
+  * Ruby hashes with more than 1 key are converted to Octave properly
+  * Octave struct matrices with more than 1 key are converted to Ruby properly
+  
+  
 == 1.0.0 / 2008-01-02
 
 * 1 major enhancement

data/ext/octave_api/or-hash.cpp

@@ -14,7 +14,7 @@ octave_value OR_Hash::to_octave()
     keys.append(std::string(RSTRING(RARRAY(names)->ptr[i])->ptr));
   }
 
-  Octave_map struct_matrix = Octave_map(dim_vector(1, 1), Cell(keys));
+  Octave_map struct_matrix = Octave_map(dim_vector(number_of_keys, 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();
   }

data/ext/octave_api/or-struct_matrix.cpp

@@ -13,10 +13,10 @@ VALUE OR_StructMatrix::to_ruby()
   int i;
   VALUE cells, row, cell;
 
-  if (number_of_rows == 1 && number_of_columns == 1) {
+  if (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());
+      rb_hash_aset(ruby_val, rb_str_new2(keys[i].c_str()), OR_Variable(struct_matrix.contents(keys[i])(i)).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  = 0
+    TINY  = 1
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
     #:beta-tag:

data/test/driver/native/test_conversions.rb

@@ -57,6 +57,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" }
   end
   
   def test_should_convert_octave_matrix
@@ -94,16 +95,13 @@ class ConversionsTest < Test::Unit::TestCase
   end
   
   def test_should_convert_octave_struct_matrix
-    cats = Octave::StructMatrix.new(17, 1, "name")
-    17.times { |m| 1.times { |n| cats[m, n]["name"] = "Kitty #{m}.#{n}" } }
-    
-    struct_matrix = Octave::StructMatrix.new(17, 1, "name", "age", "married", "cats", "car")
+    struct_matrix = Octave::StructMatrix.new(17, 2, "name", "age", "married", "cats", "car")
     17.times do |m|
-      1.times do |n|
+      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"] = cats
+        struct_matrix[m, n]["cats"] = { "name" => "Kitty #{m}.#{n}" }
         struct_matrix[m, n]["car"] = nil
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 -07:00
+date: 2008-02-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.0
     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: