graph-rb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d4da34a650617118bc4cd8d5f9ad9d750fbc2fe397b83328427eabe8eed6f2
-  data.tar.gz: 3da2095e933f194205b8cffa5499e1aabe1e838bbe98d65241ec05baa60a9560
+  metadata.gz: 211e4392a9c71a1a017a86abb884ad207dc3ae87fdfe7a280c47a809c70ea28e
+  data.tar.gz: cc14689cb908518d23f66c7743542246f24b5336417b89cb8e963e1c485f73b9
 SHA512:
-  metadata.gz: 14bed0dbb327c706db60cb94689afa95ffc0164c52aaedcacccfbcd3e0681f34994a437e52909653f12a0545d812a4631641ff4e211a1db50daf59091aa72a65
-  data.tar.gz: 82b4fb9e3d5220cf2f86c634f17fe00dd8dab4c18af23e0a867e333fe01c56e3feb0a622c0a7fa86192231d8397feea4bfb29f07dada688f99bb4cdbf0822a8a
+  metadata.gz: afe5678f0f1ad8539d155705a6136ce138dc2ce8c2c12c523bddf500ed9f7b759d8e014ad895635b04fee4e52d7b674aba70163dd1cbe3d7316395760ee646ab
+  data.tar.gz: fc3db12719a15d5714c834e60970b1a643663ebc13db5bddf360f0a987e128a63c5e8bf520c6cac6f3a60dce1fc78be563d4c7033c28e398c546102fdc2765d4

data/CHANGELOG.md

@@ -0,0 +1,32 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.1.1] - 2019-04-26
+
+### Added
+
+- `Graph::Edge` have a new attribue named `weight`
+- `Graph::Vertex` and `Graph::Edge` have a new method named `to_h`
+
+### Changed
+
+- `Graph::Edge` attribute `ukey` rename to `key`
+- `Graph::Vertex` attribute `uid` rename to `key`
+- `Graph#add`, `Graph#delete` and `Graph#index_of` now identify vertex or edge by attribute `key`
+
+## [0.1.0] - 2019-04-26
+
+### Added
+
+- class `Graph`
+- class `Graph::Vertex`
+- class `Graph::Edge`
+
+[Unreleased]: https://github.com/jk195417/graph-rb/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/jk195417/graph-rb/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/jk195417/graph-rb/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graph-rb (0.1.0)
+    graph-rb (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # Graph
 
-A ruby gem for graph, data structure.
+A ruby gem for graph, data structure. https://rubygems.org/gems/graph-rb
 
 ## Installation
 
@@ -29,9 +29,16 @@ edge1 = Graph::Edge.new(vertex1, vertex2)
 edge2 = Graph::Edge.new(vertex1, vertex3)
 edge3 = Graph::Edge.new(vertex2, vertex3)
 
-graph.add edge1
-graph.add edge2
-graph.add edge3
+# add vertex or edge to graph
+graph << vertex1
+graph << edge3
+
+# delete vertex or edge to graph
+graph.delete edge3
+graph.delete vertex1
+
+# show graph in a hash
+graph.to_h
 ```
 
 ## Development

data/lib/graph.rb

@@ -15,6 +15,11 @@ class Graph
     return include_edge?(vertex_or_edge) if vertex_or_edge.is_a?(Graph::Edge)
   end
 
+  def index_of(vertex_or_edge)
+    return index_of_vertex(vertex_or_edge) if vertex_or_edge.is_a?(Graph::Vertex)
+    return index_of_edge(vertex_or_edge) if vertex_or_edge.is_a?(Graph::Edge)
+  end
+
   def add(vertex_or_edge)
     return add_vertex(vertex_or_edge) if vertex_or_edge.is_a?(Graph::Vertex)
     return add_edge(vertex_or_edge) if vertex_or_edge.is_a?(Graph::Edge)
@@ -26,15 +31,14 @@ class Graph
   end
 
   def to_h
-    result = {
-      vertices: [],
-      edges: []
-    }
+    # O(vertices.size) + O(edges.size)
+    result = {}
     @vertices.each do |vertex|
-      result[:vertices] << vertex.uid
+      result[vertex.key] = vertex.to_h
     end
     @edges.each do |edge|
-      result[:edges] << { from: edge.from.uid, to: edge.to.uid }
+      result[edge.from.key][:edges] << edge.to_h
+      result[edge.to.key][:edges] << edge.to_h
     end
     result
   end
@@ -49,8 +53,16 @@ class Graph
     @edges.include? edge
   end
 
+  def index_of_vertex(target)
+    @vertices.index { |vertex| vertex.key == target.key }
+  end
+
+  def index_of_edge(target)
+    @edges.index { |edge| edge.key == target.key }
+  end
+
   def add_vertex(vertex)
-    return false if include_vertex?(vertex)
+    return false if index_of_vertex(vertex)
 
     vertex.send(:add_to, self)
     @vertices << vertex
@@ -58,30 +70,35 @@ class Graph
   end
 
   def add_edge(edge)
-    return false if include_edge?(edge)
+    return false if index_of_edge(edge)
 
-    edge.send(:add_to, self)
     add_vertex(edge.from)
     add_vertex(edge.to)
+    edge.send(:add_to, self)
     @edges << edge
     self
   end
 
   def delete_vertex(vertex)
-    return false unless include_vertex?(vertex)
+    idx = index_of_vertex vertex
+    return false unless idx
+
     edges.each do |edge|
-      delete_edge(edge) if (edge.from == vertex) || (edge.to == vertex)
+      delete_edge(edge) if (edge.from.key == vertex.key) || (edge.to.key == vertex.key)
     end
     vertex.send(:add_to, nil)
-    @vertices.delete(vertex)
+    @vertices.delete_at idx
     self
   end
 
   def delete_edge(edge)
-    return false unless include_edge?(edge)
-    
+    idx = index_of_edge edge
+    return false unless idx
+
     edge.send(:add_to, nil)
-    @edges.delete(edge)
+    @edges.delete_at idx
     self
   end
-end
+
+  alias << add
+end

data/lib/graph/edge.rb

@@ -1,10 +1,16 @@
 class Graph::Edge
-  attr_reader :ukey, :graph, :from, :to
+  attr_reader :key, :graph, :from, :to
+  attr_accessor :weight
 
-  def initialize(from, to)
+  def initialize(from, to, weight: 1)
     @from = from
     @to = to
-    @ukey = "from_#{from.uid}_to_#{to.uid}"
+    @key = "from_#{from.key}_to_#{to.key}"
+    @weight = weight
+  end
+
+  def to_h
+    { from: from.key, to: to.key, weight: weight }
   end
 
   private

data/lib/graph/version.rb

@@ -1,3 +1,3 @@
 class Graph
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

data/lib/graph/vertex.rb

@@ -1,14 +1,18 @@
 class Graph::Vertex
+  attr_reader :key, :graph
   attr_accessor :attachment
-  attr_reader :uid, :graph
+
   @@autoincrement_counter = 0
 
-  def initialize(attachment = nil)
-    uid = @@autoincrement_counter += 1
-    @uid = uid
+  def initialize(key: nil, attachment: nil)
+    @key = key || (@@autoincrement_counter += 1)
     @attachment = attachment
   end
 
+  def to_h
+    { edges: [], attachment: attachment.to_h }
+  end
+
   private
 
   def add_to(graph)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - 楊竑昕
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock