tangle 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f9618a6db24308eea9b672789ec0cb9a75ec124050cc5b748340bbc19ccdea
-  data.tar.gz: bb5aa5bf4b8e80942c7b2f1871529ef39a2a871ded60a01fb4acf23a288bca41
+  metadata.gz: 5203984ea1bf3218c6ac6e2a84493af7feec46d2dda8f6005e8d24b5e81671db
+  data.tar.gz: b39938c50a2a828963af60ee6877dae048a52a5a83fb6e5ccadc3f2727cc66d0
 SHA512:
-  metadata.gz: 47dddb4a4fa185863f69e06b63526eaa197d4f6bbdd7c5185199f6890eaa10f5799d9137868e7632bf6b1e8fd74c79fea3a066d728ebf0270f91914cd9f81254
-  data.tar.gz: 2c423486fb396bd060acb919fe00ac4459b7119a0fe08790549300560e39ea8831fb6df792dc5006d9733b085d9eb0ef9d1b957645aaa21cf4b0acfab2dc85a6
+  metadata.gz: 5598f8494cee8dfdbbc6061ab2f00596fb70fd419872a8884182c21b0ad0c62c234c2ac766df1dadffa4cd6ce84b60b5a1b44f46cbc27782e162535252db89b2
+  data.tar.gz: c34f2d721e72680ffca31108d1b608b868912bc8b631f9abd7ea866335503e287ae9031660a8d2c1e2781a6ce9276c22d302001339522ddf18224b665838695f

data/lib/tangle/directed/edge.rb

@@ -24,9 +24,10 @@ module Tangle
 
       protected
 
-      def with_vertices(vertex1, vertex2 = vertex1)
-        @child, @parent = @vertices = [vertex1, vertex2]
-        self
+      def with_vertices(child, parent = child)
+        @child = child
+        @parent = parent
+        super
       end
     end
   end

data/lib/tangle/edge.rb

@@ -16,7 +16,8 @@ module Tangle
     #
     # End users should probably use Graph#add_edge instead.
     #
-    def initialize(vertex1, vertex2 = vertex1, graph: nil, **kwargs)
+    def initialize(vertex1, vertex2 = vertex1, graph: nil, name: nil, **kwargs)
+      @name = name
       with_graph(graph)
       with_vertices(vertex1, vertex2)
 

data/lib/tangle/graph.rb

@@ -59,11 +59,12 @@ module Tangle
     #
     # edges => Array
     #
-    def edges(&selector)
+    def edges(vertex: nil, &selector)
+      edges = vertex.nil? ? @edges : @edges_by_vertex[vertex]
       if block_given?
-        @edges.select(&selector)
+        edges.select(&selector)
       else
-        @edges.to_a
+        edges.to_a
       end
     end
 
@@ -130,5 +131,10 @@ module Tangle
     end
 
     attr_reader :mixins
+
+    def to_s
+      "#<#{self.class}: #{vertices.count} vertices, #{edges.count} edges>"
+    end
+    alias inspect to_s
   end
 end

data/lib/tangle/graph_private.rb

@@ -8,6 +8,7 @@ module Tangle
     def initialize_vertices
       @vertices_by_id = {}
       @vertices_by_name = {}
+      @edges_by_vertex = {}
     end
 
     def initialize_edges

data/lib/tangle/graph_protected.rb

@@ -10,6 +10,7 @@ module Tangle
     def insert_vertex(vertex)
       raise ArgumentError unless vertex.graph.eql?(self)
 
+      @edges_by_vertex[vertex] = []
       @vertices_by_name[vertex.name] = vertex unless vertex.name.nil?
       @vertices_by_id[vertex.vertex_id] = vertex
     end
@@ -20,6 +21,9 @@ module Tangle
       raise ArgumentError unless edge.graph.eql?(self)
 
       @edges << edge
+      edge.vertices.each do |vertex|
+        @edges_by_vertex[vertex] << edge
+      end
       edge
     end
 

data/lib/tangle/mixin/ancestry.rb

@@ -12,12 +12,14 @@ module Tangle
       module Graph
         include Tangle::Mixin::Connectedness::Graph
 
-        def ancestor_subgraph(vertex)
-          subgraph { |other| vertex.ancestor?(other) }
+        def ancestor_subgraph(vertex, &selector)
+          vertex = get_vertex(vertex) unless vertex.is_a? Vertex
+          clone.with_vertices(vertex.ancestors(&selector)).with_edges(edges)
         end
 
-        def descendant_subgraph(vertex)
-          subgraph { |other| vertex.descendant?(other) }
+        def descendant_subgraph(vertex, &selector)
+          vertex = get_vertex(vertex) unless vertex.is_a? Vertex
+          clone.with_vertices(vertex.descendants(&selector)).with_edges(edges)
         end
       end
 
@@ -28,13 +30,19 @@ module Tangle
         include Tangle::Mixin::Connectedness::Vertex
 
         def parent_edges
-          @graph.edges { |edge| edge.child?(self) }
+          @graph.edges(vertex: self) { |edge| edge.child?(self) }
         end
 
         def parents
           neighbours(parent_edges)
         end
 
+        def ancestors
+          result = [self] + parents.flat_map(&:ancestors)
+          return result unless block_given?
+          result.select(&:yield)
+        end
+
         def parent?(other)
           @graph.edges.any? { |edge| edge.child?(self) && edge.parent?(other) }
         end
@@ -44,7 +52,7 @@ module Tangle
         end
 
         def child_edges
-          @graph.edges { |edge| edge.parent?(self) }
+          @graph.edges(vertex: self) { |edge| edge.parent?(self) }
         end
 
         def children
@@ -55,6 +63,12 @@ module Tangle
           @graph.edges.any? { |edge| edge.parent?(self) && edge.child?(other) }
         end
 
+        def descendants
+          result = [self] + children.flat_map(&:descendants)
+          return result unless block_given?
+          result.select(&:yield)
+        end
+
         def descendant?(other)
           other == self || children.any? { |child| child.descendant?(other) }
         end

data/lib/tangle/simple/graph.rb

@@ -7,12 +7,6 @@ module Tangle
     # A simple graph, without loops and multiple edges
     class Graph < Tangle::Graph
       Edge = Tangle::Simple::Edge
-
-      private
-
-      def initialize_edges
-        @edges = Set[]
-      end
     end
   end
 end

data/lib/tangle/vertex.rb

@@ -46,7 +46,7 @@ module Tangle
     def edges
       return [] if @graph.nil?
 
-      @graph.edges { |edge| edge.include? self }
+      @graph.edges(vertex: self)
     end
 
     # Return the set of adjacent vertices
@@ -84,6 +84,16 @@ module Tangle
     attr_reader :name
     attr_reader :vertex_id
 
+    def to_s
+      values = {
+        class: self.class,
+        ident: name.nil? ? format('0x%x', vertex_id) : "'#{name}'",
+        n_edges: edges.count
+      }
+      format('#<%<class>s:%<ident>s: %<n_edges>d edges>', values)
+    end
+    alias inspect to_s
+
     protected
 
     def with_graph(graph)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tangle
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Calle Englund