dbscan 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34c666c340e0836c87ec540d6134017dd1194f92
-  data.tar.gz: 0df92c8c2794eaf3b1486a12d7c73830929179b4
+  metadata.gz: 960f9f6d9750a347f7c2ece2c3b1ece730658141
+  data.tar.gz: 36d01814a661998941336443575657599db1777a
 SHA512:
-  metadata.gz: 067ebff05da42bd0341817dffa4d55430d390636f1fc2a7e4010679335d63443822f8cadc59572034e06e8b91a6c72d19d3079a7eaabc2a1a43d7bf3fd10552b
-  data.tar.gz: a8a864c43506836469c89d0034cc6fab70a1f959eb79e4defab911fa5f5459b6d871c1ccc899d584078dcab7ca281b5ab01c03b9b104543d072e916627c63d5c
+  metadata.gz: 1f652bea308235f5c6c0cb2bfa5abd5f56a755d4bf335af9ba98a517852949177302696b259b98b349a20c63d7fa7ca6a1596879899b17b816a614bbb27a8bc3
+  data.tar.gz: f7ba98fda5c62aa16e5ba7c1052969ca553d8a13aa653cd7a824353ca6a032e6f53937fe98360ad7f8dbe1f30ea113888f3b67f794a998fc6375829478fe0fea

data/lib/dbscan.rb

@@ -17,7 +17,10 @@ module DBSCAN
 
 		def initialize( points, options = {} )
 			options[:distance] = :euclidean_distance if !options[:distance]
-			@points, @options, @clusters = points.map { |e| Point.new(e) }, options, {-1 => []}
+			options[:labels] = [] if !options[:labels]
+
+			c = 0
+			@points, @options, @clusters = points.map { |e| po = Point.new(e, options[:labels][c] ); c +=1; po }, options, {-1 => []}
 
 			clusterize!
 		end
@@ -47,6 +50,17 @@ module DBSCAN
 			hash
 		end
 
+ 		def labeled_results
+ 			hash = {}
+ 			@clusters.each do |cluster_index, elements|
+ 				hash.store( cluster_index, [] )
+ 				elements.each do |e|
+ 					hash[cluster_index].push( e.label )
+ 				end
+ 			end
+			hash
+		end
+
 		def inmediate_neighbors( point )
 			neighbors = []
 			@points.each do |p|
@@ -85,11 +99,11 @@ module DBSCAN
 	end
 
 	class Point
-		attr_accessor :items, :cluster, :visited
+		attr_accessor :items, :cluster, :visited, :label
 		define_method(:visited?) { @visited }
 		define_method(:visit!) { @visited = true }
-		def initialize( point )
-			@items, @cluster, @visited = point, nil, false
+		def initialize( point, label )
+			@items, @cluster, @visited, @label = point, nil, false, label
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbscan
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Matias Insaurralde
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distance_measures