matrix_extensions 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c978a09fe39c80d12e2aeed84d881d3c95c929d1
-  data.tar.gz: 593d2c52dd09950898a6bb7072c5b755040fe813
+  metadata.gz: 78aace705667ce7954ca00df56c97994d7e6e3cb
+  data.tar.gz: b0691977b852e9a5ce290d133d1800849d2d6ea7
 SHA512:
-  metadata.gz: 2a005c74d77d416fd2eaf8e68bbdc8eccd71bc8c12cf37915e8bdd4987d31603f20c12df1b0920ee00791f9dd884228444f9558732c49238ef4c7dad1adf76e7
-  data.tar.gz: 5e9afd308ac55a6772524a06020fb4c5a6d9d7e408adf19774d88cb9e3e50b1c71866e949d826b39a20177bae62bf518a5871f6532a08d5b0748e9dbaa679e12
+  metadata.gz: 79490c48885fe48b33a642b69cefa64d6b2d12be4b340895391daa3a40b69ec7c040ffdce3d4eb7babdf06cc8cb66da3b7aeaa21dce099fec0c785db2bb12a66
+  data.tar.gz: aafc9805adb15f809f2eee55e85449f6c52a4cc03d1bf47a951a6644e9f5eae11633d674d3bc6d0b0a4f8caf27e295257658c39433722a6e5cdd55b1f64a9b6d

data/README.md

@@ -47,15 +47,12 @@ 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 ones:**
 
 ```ruby
 require 'matrix_extensions' # if not loaded automatically
 
-Matrix.zeros(2,4)
-=> Matrix[[0, 0, 0, 0], [0, 0, 0, 0]]
-
-Matrix.ones(2,2)
+Matrix.one(2,2)
 => Matrix[[1, 1], [1, 1]]
 ```
 
@@ -108,7 +105,7 @@ Removes a set number of trailing rows from a matrix (destructive) and returns th
 require 'matrix_extensions' # if not loaded automatically
 
 Matrix[ [1,2,3], [4,5,6], [7,8,9] ].vpop(2)
-=> Matrix[[1, 2, 3]]
+=> => Matrix[[7, 8, 9], [4, 5, 6]]
 ```
 
 ## Contributing

data/lib/matrix_extensions.rb

@@ -4,18 +4,11 @@ require 'matrix'
 # An extension to the Ruby Matrix class.
 # @author Michael Imstepf
 class Matrix
-  # Matrix prefilled with zeros.
-  # @param m [Matrix] matrix
-  # @return [Matrix] matrix
-  def self.zeros(rows = 1, columns = 1)
-    Matrix.build(rows, columns) { 0 }
-  end
-  self.singleton_class.send(:alias_method, :zeroes, :zeros)
-
   # Matrix prefilled with ones.
-  # @param m [Matrix] matrix
+  # @param rows [Integer] number of rows
+  # @param columns [Integer] number of columns
   # @return [Matrix] matrix  
-  def self.ones(rows = 1, columns = 1)
+  def self.one(rows = 1, columns = 1)
     Matrix.build(rows, columns) { 1 }
   end
 
@@ -99,11 +92,39 @@ class Matrix
     Matrix.Raise ErrDimensionMismatch unless number_of_rows < self.row_count
 
     dropped_rows = []    
-    number_of_rows.times { dropped_rows.unshift @rows.pop }
+    number_of_rows.times { dropped_rows << @rows.pop }
 
-    Matrix.rows(dropped_rows.reverse)      
+    Matrix.rows(dropped_rows)      
   end 
 
+  # Copies rows.
+  # @param number_of_copies [Integer] number of times rows should be copied
+  # @return [Matrix] matrix
+  def vcopy(number_of_copies = 1)        
+    existing_rows = rows.clone
+
+    number_of_copies.times do
+      existing_rows.each { |row| rows << row }
+    end
+
+    self
+  end
+
+  # Copies columns.
+  # @param number_of_copies [Integer] number of times columns should be copied
+  # @return [Matrix] matrix
+  def hcopy(number_of_copies = 1)        
+    rows.each do |row|
+      existing_row = row.clone
+      number_of_copies.times do
+        existing_row.each { |v| row << v }
+      end
+    end
+    @column_count += @column_count * number_of_copies
+
+    self
+  end
+
   # Element-wise division.
   # @param m [Matrix] matrix
   # @return [Matrix] matrix

data/lib/matrix_extensions/version.rb

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

data/spec/matrix_extensions_spec.rb

@@ -116,21 +116,9 @@ describe Matrix do
     end            
   end
 
-  describe '#ones' do
+  describe '#one' do
     it 'creates matrix with ones' do
-      expect(Matrix.ones(2, 3)). to eq Matrix[ [1,1,1], [1,1,1] ]
-    end
-  end
-
-  describe '#zeros' do
-    it 'creates matrix with zeros' do
-      expect(Matrix.zeros(2, 3)). to eq Matrix[ [0,0,0], [0,0,0] ]
-    end
-  end
-
-  describe '#zeroes' do
-    it 'creates matrix with zeros' do
-      expect(Matrix.zeros(2, 3)). to eq Matrix[ [0,0,0], [0,0,0] ]
+      expect(Matrix.one(2, 3)). to eq Matrix[ [1,1,1], [1,1,1] ]
     end
   end
 
@@ -250,5 +238,45 @@ describe Matrix do
         expect(m23e).to eq Matrix[ [1,2,3] ]        
       end
     end
-  end          
+  end
+
+  describe '#vcopy' do
+    context 'when no argument is given' do
+      m23f = m23a.clone           
+
+      it 'copies rows one time' do
+        expect(m23f.vcopy).to eq Matrix[[1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6]] 
+        expect(m23f).to eq Matrix[[1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6]]                
+      end
+    end
+
+    context 'when number of copies equals 3' do
+      m23g = m23a.clone      
+      
+      it 'copies rows 3 times' do
+        expect(m23g.vcopy(3)).to eq Matrix[[1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6]]
+        expect(m23g).to eq Matrix[[1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6], [1, 2, 3], [4, 5, 6]]                                                
+      end      
+    end    
+  end
+
+  describe '#hcopy' do
+    context 'when no argument is given' do
+      m23h = m23a.clone           
+
+      it 'copies columns one time' do
+        expect(m23h.hcopy).to eq Matrix[[1, 2, 3, 1, 2, 3], [4, 5, 6, 4, 5, 6]]
+        expect(m23h).to eq Matrix[[1, 2, 3, 1, 2, 3], [4, 5, 6, 4, 5, 6]]
+      end
+    end
+
+    context 'when number of copies equals 3' do
+      m23i = m23a.clone      
+      
+      it 'copies columns 3 times' do
+        expect(m23i.hcopy(3)).to eq Matrix[[1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3], [4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6]]
+        expect(m23i).to eq Matrix[[1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3], [4, 5, 6, 4, 5, 6, 4, 5, 6, 4, 5, 6]]
+      end      
+    end    
+  end              
 end

metadata

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