rbgraph 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49534fbbe6268b998015e30ff1c3b6cc45741461
-  data.tar.gz: afa679d7e2217b464feba66f74cb9f5c1596ca58
+  metadata.gz: 6802faf7d27b90722ed3e60db98fb448c2bcaf4e
+  data.tar.gz: dbbc67f346e322fba63e9400d3f45fcab0b2e9c8
 SHA512:
-  metadata.gz: 7df14ad8a194fcf3afaea356d8cd7bb1bfba38759878fbef1fbef24c5e6806e674fcea9e3622b7cf0c5ebb59f7e44efb539054f08348178d1116f465403fca28
-  data.tar.gz: 32e8c30c071a98c4103629f92976b911345d4d13f67bdaed0f202858beff05e67f82bd9bf4ca6f60e59b7f7398daf64cb7c2374e6958bb74a5efac61c83f8486
+  metadata.gz: a5ad1891b6dd29d0dcbcac9c66769009a7fb0e55e4abbf469482efe6da486616b40613a779cd990c8ee07ea5d7d14786e390dc07a5e514fd338f0e5624861fdb
+  data.tar.gz: 233f7cf3a5e6bc70b738a91f3de6d7c0c06ce22c904fda430315bd26953d81c0ad57318162c2cb41771770b68ee4782f0c0bb34174e5a5677e6c9214628a4697

data/lib/rbgraph/edge.rb

@@ -7,17 +7,18 @@ module Rbgraph
     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
+    attr_accessor :kind
+    attr_accessor :data
+
+    def initialize(graph, node1, node2, weight, kind, data = {})
+      self.graph  = graph
+      self.node1  = node1
+      self.node2  = node2
+      self.weight = weight.nil? ? 1 : weight.to_i
+      self.kind   = kind
+      nodes_ids   = graph.directed? ? [node1.id, node2.id] : [node1.id, node2.id].sort
+      self.id     = "%s=#{kind}=%s" % nodes_ids
+      self.data   = data
     end
 
     def ==(node)
@@ -26,7 +27,11 @@ module Rbgraph
     alias_method :==, :eql?
 
     def hash
-      id
+      id.hash
+    end
+
+    def attributes
+      {id: id, weight: weight, kind: kind, data: data}
     end
 
     def has_node?(node)
@@ -38,45 +43,33 @@ module Rbgraph
       node == node1 ? node2 : node1
     end
 
-    def merge(edge)
-      raise "Cannot merge directed and undirected edge!" if directed ^ edge.directed # XOR
+    def merge!(edge, &block)
       self.weight += edge.weight unless edge.weight.nil?
-      attributes.merge!(edge.attributes)
+      raise "Cannot merging edges of different kind!" if kind != edge.kind
+      data.merge!(edge.data, &block)
+      graph.remove_edge!(edge)
       self
     end
 
     def out_for?(node)
-      if directed
-        node == node1
-      else
-        has_node?(node)
-      end
+      graph.directed? ? node == node1 : has_node?(node)
     end
 
     def in_for?(node)
-      if directed
-        node == node2
-      else
-        has_node?(node)
-      end
-    end
-
-    def original_attributes
-      attributes.merge({directed: directed, weight: weight})
+      graph.directed? ? node == node2 : has_node?(node)
     end
 
     def to_s
-      "[#{node1.id} #{directed ?
-          "=(#{attributes[:kind]}(#{weight}))=>>" :
-          "==(#{attributes[:kind]}(#{weight}))=="} #{node2.id}]"
+      descr = graph.directed? ? ["=", "=>>"] : ["==", "=="]
+      "[#{node1.id} %s(#{attributes[:kind]}(#{weight}))%s #{node2.id}]" % descr
     end
 
     def inspect
-      "<Rbgraph::Edge:##{id} #{to_s} #{attributes.inspect}>"
+      "<Rbgraph::Edge:##{id} #{attributes.inspect}>"
     end
 
-    def to_json
-      {id: id}.merge(original_attributes).to_json
+    def to_json(options = {})
+      attributes.reject { |k, v| v.nil? || (v.respond_to?(:empty?) && v.empty?) }.to_json(options)
     end
 
   end

data/lib/rbgraph/graph.rb

@@ -14,29 +14,34 @@ module Rbgraph
       nodes.values.length
     end
 
-    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
+    def directed?
+      raise NotImplementedError
+    end
+
+    def add_node!(node_id, node_data, &block)
+      if nodes[node_id].nil?
+        nodes[node_id] = Node.new(self, node_id, node_data)
       else
-        nodes[node.id].merge(node)
+        nodes[node_id] = yield(self, nodes[node.id], node_data) if block_given?
       end
-      nodes[node.id]
+      nodes[node_id]
     end
 
-    def add_edge!(node1, node2, edge_attributes = {})
-      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
+    def add_edge!(node1, node2, weight = 1, kind = nil, edge_data = {}, &block)
+      node1 = add_node!(node1[:id], node1[:data])
+      node2 = add_node!(node2[:id], node2[:data])
+      new_edge = Edge.new(self, node1, node2, weight, kind, edge_data)
+      if edges[new_edge.id].nil?
+        edges[new_edge.id] = new_edge
       else
-        edges[edge.id].merge(edge)
+        if block_given?
+          edges[new_edge.id] = yield(self, edges[edge.id], new_edge)
+        else
+          edges[new_edge.id].weight += weight
+        end
       end
-      connect_nodes(node1, node2, edge)
-      edge
+      connect_nodes(node1, node2, edges[new_edge.id])
+      edges[new_edge.id]
     end
 
     def remove_node!(node)
@@ -56,25 +61,26 @@ module Rbgraph
       edges.delete(edge.id)
     end
 
-    def merge_nodes!(node_ids, new_attrs = {})
-      node_ids = node_ids.map { |node_id| nodes[node_id].nil? ? nil : node_id } .compact
+    def merge_nodes!(node_ids, new_node_id = nil, new_node_data = {}, merge_options = {}, &block)
+      node_ids = nodes.values_at(*node_ids).compact.map(&:id)
       return nil if node_ids.empty?
-      new_id = new_attrs[:id]
-      new_node = nil
-      if new_id.nil?
-        if nodes[new_id].nil?
-          new_node = nodes[node_ids.shift]
+      if new_node_id.nil?
+        # If new_node_id is nil then select the first from the list as the surviving node.
+        new_node = nodes[node_ids.shift]
+      else
+        # Otherwise either check if a node with the given id exists, or create a new one.
+        if nodes[new_node_id].nil?
+          new_node = add_node!(new_node_id, new_node_data)
         else
-          new_node = nodes[new_id]
-          node_ids.delete(new_id)
+          new_node = nodes[new_node_id]
+          random_not_existent_id = nodes.keys.sort_by { |k| -k.to_s.length } .first.to_s + "_"
+          new_node.merge!(Node.new(self, 0, new_node_data))
+          node_ids.delete(new_node_id)
         end
-        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)
+        new_node.merge!(node, merge_options, &block)
       end
       new_node
     end
@@ -84,7 +90,7 @@ module Rbgraph
     end
 
     def inspect
-      edges.map(&:inspect)
+      edges.values.map(&:inspect)
     end
 
   end

data/lib/rbgraph/graphs/directed.rb

@@ -2,8 +2,8 @@ module Rbgraph
 
     class DirectedGraph < Graph
 
-      def add_edge!(node1, node2, edge_attributes = {})
-        super(node1, node2, {directed: true}.merge(edge_attributes))
+      def directed?
+        true
       end
 
       def connect_nodes(node1, node2, edge)

data/lib/rbgraph/graphs/undirected.rb

@@ -2,8 +2,8 @@ module Rbgraph
 
     class UndirectedGraph < Graph
 
-      def add_edge!(node1, node2, edge_attributes = {})
-        super(node1, node2, {directed: false}.merge(edge_attributes))
+      def directed?
+        false
       end
 
       def connect_nodes(node1, node2, edge)

data/lib/rbgraph/node.rb

@@ -4,16 +4,17 @@ module Rbgraph
 
     attr_accessor :id
     attr_accessor :graph
-    attr_accessor :attributes
     attr_accessor :neighbors
     attr_accessor :edges
-
-    def initialize(attributes = {})
-      self.attributes = attributes
-      raise "Node should have an id attribute!" if attributes[:id].nil?
-      self.id = attributes.delete(:id)
-      self.neighbors = {}
-      self.edges = {}
+    attr_accessor :data
+
+    def initialize(graph, id, data = {})
+      raise "Node should have a non-nil id!" if id.nil?
+      self.graph      = graph
+      self.id         = id
+      self.neighbors  = {}
+      self.edges      = {}
+      self.data       = data || {}
     end
 
     def ==(node)
@@ -22,12 +23,15 @@ module Rbgraph
     alias_method :==, :eql?
 
     def hash
-      id
+      id.hash
     end
 
-    def merge(node)
-      attributes.merge!(node.attributes.reject { |k, v| k == :id })
-      self
+    def attributes
+      {id: id, data: data}
+    end
+
+    def [](key)
+      attributes.fetch(key.to_sym)
     end
 
     def connect_to(node, edge)
@@ -38,18 +42,27 @@ module Rbgraph
       self
     end
 
-    def absorb!(node)
-      node.edges.values.each do |edge|
-        other_node = edge.other_node(node)
-        if edge.out_for?(node)
-          graph.add_edge!(self, other_node, edge.original_attributes) unless other_node == self
-        elsif edge.in_for?(node)
-          graph.add_edge!(other_node, self, edge.original_attributes) unless other_node == self
+    def merge!(node, options = {}, &block)
+      node.edges.values.group_by(&:kind).each do |kind, edges|
+        edges.each do |edge|
+          other_node = edge.other_node(node)
+          edge_kind = edge.kind || options[:edge_kind]
+          unless other_node == self
+            if edge.out_for?(node)
+              graph.add_edge!(self, other_node, edge.weight, edge_kind, edge.data, &block)
+            elsif edge.in_for?(node)
+              graph.add_edge!(other_node, self, edge.weight, edge_kind, edge.data, &block)
+            end
+          end
         end
       end
       graph.remove_node!(node)
     end
 
+    def merge_data!(node)
+      data.merge!(node.data)
+    end
+
     def outgoing_edges
       edges.select { |eid, edge| edge.out_for?(self) }
     end
@@ -67,11 +80,11 @@ module Rbgraph
     end
 
     def inspect
-      "<Rbgraph::Node:##{id} #{attributes.inspect}>"
+      "<Rbgraph::Node:##{id} #{data.inspect}>"
     end
 
-    def to_json
-      {id: id}.merge(attributes).to_json
+    def to_json(options = {})
+      attributes.to_json(options)
     end
 
   end

metadata

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