octave-ruby 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.4 / 2008-05-14
+
+* 1 minor enhancement
+  * Added support for boolean matrices
+
 == 1.0.3 / 2008-02-29
 
 * 1 major bug fix

data/Manifest.txt

@@ -13,6 +13,8 @@ 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

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.0/octave -I/Applications/Octave.app/Contents/Resources/lib/octave-3.0.0 -I/Applications/Octave.app/Contents/Resources/include/octave-3.0.0
+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
 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.0
-LIBPATH =  -L"." -L"$(libdir)" -L"/Applications/Octave.app/Contents/Resources/lib" -L"/Applications/Octave.app/Contents/Resources/lib/octave-3.0.0"
+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"
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -79,9 +79,9 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lz -lcruft -loctave -loctinterp  -lpthread -ldl -lm  
-SRCS = octave_api.c octave-ruby.cpp or-array.cpp or-cell_matrix.cpp or-hash.cpp or-matrix.cpp or-string.cpp or-struct_matrix.cpp or-variable.cpp
-OBJS = octave_api.o octave-ruby.o or-array.o or-cell_matrix.o or-hash.o or-matrix.o or-string.o or-struct_matrix.o or-variable.o
+LIBS = $(LIBRUBYARG_SHARED) -lcruft -loctave -loctinterp  -lpthread -ldl -lm  
+SRCS = octave_api.c octave-ruby.cpp or-array.cpp or-boolean_matrix.cpp or-cell_matrix.cpp or-hash.cpp or-matrix.cpp or-string.cpp or-struct_matrix.cpp or-variable.cpp
+OBJS = octave_api.o octave-ruby.o or-array.o or-boolean_matrix.o or-cell_matrix.o or-hash.o or-matrix.o or-string.o or-struct_matrix.o or-variable.o
 TARGET = octave_api
 DLLIB = $(TARGET).bundle
 EXTSTATIC = 

data/ext/octave_api/or-boolean_matrix.cpp

@@ -0,0 +1,61 @@
+#include "or-boolean_matrix.h"
+
+OR_BooleanMatrix::~OR_BooleanMatrix() {}
+
+VALUE OR_BooleanMatrix::to_ruby()
+{
+  Matrix matrix;
+  MArray<double> values;
+  double cell;
+  int i, number_of_values;
+  VALUE argv[2];
+  
+  matrix = octave_val.matrix_value();
+  int number_of_rows = matrix.rows();
+  int number_of_columns = matrix.columns();
+  
+  if (number_of_rows == 1) {
+    values = matrix.row(0);
+  } else if (number_of_columns == 1) {
+    values = matrix.column(0);
+  } else {
+    argv[0] = INT2FIX(number_of_rows);
+    argv[1] = INT2FIX(number_of_columns);
+    ruby_val = rb_class_new_instance(2, argv, rb_path2class("Octave::Matrix"));
+    
+    int row_index, column_index = 0;
+    VALUE cells, row;
+    cells = rb_ary_new2(number_of_rows);
+    for (row_index = 0; row_index < number_of_rows; row_index++) {
+      row = rb_ary_new2(number_of_columns);
+      values = matrix.row(row_index);
+      
+      for (column_index = 0; column_index < number_of_columns; column_index++) {
+        cell = values(column_index);
+        if (xisnan(cell) || octave_is_NA(cell)) {
+          rb_ary_push(row, Qnil);
+        } else {
+          rb_ary_push(row, (int(cell) == 1 ? Qtrue : Qfalse));
+        }
+      }
+      
+      rb_ary_push(cells, row);
+    }
+    
+    rb_iv_set(ruby_val, "@cells", cells);
+    return ruby_val;
+  }
+  
+  number_of_values = values.length();
+  ruby_val = rb_ary_new2(number_of_values);
+  for (i = 0; i < number_of_values; i++) {
+    cell = values(i);
+    if (xisnan(cell) || octave_is_NA(cell)) {
+      rb_ary_push(ruby_val, Qnil);
+    } else {
+      rb_ary_push(ruby_val, (int(cell) == 1 ? Qtrue : Qfalse));
+    }
+  }
+  
+  return ruby_val;
+}

data/ext/octave_api/or-boolean_matrix.h

@@ -0,0 +1,20 @@
+#ifndef OR_BOOLEAN_MATRIX_DEFINED_H_
+#define OR_BOOLEAN_MATRIX_DEFINED_H_
+
+#include "ruby.h"
+#include "octave-includes.h"
+
+class OR_BooleanMatrix
+{
+  private:
+    VALUE ruby_val;
+    octave_value octave_val;
+
+  public:
+    OR_BooleanMatrix(octave_value o) : octave_val(o) { };
+    ~OR_BooleanMatrix();
+  
+    VALUE to_ruby();
+};
+
+#endif /* OR_BOOLEAN_MATRIX_DEFINED_H_ */

data/ext/octave_api/or-variable.cpp

@@ -1,6 +1,7 @@
 #include "or-variable.h"
 #include "or-string.h"
 #include "or-matrix.h"
+#include "or-boolean_matrix.h"
 #include "or-struct_matrix.h"
 #include "or-cell_matrix.h"
 #include "or-array.h"
@@ -12,6 +13,8 @@ VALUE OR_Variable::to_ruby()
 {
   if (octave_val.is_string()) {
     return OR_String(octave_val).to_ruby();
+  } else if (octave_val.is_bool_matrix()) {
+    return OR_BooleanMatrix(octave_val).to_ruby();
   } else if (octave_val.is_bool_type()) {
     return (octave_val.bool_value() ? Qtrue : Qfalse);
   } else if (octave_val.is_cell()) {

data/lib/octave/version.rb

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

data/test/driver/native/test_conversions.rb

@@ -155,27 +155,9 @@ class ConversionsTest < Test::Unit::TestCase
     assert_equal %w(foo bar baz), to_octave_to_ruby(cell_matrix)
   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
-    
+  def test_should_convert_boolean_matrix
+    assert_octave_and_ruby_equal [true, false, true]
+    boolean_matrix = @driver.feval "eval", "x = [1,2]; (x > 2 | x < 2)"
+    assert_equal [true, false], boolean_matrix
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: octave-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 -07:00
+date: 2008-05-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     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: 
@@ -49,6 +49,8 @@ files:
 - 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
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: octave-ruby
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A Ruby interface to the Octave interpreted language.