aprendizaje_maquina 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6636ede43358eb9dc98e1d2c102b7ebf5833e4
-  data.tar.gz: a2e2c4ef6bf6cf919926cee5688c5da25e523de1
+  metadata.gz: b0a8b0a74d8f2e8f8b22a89bd9b6a5f8d1d36ef7
+  data.tar.gz: d631cfcae79261763f72b1c1f8ac94b1c8b80f56
 SHA512:
-  metadata.gz: f6419ba629850cbdebbd1bf2100fede3fb23f7dd64632a52f034e1f531936f76bc06f53b42ba7487c0fc9afc8546637e1e3741cc56711f3e27e4ba7d4e038f67
-  data.tar.gz: 78265b9ac2746f3ddda229b9a7afb5b303f54668fd51f1b8a53e0c94ef7f33039aaeb3dadda36faf9af8fcb01ead1983c61dd3c6f4ad4449bb0fc08d32820ffe
+  metadata.gz: f3065a235bb3cca7c5d325290d0b8b62d2991743d8f4321bc0eae82080b96942e4a4b323b18deab58cd01bf04c6e9e438bad8fd3183517e0f2f2a1eabe3caa8a
+  data.tar.gz: c7ca538696ab235ce326415eb6ebb70e7c97d51d15f33fff7c1f5b1c0f3f6425f74cfffabc8083999a0a92d582bbbc9887ca58eaf92366483240a74689cc35a8

data/README.md

@@ -1,62 +1,62 @@
-# AprendizajeMaquina
-
-Aprendizaje maquina is a gem that help us to write ruby machine learning algorithms. 
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-gem 'aprendizaje_maquina'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install aprendizaje_maquina
-
-## Usage
-
-for make predictions with the linear regression model
-
-first
-
-	require 'aprendizaje_maquina'
-
-load data from a CSV file
-
-	load = AprendizajeMaquina::Cargar.new("file.csv")
-	y = load.to_vector(3)    # specify the column that you want to store on a vector
-    matrix = load.to_matrix  # this put all the data of the csv file in a matrix
-                             # if you don't specify the column or range of columns              
-	x = load.to_matrix(0)    # create a matrix with the data in the column 0 of the csv file 
-	                         # you can specify range like this load.to_matrix(0..4)
-	x_with_ones = x.add_ones # this add a column of ones to the matrix
-
-create an instance of the class RegresionLineal
-
-	regresion_lineal = AprendizajeMaquina::RegresionLineal.new(x_matrix,y_vector)
-	regresion_lineal.encontrar_ecuacion    # find the theta values => Vector[114.50684133915638, 0.8310043668122375]
-	m = Matrix[[1,95]]
-	p regresion_lineal.hacer_prediccion(m) # make predictions 
-										   # => Vector[193.45225618631895]
-
-linear regresion with arrays
-
-x = [74,92,63,72,58,78,85,85,73,62,80,72]
-y = [168,196,170,175,162,169,190,186,176,170,176,179]
-
-regresion_simple = AprendizajeMaquina::RegresionLineal.new(x,y)
-regresion_simple.encontrar_ecuacion
-p regresion_simple.ecuacion
-p regresion_simple.hacer_prediccion(95)
-
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/TheNoskOneVzla/aprendizaje_maquina.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# AprendizajeMaquina
+
+Aprendizaje maquina is a gem that help us to write ruby machine learning algorithms. 
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+gem 'aprendizaje_maquina'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install aprendizaje_maquina
+
+## Usage
+
+for make predictions with the linear regression model
+
+first
+
+	require 'aprendizaje_maquina'
+
+load data from a CSV file
+
+	load = AprendizajeMaquina::Cargar.new("file.csv")
+	y = load.to_vector(3)    # specify the column that you want to store on a vector
+    matrix = load.to_matrix  # this put all the data of the csv file in a matrix
+                             # if you don't specify the column or range of columns              
+	x = load.to_matrix(0)    # create a matrix with the data in the column 0 of the csv file 
+	                         # you can specify range like this load.to_matrix(0..4)
+	x_with_ones = x.add_ones # this add a column of ones to the matrix
+
+create an instance of the class RegresionLineal
+
+	regresion_lineal = AprendizajeMaquina::RegresionLineal.new(x_matrix,y_vector)
+	regresion_lineal.encontrar_ecuacion    # find the theta values => Vector[114.50684133915638, 0.8310043668122375]
+	m = Matrix[[1,95]]
+	p regresion_lineal.hacer_prediccion(m) # make predictions 
+										   # => Vector[193.45225618631895]
+
+linear regresion with arrays
+
+	x = [74,92,63,72,58,78,85,85,73,62,80,72]
+	y = [168,196,170,175,162,169,190,186,176,170,176,179]
+
+	regresion_simple = AprendizajeMaquina::RegresionLineal.new(x,y)
+	regresion_simple.encontrar_ecuacion
+	p regresion_simple.ecuacion
+	p regresion_simple.hacer_prediccion(95)
+
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/TheNoskOneVzla/aprendizaje_maquina.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/aprendizaje_maquina/regresion_lineal.rb

@@ -8,6 +8,7 @@ module AprendizajeMaquina
 		def initialize(x,y)
 			@x = x
 			@y = y
+			@trained = false
 			if @x.is_a?(Array)
 				@n = @x.length
 			elsif @x.is_a?(Matrix)
@@ -17,11 +18,13 @@ module AprendizajeMaquina
 
 		def encontrar_ecuacion
 			if @x.is_a?(Array) && @y.is_a?(Array)
+				@trained = true
 				@m = ((@n*sumatoria(multiplicar(@x,@y))) - (sumatoria(@x)*sumatoria(@y))).to_f / ((@n*sumatoria(al_cuadrado(@x))) - (sumatoria(@x)**2)).to_f
 				@b = media(@y) - (@m * media(@x))
 				@ecuacion = "Y = #{@m.round(4)}X+#{@b.round(4)}" 
 				@ecuacion
 			elsif @x.is_a?(Matrix) && @y.is_a?(Vector)
+				@trained = true
 				inversa = (1.to_f/(@x.transpose*@x).det)*((@x.transpose*@x).adjugate)
 				@theta = inversa * (@x.transpose * @y)
 				@theta
@@ -31,15 +34,23 @@ module AprendizajeMaquina
 		end
 
 		def hacer_prediccion(x_a_predecir)
-			if x_a_predecir.is_a?(Numeric)
-				prediccion = (@m * x_a_predecir) + @b
-				prediccion
-			elsif x_a_predecir.is_a?(Matrix)
-				prediccion = x_a_predecir * @theta
-				prediccion
+			if @trained == true
+				if x_a_predecir.is_a?(Numeric)
+					prediccion = (@m * x_a_predecir) + @b
+					prediccion
+				elsif x_a_predecir.is_a?(Matrix)
+					prediccion = x_a_predecir * @theta
+					prediccion
+				else
+					raise ArgumentError, "Must be a number or matrix 1xN"
+				end
 			else
-				raise ArgumentError, "Must be a number or matrix 1xN"
+				return "There is not a equation to make predictions (first, run encontrar_ecuacion method)"
+<<<<<<< HEAD
 			end
+=======
+			end	
+>>>>>>> c8f8271ff1de1334797f9c6f048289c908e9dcb5
 		end
 
 		private
@@ -70,4 +81,4 @@ module AprendizajeMaquina
 			sumatoria(array).to_f / array.length
 		end
 	end
-end
+end

data/lib/aprendizaje_maquina/version.rb

@@ -1,3 +1,3 @@
 module AprendizajeMaquina
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aprendizaje_maquina
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Erickson Morales
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler