octave-ruby 1.0.7 → 1.0.8

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.8 / 2008-11-26
+
+* 1 major bug fix
+  * Hashes are now converted to octave properly
+  
 == 1.0.7 / 2008-09-12
 
 * 1 minor enhancement

data/ext/octave_api/Makefile

@@ -43,7 +43,7 @@ LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
 RUBY_EXTCONF_H = 
 CFLAGS   =  -fno-common -arch i386 -Os -pipe -fno-common 
 INCFLAGS = -I. -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.
-CPPFLAGS = -DHAVE_OCTAVE_H -I/Applications/Octave.app/Contents/Resources/include -I/Applications/Octave.app/Contents/Resources/lib -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.1/octave -I/Applications/Octave.app/Contents/Resources/lib/octave-3.0.1 -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.1
+CPPFLAGS = -DHAVE_OCTAVE_H -I/Applications/Octave.app/Contents/Resources/include -I/Applications/Octave.app/Contents/Resources/lib -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.2/octave -I/Applications/Octave.app/Contents/Resources/lib/octave-3.0.2 -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.2
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS = -L. -arch i386  
 LDSHARED = g++ -pipe -bundle
@@ -68,8 +68,8 @@ COPY = cp
 
 preload = 
 
-libpath = . $(libdir) /Applications/Octave.app/Contents/Resources/lib /Applications/Octave.app/Contents/Resources/lib/octave-3.0.1
-LIBPATH =  -L"." -L"$(libdir)" -L"/Applications/Octave.app/Contents/Resources/lib" -L"/Applications/Octave.app/Contents/Resources/lib/octave-3.0.1"
+libpath = . $(libdir) /Applications/Octave.app/Contents/Resources/lib /Applications/Octave.app/Contents/Resources/lib/octave-3.0.2
+LIBPATH =  -L"." -L"$(libdir)" -L"/Applications/Octave.app/Contents/Resources/lib" -L"/Applications/Octave.app/Contents/Resources/lib/octave-3.0.2"
 DEFFILE = 
 
 CLEANFILES = mkmf.log

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(0, 1), Cell(keys));
+  Octave_map struct_matrix = Octave_map(dim_vector(1, 1), Cell(keys));
   for (i = 0; i < number_of_keys; i++) {
     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();
   }

data/lib/octave/version.rb

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

data/test/driver/native/test_conversions.rb

@@ -49,18 +49,36 @@ class ConversionsTest < Test::Unit::TestCase
     assert_instance_of Float, result
   end
   
-  def test_should_convert_array
+  def test_should_convert_array_from_and_to
     assert_octave_and_ruby_equal [1, nil, 3.0]
     assert_octave_and_ruby_equal [1, "2", false, ["foo", "bar", "baz"]]
   end
   
-  def test_should_convert_hash
+  def test_should_convert_hash_from_and_to
     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", "bob" => [7,8,9] }
   end
   
+  def test_should_be_able_to_reference_structure_fields_from_hash
+    hash = { "foo" => { "bar" => [1,2,3, [4,5,6]] }, "baz" => { "buz" => [7,8,9] } }
+    @driver.put_variable "hash", hash
+    assert_equal hash["foo"]["bar"], @driver.feval("eval", "hash.foo.bar")
+    assert_equal hash["baz"]["buz"], @driver.feval("eval", "hash.baz.buz")
+  end
+  
+  def test_should_be_able_to_reference_structure_fields_from_octave_struct_matrix
+    bar_matrix = Octave::StructMatrix.new(1, 1, "bar")
+    bar_matrix[0,0]["bar"] = [1,2,3, [4,5,6]]
+    
+    struct_matrix = Octave::StructMatrix.new(1, 1, "foo")
+    struct_matrix[0,0]["foo"] = bar_matrix
+    
+    @driver.put_variable "struct_matrix", struct_matrix
+    assert_equal [1,2,3, [4,5,6]], @driver.feval("eval", "struct_matrix.foo.bar")
+  end
+  
   def test_should_convert_octave_matrix
     matrix = Octave::Matrix.new(3, 3)
     3.times { |m| 3.times { |n| matrix[m, n] = rand } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -06:00
+date: 2008-11-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     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: 
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: octave-ruby
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A Ruby interface to the Octave interpreted language.