rbgraph 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fe2bf64b05c39412353c43e2b61be62802eba8
-  data.tar.gz: 275c4daead8f24d392d04287e4f05c16e3538745
+  metadata.gz: 48930f7885070f0f57459ad7b36759d8be7d7d48
+  data.tar.gz: a6eb4e8ae29f93011695334241bdd192f670a1b2
 SHA512:
-  metadata.gz: 661096f726414cdd4cd59282a9844647a77389355eba19a71cd69bf5abb08c7de7c3bec7a8a94acd34e4dfa2446ca353762671eb62a7a00182615dee4da80a4e
-  data.tar.gz: e36ba691c1ccb04c3747c9169346264d701ce7e7262933930d00b88d7590fb5376fea9c7c94c13d6d0872ff7d219095fd40c5a86537ada41f6b438a9eafc722a
+  metadata.gz: 68715928c6e71ae2606a85e8a8d56d0e232a54f1981bc9837866af3419a44f4174164fff77f77bf5dfe531c892fb0729af221bf81be62b27e35f8fb6cd275ace
+  data.tar.gz: 0c6107d685f112847d7a09ced014740fbf448d332b838670278ab8f9dab27a425a1355bb3a0ee3f596a0e60bc4b3f1397952de2ec09323e1356956b3ab218f6a

data/README.md

@@ -49,5 +49,32 @@ node.out_degree
 ```
 depending on if you constructed a Directed or Undirected graph.
 
+Version 0.0.8+
+
+Support for weighted edges.
+```ruby
+graph = Rbgraph::UndirectedGraph.new()
+graph.add_edge!({id: 1}, {id: 2})
+graph.add_edge!({id: 2}, {id: 3})
+graph.edges["1==2"].weight => 1
+graph.add_edge!({id: 1}, {id: 2})
+graph.edges["1==2"].weight => 2
+graph.add_edge!({id: 1}, {id: 2}, {weight: 3})
+graph.edges["1==2"].weight => 5
+```
+
+Support for node merging.
+```ruby
+graph = Rbgraph::UndirectedGraph.new()
+graph.add_edge!({id: 1}, {id: 2})
+graph.add_edge!({id: 2}, {id: 3})
+graph.add_edge!({id: 3}, {id: 4})
+
+# 1 -> 2 -> 3 -> 4
+graph.merge_nodes!([2, 3])
+# 1 -> 2 => 4
+```
+
+
 ### Disclaimer
 This project is written on a need to use basis for inclusion to other projects I'm working on for now, so completion is not an immediate goal.

data/lib/rbgraph/edge.rb

@@ -3,17 +3,21 @@ module Rbgraph
   class Edge
 
     attr_accessor :id
+    attr_accessor :graph
     attr_accessor :node1
     attr_accessor :node2
+    attr_accessor :weight
     attr_accessor :directed
     attr_accessor :attributes
 
     def initialize(node1, node2, attributes = {})
       self.node1 = node1
       self.node2 = node2
+      self.directed = !!attributes.delete(:directed)
+      interpolated_node_ids = directed ? [node1.id, node2.id] : [node1.id, node2.id].sort
+      self.id = attributes.delete(:id) || ("%s=#{attributes[:kind]}=%s" % interpolated_node_ids)
+      self.weight = attributes.delete(:weight) || 1
       self.attributes = attributes
-      self.id = attributes[:id] || "#{node1.id}=#{attributes[:kind]}=#{node2.id}"
-      self.directed = !!attributes[:directed]
     end
 
     def ==(node)
@@ -25,12 +29,17 @@ module Rbgraph
       id
     end
 
+    def has_node?(node)
+      node == node1 || node == node2
+    end
+
     def other_node(node)
       # ([node1, node2] - [node]).first ! Fails for edge connecting a node to itself
       node == node1 ? node2 : node1
     end
 
     def merge(edge)
+      self.weight += edge.weight unless edge.weight.nil?
       attributes.merge!(edge.attributes.reject { |k, v| k == :id })
       self
     end
@@ -39,7 +48,7 @@ module Rbgraph
       if directed
         node == node1
       else
-        node == node1 || node == node2
+        has_node?(node)
       end
     end
 
@@ -47,7 +56,7 @@ module Rbgraph
       if directed
         node == node2
       else
-        node == node1 || node == node2
+        has_node?(node)
       end
     end
 

data/lib/rbgraph/graph.rb

@@ -16,6 +16,7 @@ module Rbgraph
 
     def add_node!(node)
       node = node.is_a?(Node) ? node : Node.new(node)
+      node.graph = self
       if nodes[node.id].nil?
         nodes[node.id] = node
       else
@@ -28,6 +29,7 @@ module Rbgraph
       node1 = add_node!(node1)
       node2 = add_node!(node2)
       edge = Edge.new(node1, node2, edge_attributes)
+      edge.graph = self
       edge = if edges[edge.id].nil?
         edges[edge.id] = edge
       else
@@ -37,6 +39,32 @@ module Rbgraph
       edge
     end
 
+    def remove_node!(node)
+      node = node.is_a?(Node) ? node : nodes[node]
+      if node
+        node.edges.values.each { |edge| remove_edge!(edge) }
+        nodes.delete(node.id)
+      end
+    end
+
+    def remove_edge!(edge)
+      edge = edge.is_a?(Edge) ? edge : edges[edge]
+      edge.node1.remove_neighbor(edge.node2)
+      edge.node2.remove_neighbor(edge.node1)
+      edges.delete(edge.id)
+    end
+
+    def merge_nodes!(node_ids, &block)
+      node_ids = node_ids || yield
+      first_node = nodes[node_ids.shift]
+      if !first_node.nil? && !node_ids.empty?
+        node_ids.each do |node_id|
+          node = nodes[node_id]
+          first_node.absorb!(node)
+        end
+      end
+    end
+
     def connect_nodes(node1, node2, edge)
       raise NotImplementedError("Cannot connect nodes on a general graph! Use either Directed or Undirected subclasses")
     end

data/lib/rbgraph/node.rb

@@ -3,6 +3,7 @@ module Rbgraph
   class Node
 
     attr_accessor :id
+    attr_accessor :graph
     attr_accessor :attributes
     attr_accessor :neighbors
     attr_accessor :edges
@@ -10,7 +11,7 @@ module Rbgraph
     def initialize(attributes = {})
       self.attributes = attributes
       raise "Node should have an id attribute!" if attributes[:id].nil?
-      self.id = attributes[:id]
+      self.id = attributes.delete(:id)
       self.neighbors = {}
       self.edges = {}
     end
@@ -37,6 +38,22 @@ module Rbgraph
       self
     end
 
+    def remove_neighbor(node)
+      neighbors.delete(node.id)
+    end
+
+    def absorb!(node)
+      node.edges.each do |edge_id, edge|
+        other_node = edge.other_node(node)
+        if edge.out_for?(node)
+          graph.add_edge!(self, other_node, edge.attributes) unless other_node == self
+        elsif edge.in_for?(node)
+          graph.add_edge!(other_node, self, edge.attributes) unless other_node == self
+        end
+      end
+      graph.remove_node!(node)
+    end
+
     def outgoing_edges
       edges.select { |eid, edge| edge.out_for?(self) }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - George Lamprianidis
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby graphs!