rbgraph 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ae4eff0161d1ccdae198feb100e9f9c520ad61
-  data.tar.gz: 10bf406825afbec203a318dcfbbfee2c7cc189f2
+  metadata.gz: 5588201fb27d2d21e295f33420713c96e6833ddc
+  data.tar.gz: 1785bb677b091f0d905267eb1fd54aae9afc6f1c
 SHA512:
-  metadata.gz: 4eb268a4b7763b840bedb0ddb00c280d0c3c3435715a3bb316a845ccc56a0e7eb0250c6c76305f53df148f934a01ae3062a4e88ac259f5e90a51a89a350bf291
-  data.tar.gz: 0e6dc62726d01b0134a12de1086a23077e0d714283af6dd7d79f33301ab7eb4516d5da4ffd912418f0d59199c19c021345a7135bd4ea7fb63400573931a380af
+  metadata.gz: 2ce0a08141f4e053c777a03cac2d152353e2bc31f00472f852c019a6de5ca5658bd3427bbdffe12516ff276264e9f3ce002fa3b8b324da1bf7ccc035fd6de52b
+  data.tar.gz: b5c46c0d16a59051ee65f4205048b741e3779881b035a8caf7c0a58261b81af72d4ad74f090e58fc08e3bc690ddcf182146365357f5f8ff51899d59a70ad5818

data/README.md

@@ -63,6 +63,8 @@ graph.add_edge!({id: 1}, {id: 2}, {weight: 3})
 graph.edges["1==2"].weight => 5
 ```
 
+Version 0.0.10+
+
 Support for node merging.
 ```ruby
 graph = Rbgraph::UndirectedGraph.new()
@@ -73,6 +75,10 @@ graph.add_edge!({id: 3}, {id: 4})
 # 1 -> 2 -> 3 -> 4
 graph.merge_nodes!([2, 3])
 # 1 -> 2 => 4
+
+# 1 -> 2 -> 3 -> 4
+graph.merge_nodes!([2, 3], {id: 5})
+# 1 -> 5 => 4
 ```
 
 

data/lib/rbgraph/graph.rb

@@ -49,20 +49,28 @@ module Rbgraph
 
     def remove_edge!(edge)
       edge = edge.is_a?(Edge) ? edge : edges[edge]
-      edge.node1.remove_neighbor(edge.node2)
-      edge.node2.remove_neighbor(edge.node1)
+      edge.node1.neighbors.delete(edge.node2.id)
+      edge.node2.neighbors.delete(edge.node1.id)
+      edge.node1.edges.delete(edge.id)
+      edge.node2.edges.delete(edge.id)
       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
+    def merge_nodes!(node_ids, new_attrs = {})
+      node_ids = node_ids.map { |node_id| nodes[node_id].nil? ? nil : node_id } .compact
+      return nil if node_ids.empty?
+      if new_attrs[:id].nil?
+        new_node = nodes[node_ids.shift]
+        new_node.merge(Node.new({id: 0}.merge(new_attrs)))
+      else
+        new_node = add_node!(new_attrs)
+      end
+      node_ids.each do |node_id|
+        node = nodes[node_id]
+        new_node.absorb!(node)
+        raise "!!" if !nodes[node_id].nil?
       end
+      new_node
     end
 
     def connect_nodes(node1, node2, edge)

data/lib/rbgraph/node.rb

@@ -38,12 +38,8 @@ module Rbgraph
       self
     end
 
-    def remove_neighbor(node)
-      neighbors.delete(node.id)
-    end
-
     def absorb!(node)
-      node.edges.each do |edge_id, edge|
+      node.edges.values.each do |edge|
         other_node = edge.other_node(node)
         if edge.out_for?(node)
           graph.add_edge!(self, other_node, edge.attributes) unless other_node == self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbgraph
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - George Lamprianidis