graphgem 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f9d8040af2b947df326f91df55c7ffd6c57dd6
-  data.tar.gz: 9f35f2666e1ff6017b575692860e021fe2078c87
+  metadata.gz: 77d8439a0f689df1237faa891b682d77e47a5424
+  data.tar.gz: 6a2024130d9f5d19ae664389283957eabc04ea70
 SHA512:
-  metadata.gz: 8423bc3956b1e7e24fabcd4826787b481f3ffd0cb9009d2d06a7ac810eb16608a37cafb0fe1ad135fef7a0308e9fda972c8fee0969558d7da4d5c5fcb17b8a55
-  data.tar.gz: b0591b6bf911da20be338b4c8ba5cf4e43347ce4d1371ea47077a38b5be226a95280eb39b25a8ca28476e6f7de1e9fc225f892ad92c37be9ab9c86604c625254
+  metadata.gz: df2e5fa3017a80b7a3928e9e3e4b463e56b83f595cbd1e711df03c8e0f20465957d9498355860b0e9c8531c98eae25ec74572c4253edb3f98c2817ec8be6b403
+  data.tar.gz: fbe05350a84d67b59c1f876e5372a593b71018392bef12911030c7df03871857054e740d8f6380bca20bc0b669b828cbdab1a918896f4e298e2183ff7de41b03

data/lib/graph.rb

@@ -6,36 +6,31 @@ class Graph
 
 	# creates a blank graph
 	def initialize
-		@nodes = []
+		@nodes = {}
 	end
 
 	def addNode name, content
-		@nodes.push(GraphNode.new(name, content))
+		@nodes[name] = GraphNode.new(name, content)
 	end
 
 	# returns true if added
 	def addEdge from, to, directed, weight=nil
 		return false if !isNode?(to) || !isNode?(from)
-		getNode(from).addConnection(to,weight)
-		getNode(to).addConnection(from,weight) if(!directed)
+		getNode(from).addConnection(getNode(to),weight)
+		getNode(to).addConnection(getNode(from),weight) if(!directed)
 	end
 
 	def isNode? name
-		@nodes.each do |n|
-			return true if n.name == name
-		end
-		return false
+		return @nodes[name] != nil
 	end
 
 	def getNode name
-		@nodes.each do |n|
-			return n if n.name == name
-		end
-		return nil
+		return @nodes[name]
 	end
 
 	def getConnectionWeight from, to
 		return nil if !isNode?(from) || !isNode?(to)
+		return nil if !isConnected?(from,to)
 		return getNode(from).getConnection(to).weight
 	end
 
@@ -65,9 +60,9 @@ class Graph
 
 	def convertToCSVString
 		result = "From,FromContent,To,ToContent,Weight\n"
-		@nodes.each do |n|
-			n.connections.each do |c|
-				result += n.name + ',' + n.content + ',' + c.to.name + ',' + c.to.content + ',' + c.weight + "\n"
+		@nodes.each do |key, n|
+			n.connections.each do |key, c|
+				result += n.name + ',' + n.content + ',' + c.to.name + ',' + c.to.content + ',' + c.weight.to_s + "\n"
 			end
 		end
 		return result

data/lib/node/graph_node.rb

@@ -9,25 +9,19 @@ class GraphNode
 	def initialize name, content
 		@name = name
 		@content = content
-		@connections = []
+		@connections = {}
 		@marked = false
 	end
 
 	def addConnection to, weight
-		@connections.push(Connection.new(to, weight))
+		@connections[to] = Connection.new(to,weight)
 	end
 
 	def getConnection name
-		@connections.each do |c|
-			return c if c.to.name == name
-		end
-		return nil
+		return @connections[name]
 	end
 
 	def connectedTo? name
-		@connections.each do |c|
-			return true if c.to.name == name
-		end
-		return false
+		return getConnection(name) != nil
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphgem
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Huelsman