directed_graph 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0adbde84d2c5293373788a5ce73f444fa41d3129
-  data.tar.gz: 691938d500c03589376637969b320ade01699fee
+  metadata.gz: f3a68ea4ee1b57dc00898a6fc2a7d22911aea8ff
+  data.tar.gz: cd9fe2d655d4672152a786f5204e97b9023af6cc
 SHA512:
-  metadata.gz: 843edf49bae2d53557d2c749b1caaae3a523502f505d4306905dc43285b8f8a10047a39424617bb9edf9d97fe1e58456f9ebf1a11f6efa03ee62cebf9a68963f
-  data.tar.gz: df3e337f5f782951bab9974b6ade178ce10692fab50c2a0641a6efa1a38ee7a2f5f5859d116e88793a6c993a9ba9891a72cc78a709b6b3b48d1c9bcdf59dad65
+  metadata.gz: 46e9b7620b61262d8dd27f81b922968e1151a552e635bfc97fd41a7bb196f22c47e2910bf24563d632032e2fb607eccb4449c4da2de76796898f8d0e0d96bf12
+  data.tar.gz: 6515c50de7baa3fb797389ac632d764ef6739d198b88c0be0d20657fd60e0e79dd09c8ee0300b3fd0301cc181b0f08e644f58c56e45e24b9c6310f8eb9ac4a18

data/README.md

@@ -9,14 +9,22 @@ The following graph will be used to demonstrate the functionality of the directe
 The `Graph` class should be instantiated with an array of edges:
 
 ```ruby
+# create the vertices
+@root = Vertex.new(name: "root")
+@a = Vertex.new(name: "a")
+@b = Vertex.new(name: "b")
+@c = Vertex.new(name: "c")
+@d = Vertex.new(name: "d")
+@e = Vertex.new(name: "e")
+
 # The first argument is the origin_vertex
 # and the second is the destination_vertex
-@ra = Edge.new(origin_vertex: "root", destination_vertex: "a")
-@ab = Edge.new(origin_vertex: "a", destination_vertex: "b")
-@bc = Edge.new(origin_vertex: "b", destination_vertex: "c")
-@bd = Edge.new(origin_vertex: "b", destination_vertex: "d")
-@ae = Edge.new(origin_vertex: "a", destination_vertex: "e")
-@de = Edge.new(origin_vertex: "d", destination_vertex: "e")
+@ra = Edge.new(origin_vertex: @root, destination_vertex: @a)
+@ab = Edge.new(origin_vertex: @a, destination_vertex: @b)
+@bc = Edge.new(origin_vertex: @b, destination_vertex: @c)
+@bd = Edge.new(origin_vertex: @b, destination_vertex: @d)
+@ae = Edge.new(origin_vertex: @a, destination_vertex: @e)
+@de = Edge.new(origin_vertex: @d, destination_vertex: @e)
 @edges = [@ra, @ab, @bc, @bd, @ae, @de]
 @graph = Graph.new(@edges)
 ```
@@ -24,7 +32,7 @@ The `Graph` class should be instantiated with an array of edges:
 The `@graph` object can be used to get a topological sorted array of the vertices:
 
 ```ruby
-@graph.sorted_vertices # ["root", "a", "b", "d", "e", "c"]
+@graph.sorted_vertices # [@root, @a, @b, @d, @e, @c]
 ```
 
 Here is an [awesome blog post](https://endofline.wordpress.com/2010/12/22/ruby-standard-library-tsort/) on topological sorting in Ruby with the `TSort` module.
@@ -32,17 +40,17 @@ Here is an [awesome blog post](https://endofline.wordpress.com/2010/12/22/ruby-s
 The `@graph` object can also be used to calculate the shortest path between two vertices:
 
 ```ruby
-@graph.shortest_path("root", "e")) # %w|root a e|
-@graph.shortest_path("root", "blah")) # nil because the "blah" vertex doesn't exist
-@graph.shortest_path("d", "a")) # nil because the graph is directed and can't be traversed in the wrong direction
+@graph.shortest_path(@root, @e) # [@root, @a, @e]
+@graph.shortest_path(@root, Vertex.new(name: "blah")) # nil because the "blah" vertex doesn't exist
+@graph.shortest_path(@d, @a) # nil because the graph is directed and can't be traversed in the wrong direction
 ```
 
 The `@graph` object can be used to calculate the longest path between two vertices:
 
 ```ruby
-@graph.longest_path("root", "e")) # %w|root a b d e|
-@graph.longest_path("a", "c")) # %w|a b c|
-@graph.longest_path("d", "a")) # returns [] when the path doesn't exist
+@graph.longest_path(@root, @e) # [@root, @a, @b, @d, @e]
+@graph.longest_path(@a, @c) # [@a, @b, @c]
+@graph.longest_path(@d, @a) # returns [] when the path doesn't exist
 ```
 
 ## Installation

data/lib/directed_graph.rb

@@ -2,6 +2,7 @@ require 'simple-graph'
 
 require "directed_graph/version"
 require_relative "./directed_graph/job_runner.rb"
+require_relative "./directed_graph/vertex.rb"
 require_relative "./directed_graph/edge.rb"
 require_relative "./directed_graph/graph.rb"
 

data/lib/directed_graph/graph.rb

@@ -11,7 +11,7 @@ module DirectedGraph
     def vertices
       r = []
       edges.each {|e| r.push(e.origin_vertex, e.destination_vertex)}
-      r.uniq
+      r.uniq {|e| e.object_id}
     end
 
     def ordered_edges

data/lib/directed_graph/version.rb

@@ -1,3 +1,3 @@
 module DirectedGraph
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/directed_graph/vertex.rb

@@ -0,0 +1,16 @@
+module DirectedGraph
+
+  class Vertex
+
+    attr_reader :name
+    attr_accessor :data
+
+    def initialize(args)
+      @name = args.fetch(:name)
+      @data = args.fetch(:data, {})
+    end
+
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directed_graph
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - MrPowers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ files:
 - lib/directed_graph/graph.rb
 - lib/directed_graph/job_runner.rb
 - lib/directed_graph/version.rb
+- lib/directed_graph/vertex.rb
 homepage: https://github.com/MrPowers/directed_graph
 licenses:
 - MIT