stair_car 0.1.1 → 0.1.2

data/lib/stair_car/pmatrix/compare.rb

@@ -24,10 +24,19 @@ module StairCar
       @data.cardinality > 0
     end
 
-
     # Compares this matrix to another to see if they are the same (in values)
     def ==(matrix2)
-      self.data.equals(matrix2.data)
+      if matrix2.is_a?(Fixnum) || matrix2.is_a?(Float)
+        # See if its a 1x1
+        if rows != 1 || cols != 1
+          return false
+        else
+          # Check if the value matches
+          return self.to_i == matrix2
+        end
+      else
+        return self.data.equals(matrix2.data)
+      end
     end
 
   end

data/lib/stair_car/pmatrix/pmatrix.rb

@@ -71,17 +71,33 @@ module StairCar
       end
     end
 
+    # Takes a 1x1 matrix and converts it to an integer, raises an exception
+    # if the matrix is not 1x1
+    def to_i
+      if rows != 1 || cols != 1
+        raise IncorrectMatrixDimensions, "to_i should only be called on 1x1 matricies"
+      end
+      return value_at(0, 0)
+    end
+
+    # Gets the value at the row and column
+    def value_at(row, col)
+      row = convert_indicies(row, self.rows)
+      col = convert_indicies(col, self.cols)
+      return @data.get(row.first, col.first)
+    end
+
     def [](rows, cols)
       rows = convert_indicies(rows, self.rows)
       cols = convert_indicies(cols, self.cols)
 
       # Returns either the value in a cell or a subview
-      if rows && cols && rows.size == 1 && cols.size == 1 && rows.first.is_a?(Fixnum) && cols.first.is_a?(Fixnum)
-        @data.get(rows.first, cols.first)
-      else
+      # if rows && cols && rows.size == 1 && cols.size == 1 && rows.first.is_a?(Fixnum) && cols.first.is_a?(Fixnum)
+      #   @data.get(rows.first, cols.first)
+      # else
         # Get subview, also convert rows/cols to java arrays
         self.class.new(@data.view_selection(rows && rows.to_java(:int), cols && cols.to_java(:int)))
-      end
+      # end
     end
 
     def []=(rows, cols, value)

data/lib/stair_car/shared/errors.rb

@@ -4,4 +4,8 @@ module StairCar
 
   class InverseMatrixIsSignular < RuntimeError
   end
+  
+  class IncorrectMatrixDimensions < RuntimeError
+  end
+  
 end

data/lib/stair_car/shared/inspect.rb

@@ -76,7 +76,7 @@ module StairCar
       max_cell_width = 0
       rows.times do |row|
         cols.times do |column|
-          cell_value = self[row, column]
+          cell_value = self.value_at(row, column)
           width = formatter.call(cell_value).size + 1
 
           # Track the biggest cell width we've seen so far
@@ -97,11 +97,11 @@ module StairCar
       def row_line_text(row_number, formatter, max_columns, screen_width, cell_width, hidden_columns)
         line = ''
         [self.cols-1, max_columns].min.times do |column|
-          cell_value = self[row_number, column]
+          cell_value = self.value_at(row_number, column)
           line << formatter.call(cell_value).ljust(cell_width)
         end
 
-        last_cell = formatter.call(self[row_number, -1]).ljust(cell_width-1)
+        last_cell = formatter.call(self.value_at(row_number, -1)).ljust(cell_width-1)
         padding_size = screen_width - line.size - last_cell.size - 1
         line << ('.' * padding_size) + ' ' if hidden_columns
 

data/lib/stair_car/shared/iteration.rb

@@ -3,7 +3,7 @@ module StairCar
     def each(&block)
       rows.times do |row|
         cols.times do |col|
-          yield(self[row,col])
+          yield(self.value_at(row,col))
         end
       end
     end
@@ -11,7 +11,7 @@ module StairCar
     def each_with_index(&block)
       rows.times do |row|
         cols.times do |col|
-          yield(self[row,col], row, col)
+          yield(self.value_at(row,col), row, col)
         end
       end
     end

data/lib/stair_car/umatrix/compare.rb

@@ -24,10 +24,19 @@ module StairCar
     #   @data.cardinality > 0
     # end
 
-
     # Compares this matrix to another to see if they are the same (in values)
     def ==(matrix2)
-      self.data.equalsContent(matrix2.data)
+      if matrix2.is_a?(Fixnum) || matrix2.is_a?(Float)
+        # See if its a 1x1
+        if rows != 1 || cols != 1
+          return false
+        else
+          # Check if the value matches
+          return self.to_i == matrix2
+        end
+      else
+        self.data.equalsContent(matrix2.data)
+      end
     end
 
   end

data/lib/stair_car/umatrix/umatrix.rb

@@ -87,29 +87,43 @@ module StairCar
       return shape[1]
     end
 
+    # Takes a 1x1 matrix and converts it to an integer, raises an exception
+    # if the matrix is not 1x1
+    def to_i
+      if rows != 1 || cols != 1
+        raise IncorrectMatrixDimensions, "to_i should only be called on 1x1 matricies"
+      end
+      return value_at(0, 0)
+    end
+
+    # Gets the value at the row and column
+    def value_at(row, col)
+      row = convert_indicies(row, self.rows)
+      col = convert_indicies(col, self.cols)
+
+      # Returns either the value in a cell or a subview
+      # From jruby we have to call this way for doubles
+      if @data.is_a?(Java::org.ujmp.core.objectmatrix.impl.ObjectCalculationMatrix)
+        @data.getObject(row.first.to_java(:int), col.first.to_java(:int)) || 0.0
+      else
+        # From jruby we have to call this way for doubles
+        @data.java_send(:getObject, [Java::long, Java::long], row.first, col.first) || 0.0
+      end
+    end
+
     def [](rows, cols)
       rows = convert_indicies(rows, self.rows)
       cols = convert_indicies(cols, self.cols)
 
-      # Returns either the value in a cell or a subview
-      if rows && cols && rows.size == 1 && cols.size == 1 && rows.first.is_a?(Fixnum) && cols.first.is_a?(Fixnum)
-        if @data.is_a?(Java::org.ujmp.core.objectmatrix.impl.ObjectCalculationMatrix)
-          @data.getObject(rows.first.to_java(:int), cols.first.to_java(:int)) || 0.0
-        else
-          # From jruby we have to call this way for doubles
-          @data.java_send(:getObject, [Java::long, Java::long], rows.first, cols.first) || 0.0
-        end
+      # Get subview, also convert rows/cols to java arrays
+      if !rows && !cols
+        return self.class.new(@data)
       else
-        # Get subview, also convert rows/cols to java arrays
-        if !rows && !cols
-          return self.class.new(@data)
+        if rows
+          return self.class.new(@data.select(Java::OrgUjmpCoreCalculation::Calculation.LINK, rows, cols))
         else
-          if rows
-            return self.class.new(@data.select(Java::OrgUjmpCoreCalculation::Calculation.LINK, rows, cols))
-          else
-            # If row is nil, we need to lookup by columns directly
-            return self.class.new(@data.select_columns(Java::OrgUjmpCoreCalculation::Calculation.LINK, cols))
-          end
+          # If row is nil, we need to lookup by columns directly
+          return self.class.new(@data.select_columns(Java::OrgUjmpCoreCalculation::Calculation.LINK, cols))
         end
       end
     end
@@ -156,7 +170,7 @@ module StairCar
     # Loop through each non-zero value, pass in the value, row, column
     def each_non_zero(&block)
       @data.available_coordinates.each do |row, col|
-        val = self[row,col]
+        val = self.value_at(row,col)
         yield(val, row, col)
       end
     end

data/stair_car.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "stair_car"
-  gem.version       = "0.1.1"
+  gem.version       = "0.1.2"
   gem.authors       = ["Ryan Stout"]
   gem.email         = ["ryanstout@gmail.com"]
   gem.description   = "StairCar is a fully featured matrix library for jruby (think matlab or numpy)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stair_car
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease:
 platform: ruby
 authors:
@@ -136,4 +136,3 @@ test_files:
 - spec/umatrix/matrix_math_spec.rb
 - spec/umatrix/transform_spec.rb
 - spec/umatrix/umatrix_spec.rb
-has_rdoc: