SparseMatrixProject 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,14 @@
+language: Ruby
+rvm:
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+  - 1.8.7
+
+
+
+
+
+

data/Gemfile

@@ -1,4 +1,17 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in SparseMatrixProject.gemspec
+<<<<<<< HEAD
 gemspec
+=======
+gem 'nokogiri'
+gem 'rack', '~>1.1'
+gem 'rspec', :require => 'spec'
+
+gem 'rake'
+gem 'rspec'
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-bundler'
+gem 'guard-gitpusher'
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c

data/Gemfile~

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'nokogiri'
+gem 'rack', '~>1.1'
+gem 'rspec', :require => 'spec'
+
+gem 'rake'
+gem 'rspec'
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-bundler'
+gem 'guard-gitpusher'

data/Guardfile

@@ -0,0 +1,8 @@
+guard 'bundler' do
+  watch('Gemfile')
+end
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+end

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2013 Jacobo Saavedra
-
+ 
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining

data/LICENSE.txt~

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Jacobo Saavedra
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,6 @@
+<<<<<<< HEAD
 # SparseMatrixProject
-
+ 
 TODO: Write a gem description
 
 ## Installation
@@ -27,3 +28,17 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+=======
+    PRÁCTICA 11
+---------------------
+Aarón José Vera Cerdeña 
+
+Jacobo Saavedra Valdés
+
+1.Utilizamos la práctica 10 con la estructura ya creada.
+2.Añadimos a los métodos suma y producto de matrices las funciones upto,times 
+y collect sustituyendolo por los bucles correspondientes.
+3.Comentamos todo el código siguiendo la estructura por niveles que exige el RDOC.
+4.Creamos la segunda version de la gema con las nuevas implementaciones. 
+5.Subimos la gema a RubyGems mediante el comando gem push <gema>.
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c

data/README.md~

@@ -0,0 +1,47 @@
+<<<<<<< HEAD
+# SparseMatrixProject
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'SparseMatrixProject'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install SparseMatrixProject
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+=======
+      PRÁCTICA 10
+---------------------
+Aarón José Vera Cerdeña 
+
+Jacobo Saavedra Valdés
+
+1.Utilizamos la práctica 9 creamos la gema e implementamos la jerarquía de clases dentro de la misma,
+donde se heredaban las mismas.
+Para diseñar la estructura donde implementar los métodos que hiciesen operaciones entre operaciones
+densas y dispersas.
+2.En la parte Test Unit creamos un fichero tc_Matrices.rb donde realizamos las pruebas unitarias utilizando 
+el comando assert_equal para comprobar las operaciones entre las diferentes matrices.
+3.Rellenar el archivo spec implementando las operaciones entre las matrices.
+4.Implementar los nuevos métodos de máximo y mínimo para comprobar su funcionamiento con las mátrices.
+5.Subir la gema a RubyGems mediante el comando gem push <gema>.
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c

data/Rakefile

@@ -10,5 +10,9 @@ task :default => :spec
 desc "Run UniTest Matrices"
 task :test do
    sh "ruby -Ilib -Itest test/tc_Matrices.rb"
+<<<<<<< HEAD
 end
 
+=======
+end
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c

data/Rakefile~

@@ -0,0 +1,17 @@
+<<<<<<< HEAD
+require "bundler/gem_tasks"
+=======
+$:.unshift File.dirname(__FILE__) + 'lib'
+$:.unshift './lib', './spec'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+task :default => :spec
+
+desc "Run UniTest Matrices"
+task :test do
+   sh "ruby -Ilib -Itest test/tc_Matrices.rb"
+end
+
+
+>>>>>>> 74a54b5fee97668eefe84bad85ac0e0a70ac726c

data/SparseMatrixProject.gemspec~

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'SparseMatrixProject/version'
+
+Gem::Specification.new do |spec|
+  spec.name = "SparseMatrixProject"
+  spec.version = SparseMatrixProject::VERSION
+  spec.authors = ["Jacobo Saavedra Valdes", "Aaron Jose Vera Cerdeña"]
+  spec.email = ["alu0100658682@ull.edu.es", "alu0100537451@ull.edu.es"]
+  spec.description = %q{Gema para realizar suma y resta entre matrices densas y dispersas}
+  spec.summary = %q{Matrices dispersas y densas}
+  spec.homepage = ""
+  spec.license = ""
+
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

data/bin/SparseMatrixProject

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require 'SparseMatrixProject'

data/lib/SparseMatrixProject/version.rb

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

data/lib/SparseMatrixProject/version.rb~

@@ -0,0 +1,3 @@
+module SparseMatrixProject
+  VERSION = "0.0.2"
+end

data/lib/SparseMatrixProject.rb~

@@ -0,0 +1,5 @@
+require "SparseMatrixProject/version"
+
+module SparseMatrixProject
+  # Your code goes here...
+end

data/lib/gcd.rb

@@ -0,0 +1,15 @@
+#=gcd.rb
+#
+# Autores:: Aarón José Vera Cerdeña,Jacobo Saavedra Valdes
+#
+# == Este fichero contiene:
+#    Se calcula el máximo común divisor de las fracciones 
+#
+def gcd(u, v)
+	u, v = u.abs, v.abs
+	while v > 0
+		u, v = v, u % v
+	end
+	u
+end
+

data/lib/gcd.rb~

@@ -0,0 +1,8 @@
+def gcd(u, v)
+	u, v = u.abs, v.abs
+	while v > 0
+		u, v = v, u % v
+	end
+	u
+end
+

data/lib/matrix_main.rb~

@@ -0,0 +1,71 @@
+require "../lib/matriz.rb"
+
+	
+
+	matrizden1 = Densa.new(3,3[1,3,5,2,4,6,7,8,9])
+	matrizden2 = Densa.new(3,3[1,3,5,2,4,6,7,8,9])
+	matrizdenS = Densa.new(3,3[0,0,0,0,0,0,0,0,0])
+
+	matrizdenS = matrizden1 + matrizden2
+	puts "#{(matrizdenS.to_s)}"
+=begin
+	matriz2 = Matrices.new([[2,4,6],[1,3,5],[2,7,8]])
+
+	matrizs = Matrices.new([[0,0,0],[0,0,0],[0,0,0]])
+
+	matriz4 = Matrices.new([[5,5,7],[4,5,8],[7,8,9]])
+
+	matriz5 = Matrices.new([[2,4,6],[1,3,5],[2,7,8]])
+
+	matrizr = Matrices.new([[0,0,0],[0,0,0],[0,0,0]])
+
+	matrizt = Matrices.new([[5,5,7],[4,5,8],[7,8,9]])
+
+	matrizo = Matrices.new([[2,4,6],[1,3,5],[2,7,8]])
+
+####
+	puts "####"
+	puts "#{matriz1.dispersa}"	
+	puts "####"
+####
+
+	puts "Matriz 1" 
+	
+	puts "#{matriz1.mostrar}"
+
+	puts "Matriz 2" 
+
+	puts "#{matriz2.mostrar}"
+##SUMA	
+	matrizs = matriz1 + matriz2
+
+	puts "SUMA:" 
+
+	puts "#{matrizs.mostrar}"
+##RESTA
+	puts "RESTA:"
+
+	matrizr = matriz4 - matriz5
+
+	puts "#{matrizr.mostrar}"
+##PRODUCTO
+	puts "PRODUCTO:" 
+	
+	matriz3 = matriz1 * matriz2
+
+	puts "#{matriz3.mostrar}"
+##TRASPUESTAS
+	puts "TRASPUESTA de la primera matriz:"
+	
+	puts "#{matrizt.traspuesta.mostrar}"
+
+##OPUESTA
+
+#
+	puts "OPUESTA de la segunda matriz:"
+	
+	puts "#{matrizo.opuesta.mostrar}"
+
+
+
+=end