simple_dag 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2d29444d0ba1fc5d58a978b2155b6ae935bbab
-  data.tar.gz: 169ecd6b74d0dbcb692be5d7d31451a962acefbf
+  metadata.gz: 24f74f8db152d6814b0b323b1e419a4b307f91b2
+  data.tar.gz: 2f06fe90b5b5638319d774ca9b3e047dc8ceb482
 SHA512:
-  metadata.gz: bfec6a34670faf8dfc41cb179e8a77c2aa5185f7810d380072bce9fd2295b457a4dd7c56e9cb8577b5e8fc03a56992d03f6ea842b5e6f163e7db70932e5eddd8
-  data.tar.gz: e4efddca431809b0e28e04cfa80b7eb30e170242e33f12c4fc3653e329c727d6fddb615d1f4a88deaa1771839929c2efb2c0431a023373519d0820fac90f1a39
+  metadata.gz: 1754b090487a7c066b0dfba06d46c80c04a03c5c155799c209d0a0eefb0aff305b21dcf3f29241514b09ad9cf6dc3118379a2d7ef4518a95e9b33ab69e1e04aa
+  data.tar.gz: 1660662e9bdfa43018dc3ff6974cc12d19218330c75c762a7017a09b46d2c9c7f2499c8072fb90508341620788bf01e8e2437783afac26a98fb10a4bbc19f86f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_dag (0.0.0)
+    simple_dag (0.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/simple_dag.rb

@@ -68,33 +68,27 @@ class DAG
     predecessors_set = Set.new(predecessors_of)
     predecessors_of.each { |v| v.ancestors(predecessors_set) }
 
-    predecessors_set.each do |v|
-      vertex_mapping[v] = result.add_vertex(v.payload)
-    end
-
     # Get the set of successor vertices and add a copy to the result
     successors_set = Set.new(successors_of)
     successors_of.each { |v| v.descendants(successors_set) }
 
-    successors_set.each do |v|
-      vertex_mapping[v] = result.add_vertex(v.payload) unless
-        vertex_mapping.include? v
+    (predecessors_set + successors_set).each do |v|
+      vertex_mapping[v] = result.add_vertex(v.payload)
     end
 
-    # get the unique edges
-    edge_set = (
-      predecessors_set.flat_map(&:incoming_edges) +
-      successors_set.flat_map(&:outgoing_edges)
-    ).uniq
-
-    # Add them to the result via the vertex mapping
-    edge_set.each do |e|
-      result.add_edge(
-        from: vertex_mapping[e.origin],
-        to: vertex_mapping[e.destination],
-        properties: e.properties
-      )
+    predecessor_edges =
+      predecessors_set.flat_map(&:outgoing_edges).select do |e|
+        predecessors_set.include? e.destination
+      end
+
+    # Add the edges to the result via the vertex mapping
+    n_of_result_edges = 0
+    (predecessor_edges | successors_set.flat_map(&:outgoing_edges)).each do |e|
+      n_of_result_edges += 1
+      vertex_mapping[e.origin].send :add_edge, vertex_mapping[e.destination],
+                                    e.properties
     end
+    result.instance_variable_set :@n_of_edges, n_of_result_edges
 
     result
   end

data/lib/simple_dag/vertex.rb

@@ -75,20 +75,14 @@ class DAG
 
     def ancestors(result_set = Set.new)
       predecessors.each do |v|
-        unless result_set.include? v
-          result_set.add(v)
-          v.ancestors(result_set)
-        end
+        v.ancestors(result_set) unless result_set.add?(v).nil?
       end
       result_set
     end
 
     def descendants(result_set = Set.new)
       successors.each do |v|
-        unless result_set.include? v
-          result_set.add(v)
-          v.descendants(result_set)
-        end
+        v.descendants(result_set) unless result_set.add?(v).nil?
       end
       result_set
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_dag
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Kevin Rutherford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake