rbgraph 0.0.12 → 0.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/rbgraph/edge.rb +6 -1
- data/lib/rbgraph/node.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b0c267f9931130e8382595cdab738beee199b049
|
4
|
+
data.tar.gz: 841e41cd4ac0a71daa5ed6600776e00504bf4941
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9eb091cd1521b53c428e324fb29218cc7f5fb99420576e001fb08260566a189c149b3b39200febf030c5c923b68840948c99471ff7578552cbedfb9a0afde329
|
7
|
+
data.tar.gz: 7725b8902851b2c13606b8fe3b21398ef277bf32cf03190284e1792d9602e4211d0a5c5aa7075ef4e53dcbcc4d23524b429286e0b0ae1c7155c3181ac1c692e4
|
data/README.md
CHANGED
data/lib/rbgraph/edge.rb
CHANGED
@@ -39,8 +39,9 @@ module Rbgraph
|
|
39
39
|
end
|
40
40
|
|
41
41
|
def merge(edge)
|
42
|
+
raise "Cannot merge directed and undirected edge!" if directed ^ edge.directed # XOR
|
42
43
|
self.weight += edge.weight unless edge.weight.nil?
|
43
|
-
attributes.merge!(edge.attributes
|
44
|
+
attributes.merge!(edge.attributes)
|
44
45
|
self
|
45
46
|
end
|
46
47
|
|
@@ -60,6 +61,10 @@ module Rbgraph
|
|
60
61
|
end
|
61
62
|
end
|
62
63
|
|
64
|
+
def original_attributes
|
65
|
+
attributes.merge({directed: directed, weight: weight})
|
66
|
+
end
|
67
|
+
|
63
68
|
def inspect
|
64
69
|
"<Rbgraph::Edge:##{id} (#{weight}) [#{node1.inspect} #{directed ? "=(#{attributes[:kind]})=>>" : "==(#{attributes[:kind]})=="} #{node2.inspect}] #{attributes.inspect}>"
|
65
70
|
end
|
data/lib/rbgraph/node.rb
CHANGED
@@ -42,9 +42,9 @@ module Rbgraph
|
|
42
42
|
node.edges.values.each do |edge|
|
43
43
|
other_node = edge.other_node(node)
|
44
44
|
if edge.out_for?(node)
|
45
|
-
graph.add_edge!(self, other_node, edge.
|
45
|
+
graph.add_edge!(self, other_node, edge.original_attributes) unless other_node == self
|
46
46
|
elsif edge.in_for?(node)
|
47
|
-
graph.add_edge!(other_node, self, edge.
|
47
|
+
graph.add_edge!(other_node, self, edge.original_attributes) unless other_node == self
|
48
48
|
end
|
49
49
|
end
|
50
50
|
graph.remove_node!(node)
|