matrix_extensions 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0888299dc382dbaf662109214f80784ce36def63
-  data.tar.gz: a9b398b17dafb6bfb75b782e99e23619daf83ec8
+  metadata.gz: fc5568b2a7d1ef2cafc04aeca1dad9d13679045c
+  data.tar.gz: 52ceb8debb31147b857df272143afdd09a94045d
 SHA512:
-  metadata.gz: f95b5b0497717de92579bf5f51ed34d96470825f6dea7b151f42a75add60e288cfbb95238c501c4d789829c0a06c91ab9cf461733475c20f44ecdb8ba386c757
-  data.tar.gz: 3d010969030d91e918d5a63e1607d6925d55faa5cc4c24e6481fc5d434b18d3b207954493fdcf7e59b4556483e3c6308dd35548848667780540ee2f5f5d24910
+  metadata.gz: edd9ecefc3945eb9ce267852bacbc47f19f0c11cc3f003975ef90ec576ad2915ff5a65d1d58bd9d2ac318761b0291b2bb7fcc9c0d3b87035b86daf2a1690c8dc
+  data.tar.gz: 9f03600db372d97aea3ea336ca58a58c54021d62519e5e7e8077c47874f6c9c73080dd3240c2a264bc98dc3b1cc4d74f3d4a5bdbbb7b58b3a7ae5d8276132b26

data/README.md

@@ -20,37 +20,37 @@ Or install it yourself as:
 
 ## Usage
 
-Element-wise multiplication:
+*Element-wise multiplication:*
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 Matrix[ [1,2,3], [4,5,6] ].element_multiplication Matrix[ [2,3,4], [5,6,7] ]
 => Matrix[[2, 6, 12], [20, 30, 42]]
 ```
 
-Element-wise division:
+*Element-wise division:*
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 Matrix[ [2,4,6], [2.0,10,20] ].element_division Matrix[ [2,2,6], [4,5,10] ]
 => Matrix[[1, 2, 1], [0.5, 2, 2]]
 ```
 
-Element-wise exponentiation:
+*Element-wise exponentiation:*
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 Matrix[ [2,4], [1,4] ].element_exponentiation Matrix[ [2,4], [1,4]] ]
 => Matrix[[4, 256], [1, 256]]
 ```
 
-Prefilled matrix with zeros or ones:
+*Prefilled matrix with zeros or ones:*
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 Matrix.zeros(2,4)
 => Matrix[[0, 0, 0, 0], [0, 0, 0, 0]]
@@ -59,12 +59,12 @@ Matrix.ones(2,2)
 => Matrix[[1, 1], [1, 1]]
 ```
 
-Concatenating matrices and vectors horizontally:
+*Concatenating matrices and vectors horizontally:*
 
 This iterates through a list of matrices and vectors and appends columns of each list one after another. The row number of all matrices and vectors must be equal. The number of arguments passed in can be freely chosen.
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 m1 = Matrix[ [1,2,3], [4,5,6] ]
 m2 = Matrix[ [2,3,4], [5,6,7] ]
@@ -74,12 +74,12 @@ Matrix.hconcat(m1, m2, v)
 => Matrix[[1, 2, 3, 2, 3, 4, 3], [4, 5, 6, 5, 6, 7, 4]]
 ```
 
-Concatenating matrices and vectors vertically:
+*Concatenating matrices and vectors vertically:*
 
 This iterates through a list of matrices and vectors and appends rows of each list one after another. The column number of all matrices and vectors must be equal. The number of arguments passed in can be freely chosen.
 
 ```ruby
-require 'matrix_extensions' # if not loaded automatically
+require 'matrix_extensions'
 
 m1 = Matrix[ [1,2,3], [4,5,6] ]
 m2 = Matrix[ [2,3,4], [5,6,7] ]
@@ -89,6 +89,28 @@ Matrix.vconcat(m1, m2, v)
 => Matrix[[1, 2, 3], [4, 5, 6], [2, 3, 4], [5, 6, 7], [3, 4, 5]]
 ```
 
+*Removing trailing columns:*
+
+Removes a set number of trailing columns from a matrix. The argument defaults to 1.
+
+```ruby
+require 'matrix_extensions'
+
+Matrix[ [1,2,3], [4,5,6] ].hpop(2)
+=> Matrix[[1], [4]]
+```
+
+*Removing trailing rows:*
+
+Removes a set number of trailing rows from a matrix. The argument defaults to 1.
+
+```ruby
+require 'matrix_extensions'
+
+Matrix[ [1,2,3], [4,5,6], [7,8,9] ].vpop(2)
+=> Matrix[[1, 2, 3]]
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/matrix_extensions/fork )

data/lib/matrix_extensions/version.rb

@@ -1,3 +1,3 @@
 module MatrixExtensions
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/matrix_extensions.rb

@@ -71,6 +71,40 @@ class Matrix
 
     # create new matrix
     self.rows(rows)
+  end
+  
+  # Removes trailing columns from a Matrix.
+  # @param number_of_columns [Integer] number of trailing columns to be removed
+  # @return [Matrix] matrix
+  # @raise [ErrDimensionMismatch] if Matrix does not have enough columns for operation
+  def hpop(number_of_columns = 1)        
+    Matrix.Raise ErrDimensionMismatch unless number_of_columns < self.column_count
+
+    columns = []
+    last_column_to_be_included = self.column_count - number_of_columns
+    self.column_vectors.each_with_index do |column, index|
+      break if index + 1 > last_column_to_be_included
+      columns << column.to_a
+    end
+    
+    Matrix.columns(columns)       
+  end
+
+  # Removes trailing rows from a Matrix.
+  # @param number_of_rows [Integer] number of trailing rows to be removed
+  # @return [Matrix] matrix
+  # @raise [ErrDimensionMismatch] if Matrix does not have enough rows for operation
+  def vpop(number_of_rows = 1)        
+    Matrix.Raise ErrDimensionMismatch unless number_of_rows < self.row_count
+
+    rows = []
+    last_row_to_be_included = self.row_count - number_of_rows
+    self.row_vectors.each_with_index do |row, index|
+      break if index + 1 > last_row_to_be_included
+      rows << row.to_a
+    end
+    
+    Matrix.rows(rows)       
   end  
 
   # Element-wise division.

data/matrix_extensions.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

data/spec/matrix_extensions_spec.rb

@@ -201,5 +201,46 @@ describe Matrix do
         end
       end      
     end        
-  end        
+  end
+
+  describe '#hpop' do
+    context 'when number of columns equal number of columns to be popped' do
+      it 'raises an exception' do
+        expect {m23a.hpop(3)}.to raise_exception(Matrix::ErrDimensionMismatch)                
+      end
+    end
+
+    context 'when number of columns are smaller than number of columns to be popped' do
+      it 'raises an exception' do
+        expect {m23a.hpop(4)}.to raise_exception(Matrix::ErrDimensionMismatch)                
+      end
+    end
+
+    context 'when number of columns are greater than number of columns to be popped' do
+      it 'returns popped matrix' do
+        expect(m23a.hpop).to eq Matrix[ [1,2], [4,5] ]
+        expect(m23a.hpop(2)).to eq Matrix[ [1], [4] ]        
+      end
+    end
+  end
+
+  describe '#vpop' do
+    context 'when number of rows equal number of rows to be popped' do
+      it 'raises an exception' do
+        expect {m23a.vpop(2)}.to raise_exception(Matrix::ErrDimensionMismatch)                
+      end
+    end
+
+    context 'when number of rows are smaller than number of rows to be popped' do
+      it 'raises an exception' do
+        expect {m23a.vpop(3)}.to raise_exception(Matrix::ErrDimensionMismatch)                
+      end
+    end
+
+    context 'when number of rows are greater than number of rows to be popped' do
+      it 'returns popped matrix' do
+        expect(m23a.vpop).to eq Matrix[ [1,2,3] ]
+      end
+    end
+  end          
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'matrix_extensions'
+require 'pry'
 
 RSpec.configure do |config|  
   # Run specs in random order to surface order dependencies. If you find an

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Imstepf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Element-wise matrix operations, concatenation and pre-filled matrices
   with single values.
 email: