Merge branch 'master' of github.com:sciruby/nmatrix

Author: John Woods

README.rdoc

@@ -44,7 +44,7 @@ The requirements for NMatrix are:
 To install +nmatrix-atlas+ or +nmatrix-lapacke+, an additional requirement is a
 compatible LAPACK library.
 Detailed directions for this step can be found
-{here}[https://github.com/wlevine/nmatrix/wiki/Installation].
+{here}[https://github.com/SciRuby/nmatrix/wiki/Installation].
 
 If you want to obtain the latest (development) code, you should generally do:
 
@@ -79,7 +79,7 @@ singular value decomposition, eigenvalues/eigenvectors, inverses of matrices
 bigger than 3-by-3), your code now depends on the +nmatrix-atlas+ gem. You
 will need to add this a dependency of your project and <tt>require 'nmatrix/atlas'</tt>
 in addition to <tt>require 'nmatrix'</tt>. In most cases, no further changes
-should be necessary, however there have been a few {API changes}[https://github.com/wlevine/nmatrix/wiki/API-Changes], please check
+should be necessary, however there have been a few {API changes}[https://github.com/SciRuby/nmatrix/wiki/API-Changes], please check
 to see if these affect you.
 
 == Documentation

ext/nmatrix/extconf.rb

@@ -158,9 +158,9 @@ def gplusplus_version
 #$libs += " -lprofiler "
 
 # For release, these next two should both be changed to -O3.
-$CFLAGS += " -O0 -g "
+$CFLAGS += " -O3 "
 #$CFLAGS += " -static -O0 -g "
-$CPPFLAGS += " -O0 -g -std=#{$CPP_STANDARD} " #-fmax-errors=10 -save-temps
+$CPPFLAGS += " -O3 -std=#{$CPP_STANDARD} " #-fmax-errors=10 -save-temps
 #$CPPFLAGS += " -static -O0 -g -std=#{$CPP_STANDARD} "
 
 CONFIG['warnflags'].gsub!('-Wshorten-64-to-32', '') # doesn't work except in Mac-patched gcc (4.2)

ext/nmatrix/ruby_nmatrix.c

@@ -880,6 +880,22 @@ static VALUE nm_eqeq(VALUE left, VALUE right) {
 
   bool result = false;
 
+  // Check that the shapes match before going any further.
+  if (l->storage->dim != r->storage->dim) {
+    NM_CONSERVATIVE(nm_unregister_value(&left));
+    NM_CONSERVATIVE(nm_unregister_value(&right));
+    rb_raise(nm_eShapeError, "cannot compare matrices with different dimension");
+  }
+
+  size_t dim = l->storage->dim;
+  for (size_t i=0; i<dim; i++) {
+    if (l->storage->shape[i] != r->storage->shape[i]) {
+      NM_CONSERVATIVE(nm_unregister_value(&left));
+      NM_CONSERVATIVE(nm_unregister_value(&right));
+      rb_raise(nm_eShapeError, "cannot compare matrices with different shapes");
+    }
+  }
+
   if (l->stype != r->stype) { // DIFFERENT STYPES
 
     if (l->stype == nm::DENSE_STORE)

ext/nmatrix/storage/dense/dense.cpp

@@ -976,12 +976,6 @@ bool eqeq(const DENSE_STORAGE* left, const DENSE_STORAGE* right) {
   tmp1 = NULL; tmp2 = NULL;
   bool result = true;
   /* FIXME: Very strange behavior! The GC calls the method directly with non-initialized data. */
-  if (left->dim != right->dim) {
-    nm_dense_storage_unregister(right);
-    nm_dense_storage_unregister(left);
-
-    return false;
-  }
 
   LDType* left_elements	  = (LDType*)left->elements;
   RDType* right_elements  = (RDType*)right->elements;

lib/nmatrix/nmatrix.rb

@@ -1077,7 +1077,8 @@ def __sparse_initial_set__(ary) #:nodoc:
   end
 
 
-  # Function assumes the dimensions and such have already been tested.
+  # This function assumes that the shapes of the two matrices have already
+  # been tested and are the same.
   #
   # Called from inside NMatrix: nm_eqeq
   #

spec/00_nmatrix_spec.rb

@@ -478,13 +478,36 @@
   context "#==" do
     [:dense, :list, :yale].each do |left|
       [:dense, :list, :yale].each do |right|
-        next if left == right
         context ("#{left}?#{right}") do
-          it "should compare two matrices of differing stypes" do
-            n = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,0,5,6,7,0], stype: left)
-            m = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,0,5,6,7,0], stype: right)
-            expect(n).to eq(m)
+          it "tests equality of two equal matrices" do
+            n = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,0], stype: left)
+            m = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,0], stype: right)
+
+            expect(n==m).to eq(true)
           end
+
+          it "tests equality of two unequal matrices" do
+            n = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,1], stype: left)
+            m = NMatrix.new([3,4], [0,0,1,2,0,0,3,4,0,0,0,0], stype: right)
+
+            expect(n==m).to eq(false)
+          end
+
+          it "tests equality of matrices with different shapes" do
+            n = NMatrix.new([2,2], [1,2, 3,4], stype: left)
+            m = NMatrix.new([2,3], [1,2, 3,4, 5,6], stype: right)
+            x = NMatrix.new([1,4], [1,2, 3,4], stype: right)
+
+            expect{n==m}.to raise_error(ShapeError)
+            expect{n==x}.to raise_error(ShapeError)
+          end
+
+          it "tests equality of matrices with different dimension" do
+            n = NMatrix.new([2,1], [1,2], stype: left)
+            m = NMatrix.new([2], [1,2], stype: right)
+
+            expect{n==m}.to raise_error(ShapeError)
+          end if left != :yale && right != :yale # yale must have dimension 2
         end
       end
     end

spec/03_nmatrix_monkeys_spec.rb

@@ -59,7 +59,7 @@
 
     it "intuits shape of Array into multiple dimensions" do
       a = [[[0], [1]], [[2], [3]], [[4], [5]]]
-      expect(a.to_nm).to eq(NMatrix.new([3,1,2], a.flatten))
+      expect(a.to_nm).to eq(NMatrix.new([3,2,1], a.flatten))
       expect(a).to eq(a.to_nm.to_a)
     end