matrix_extensions 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc5568b2a7d1ef2cafc04aeca1dad9d13679045c
-  data.tar.gz: 52ceb8debb31147b857df272143afdd09a94045d
+  metadata.gz: c978a09fe39c80d12e2aeed84d881d3c95c929d1
+  data.tar.gz: 593d2c52dd09950898a6bb7072c5b755040fe813
 SHA512:
-  metadata.gz: edd9ecefc3945eb9ce267852bacbc47f19f0c11cc3f003975ef90ec576ad2915ff5a65d1d58bd9d2ac318761b0291b2bb7fcc9c0d3b87035b86daf2a1690c8dc
-  data.tar.gz: 9f03600db372d97aea3ea336ca58a58c54021d62519e5e7e8077c47874f6c9c73080dd3240c2a264bc98dc3b1cc4d74f3d4a5bdbbb7b58b3a7ae5d8276132b26
+  metadata.gz: 2a005c74d77d416fd2eaf8e68bbdc8eccd71bc8c12cf37915e8bdd4987d31603f20c12df1b0920ee00791f9dd884228444f9558732c49238ef4c7dad1adf76e7
+  data.tar.gz: 5e9afd308ac55a6772524a06020fb4c5a6d9d7e408adf19774d88cb9e3e50b1c71866e949d826b39a20177bae62bf518a5871f6532a08d5b0748e9dbaa679e12

data/README.md

@@ -20,37 +20,37 @@ Or install it yourself as:
 
 ## Usage
 
-*Element-wise multiplication:*
+**Element-wise multiplication:**
 
 ```ruby
-require 'matrix_extensions'
+require 'matrix_extensions' # if not loaded automatically
 
 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'
+require 'matrix_extensions' # if not loaded automatically
 
 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'
+require 'matrix_extensions' # if not loaded automatically
 
 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'
+require 'matrix_extensions' # if not loaded automatically
 
 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'
+require 'matrix_extensions' # if not loaded automatically
 
 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'
+require 'matrix_extensions' # if not loaded automatically
 
 m1 = Matrix[ [1,2,3], [4,5,6] ]
 m2 = Matrix[ [2,3,4], [5,6,7] ]
@@ -89,23 +89,23 @@ Matrix.vconcat(m1, m2, v)
 => Matrix[[1, 2, 3], [4, 5, 6], [2, 3, 4], [5, 6, 7], [3, 4, 5]]
 ```
 
-*Removing trailing columns:*
+**Removing trailing columns:**
 
-Removes a set number of trailing columns from a matrix. The argument defaults to 1.
+Removes a set number of trailing columns from a matrix (destructive) and returns the removed columns. The argument defaults to 1.
 
 ```ruby
-require 'matrix_extensions'
+require 'matrix_extensions' # if not loaded automatically
 
 Matrix[ [1,2,3], [4,5,6] ].hpop(2)
-=> Matrix[[1], [4]]
+=> Matrix[[2, 3], [5, 6]]
 ```
 
-*Removing trailing rows:*
+**Removing trailing rows:**
 
-Removes a set number of trailing rows from a matrix. The argument defaults to 1.
+Removes a set number of trailing rows from a matrix (destructive) and returns the removed rows. The argument defaults to 1.
 
 ```ruby
-require 'matrix_extensions'
+require 'matrix_extensions' # if not loaded automatically
 
 Matrix[ [1,2,3], [4,5,6], [7,8,9] ].vpop(2)
 => Matrix[[1, 2, 3]]

data/lib/matrix_extensions.rb

@@ -73,39 +73,36 @@ class Matrix
     self.rows(rows)
   end
   
-  # Removes trailing columns from a Matrix.
+  # Removes trailing columns from a Matrix (destructive).
   # @param number_of_columns [Integer] number of trailing columns to be removed
-  # @return [Matrix] matrix
+  # @return [Matrix] matrix consisting of of dropped columns
   # @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
+    dropped_columns = []
+    number_of_columns.times do
+      dropped_column = []      
+      @rows.each {|r| dropped_column << r.pop}
+      dropped_columns << dropped_column
     end
-    
-    Matrix.columns(columns)       
+    @column_count -= number_of_columns
+
+    Matrix.columns(dropped_columns.reverse)
   end
 
-  # Removes trailing rows from a Matrix.
+  # Removes trailing rows from a Matrix (destructive).
   # @param number_of_rows [Integer] number of trailing rows to be removed
-  # @return [Matrix] matrix
+  # @return [Matrix] matrix consisting of of dropped rows
   # @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  
+    dropped_rows = []    
+    number_of_rows.times { dropped_rows.unshift @rows.pop }
+
+    Matrix.rows(dropped_rows.reverse)      
+  end 
 
   # Element-wise division.
   # @param m [Matrix] matrix

data/lib/matrix_extensions/version.rb

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

data/spec/matrix_extensions_spec.rb

@@ -217,9 +217,14 @@ describe Matrix do
     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] ]        
+      m23c = m23a.clone
+      m23d = m23a.clone
+
+      it 'pops matrix destructively and returns matrix of dropped columns' do
+        expect(m23c.hpop).to eq Matrix[ [3], [6] ]
+        expect(m23c).to eq Matrix[ [1,2], [4,5] ]
+        expect(m23d.hpop(2)).to eq Matrix[[2, 3], [5, 6]]
+        expect(m23d).to eq Matrix[ [1], [4] ]        
       end
     end
   end
@@ -238,8 +243,11 @@ describe Matrix do
     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] ]
+      m23e = m23a.clone
+
+      it 'pops matrix destructively and returns updated matrix' do
+        expect(m23e.vpop).to eq Matrix[ [4,5,6] ]        
+        expect(m23e).to eq Matrix[ [1,2,3] ]        
       end
     end
   end          

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrix_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Imstepf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler