sparse_matrix 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d3bb6f0f82c1dac4b679ee0ecc93f2a45c9f556
-  data.tar.gz: fa6fd2a910191e1a4f7ca60989e586b0303e41ce
+  metadata.gz: 4120f3a75b5bbe035792ea2d4591242c98e47b8f
+  data.tar.gz: fa31f06d130f45b3faf16c54f4856a3bc996d007
 SHA512:
-  metadata.gz: edd4515e564e016b8f0b350cea8a5eef68e52d7c32147db28ccfbce08a3742f0673c893e07966e321528a316ec412001832b5eee5327b45c3ee6d064f542521b
-  data.tar.gz: 06093fe0182f748338cdf1cc4d1b647ad15aa1d30a866d7afcaf0c5d5d90fcf73d98d507c3b07c0f7936259f24a0fe15515c209573fce7388fa552907439c41a
+  metadata.gz: 9705df1392dd449ce9e1c22a027800fb79acc56e3d43de157a0c991fe7432870a7e789d54dcf38ad3ddd70f862fd441b992cb32414dd266250a0c910236ec75d
+  data.tar.gz: 93eb2b3be78734d111532d11077a6e29b73bdeab7d20fcde756c755245050745ee8b99da043ccc8f263d367b4687521d082c535b39835c4e3cbe793c914a1068

data/README.md

@@ -14,10 +14,6 @@ Build a sparce matrix from dense matrix
     ├── LICENSE.txt
     ├── README.md
     ├── Rakefile
-    ├── input
-    │   ├── matrix_a
-    │   ├── matrix_b
-    │   └── null
     ├── lib
     │   ├── sparse_matrix
     │   │   └── version.rb

data/lib/sparse_matrix/version.rb

@@ -1,3 +1,3 @@
 module SparseMatrix
-  VERSION = "0.3.1"
+  VERSION = "1.0.0"
 end

data/lib/sparse_matrix.rb

@@ -3,10 +3,39 @@ require "sparse_matrix/version"
 module SparseMatrix
     class AbstractMatrix
         
-        def intialize ()
+        def initialize(r=0,c=0)
+            @row = r
+            @column = c
+        end
+
+        attr_accessor :row,:column
+
+        def read_matrix
         
         end
-    
+        
+        def to_s
+
+        end
+            
+        def print_matrix
+        
+        end
+            
+        def +(b)
+        
+        end
+        
+        def *(b)
+        
+        end
+    end
+
+    class SparseVector
+        @i
+        @j
+        @value
+
     end
     
     class SparseMatrix < AbstractMatrix
@@ -17,34 +46,13 @@ module SparseMatrix
     
     class DenseMatrix < AbstractMatrix
         @mat
-        @filename
-        def initialize(fn="./input/null")
-            @filename=fn
-            @mat = 0
+        def initialize(r=0,c=0,matrix=[])
+            super(r,c)
+            @mat = matrix
         end
         
         attr_accessor :mat
             
-        def read_matrix
-            text = File.open(@filename).read
-            a = text.split(/\n\n+/)
-            a = text.split(/\n/)
-            @mat = to_m(a)
-        end
-            
-        def mapmap(a)
-            a.map { |r|
-                r.map { |e|
-                    yield e
-                }
-            }
-        end
-            
-        def to_m(a)      
-            a = a.map { |r| r.split(/\s+/) }
-            a = mapmap(a) { |x| x.to_f }
-        end
-            
         def to_s()
             s="| "
             for i in (0... @mat.length)
@@ -78,7 +86,7 @@ module SparseMatrix
         end
             
         def +(b)
-            c = DenseMatrix.new()
+            c = DenseMatrix.new(2,2,[[0.0,0.0],[0.0,0.0]])
             c.read_matrix
             for i in (0...@mat.length)
                 for j in(0...@mat.length)
@@ -89,7 +97,7 @@ module SparseMatrix
         end
         
         def *(b)
-            c=DenseMatrix.new()
+            c = DenseMatrix.new(2,2,[[0.0,0.0],[0.0,0.0]])
             c.read_matrix
             for i in(0...@mat.length)
                 for j in(0...@mat.length)

data/spec/sparsematrix_spec.rb

@@ -4,7 +4,39 @@ include SparseMatrix
 describe SparseMatrix do
 
     describe AbstractMatrix do
-    
+        before :all do
+            AA = AbstractMatrix.new
+        end
+        
+        describe "Basic" do
+            it 'existe una clase Abstracta Matrix' do
+                AA.instance_of?(AbstractMatrix) == true
+            end
+            it 'se puede acceder a los atributos (row)?' do
+                AA.row.should == 0
+            end
+            it 'se puede acceder a los atributos (column)' do
+                AA.column.should == 0
+            end
+        end
+        describe "Existen los Metodos?" do
+            it 'Existe metodo imprimir matriz abstracto?' do
+                AA.should respond_to("print_matrix")
+            end
+            it 'Existe metodo to_s abstracto?' do
+                AA.should respond_to("to_s")
+            end
+            it 'Existe el operador sumar abstracto??' do
+                AA.should respond_to("+")
+            end
+            it 'Existe el operador multiplicar abstracto?' do
+                AA.should respond_to("*")
+            end
+        end
+    end
+
+    describe SparseVector do
+
     end
     
     describe SparseMatrix do
@@ -14,25 +46,19 @@ describe SparseMatrix do
 
     describe DenseMatrix do
         before :all do
-            DMA = DenseMatrix.new("input/matrix_a")
-            DMB = DenseMatrix.new("input/matrix_b")
+            DMA = DenseMatrix.new(2,2,[[1.0,2.0],[4.0,5.0]])
+            DMB = DenseMatrix.new(2,2,[[1.0,2.0],[3.0,4.0]])
         end
         
         it 'existe una clase Matrix' do
             DMA.instance_of?(DenseMatrix) == true
         end
         
-        it 'No se ha cargado los datos del fichero al objeto Matrix_T' do
-            DMA.mat.should eq(0)
-        end
-        
         it 'Se han cargado los datos al objeto A' do
-            DMA.read_matrix
             DMA.mat.should be_kind_of(Array)
         end
         
         it 'Se han cargado los datos al objeto B' do
-            DMB.read_matrix
             DMB.mat.should be_kind_of(Array)
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparse_matrix
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - KevinRobayna
@@ -108,9 +108,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- input/matrix_a
-- input/matrix_b
-- input/null
 - lib/sparse_matrix.rb
 - lib/sparse_matrix/version.rb
 - sparse_matrix.gemspec

data/input/matrix_a

@@ -1,3 +0,0 @@
-1 2
-4 5
-

data/input/matrix_b

@@ -1,4 +0,0 @@
-1 2
-3 4
-
-

data/input/null

@@ -1,2 +0,0 @@
-0 0
-0 0