aprendizaje_maquina 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a8b0a74d8f2e8f8b22a89bd9b6a5f8d1d36ef7
-  data.tar.gz: d631cfcae79261763f72b1c1f8ac94b1c8b80f56
+  metadata.gz: 3c2e981b08fdd73029daf73b0836ced26dd40dce
+  data.tar.gz: a9e5fd556a2b44b338b670ce26b4a78fab94fa48
 SHA512:
-  metadata.gz: f3065a235bb3cca7c5d325290d0b8b62d2991743d8f4321bc0eae82080b96942e4a4b323b18deab58cd01bf04c6e9e438bad8fd3183517e0f2f2a1eabe3caa8a
-  data.tar.gz: c7ca538696ab235ce326415eb6ebb70e7c97d51d15f33fff7c1f5b1c0f3f6425f74cfffabc8083999a0a92d582bbbc9887ca58eaf92366483240a74689cc35a8
+  metadata.gz: 2c8b5f72b79679e33dec9c26deebfabc255eb87929a2a1896b4f49e4d728cd2c4338ddc412a255a742071d199b025515132af9f67030a9408b6c125d9e32bc4c
+  data.tar.gz: 2f1066aa20a5a93879dfacd4c4557e344088cf3cd8c2168d61c64032e4e0d6d7bb327ab2f5fd844f8b46d1ad97367aa14e775c523076c1fdc3d8906ea02aca25

data/lib/aprendizaje_maquina/matrixx.rb

@@ -4,4 +4,13 @@ class Matrix
 		matrix = Matrix.rows(matrix,copy=true)
 		matrix
 	end
+
+	def normalize
+		array = []
+		self.column_count.times do |i|
+			array << self.column(i).normalize
+		end
+		matrix_normal = Matrix.rows(array,copy=true).transpose
+		matrix_normal
+	end	
 end

data/lib/aprendizaje_maquina/regresion_lineal.rb

@@ -1,9 +1,8 @@
 module AprendizajeMaquina
 
 	class RegresionLineal
-
+		
 		attr_reader :m,:b, :ecuacion, :theta
-		attr_accessor :x,:y
 
 		def initialize(x,y)
 			@x = x
@@ -16,7 +15,7 @@ module AprendizajeMaquina
 			end
 		end
 
-		def encontrar_ecuacion
+		def find_ecuation
 			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
@@ -33,7 +32,7 @@ module AprendizajeMaquina
 			end
 		end
 
-		def hacer_prediccion(x_a_predecir)
+		def make_prediction(x_a_predecir)
 			if @trained == true
 				if x_a_predecir.is_a?(Numeric)
 					prediccion = (@m * x_a_predecir) + @b
@@ -46,13 +45,22 @@ module AprendizajeMaquina
 				end
 			else
 				return "There is not a equation to make predictions (first, run encontrar_ecuacion method)"
-<<<<<<< HEAD
 			end
-=======
-			end	
->>>>>>> c8f8271ff1de1334797f9c6f048289c908e9dcb5
 		end
 
+		alias_method :train, :find_ecuation
+		alias_method :predict, :make_prediction
+		
+		def self.deprecate(old_method, new_method)
+			define_method(old_method) do |*args, &block|
+				warn "Warning: #{old_method}() is deprecated. Use #{new_method}()."
+				send(new_method, *args, &block)
+			end
+		end
+
+		deprecate :encontrar_ecuacion, :find_ecuation
+		deprecate :hacer_prediccion, :make_prediction
+		
 		private
 
 		def multiplicar(array_1,array_2) 
@@ -81,4 +89,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.1"
+  VERSION = "0.1.2"
 end

metadata

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