tangle 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcae5a69389e6074f55eb085be956255e8521a1e5ed639f11cfbf9ddfa127caa
-  data.tar.gz: 8be2323898911d92cc80d72796d709f38bb22dd8695529983ff587409d7c18b4
+  metadata.gz: 49f9618a6db24308eea9b672789ec0cb9a75ec124050cc5b748340bbc19ccdea
+  data.tar.gz: bb5aa5bf4b8e80942c7b2f1871529ef39a2a871ded60a01fb4acf23a288bca41
 SHA512:
-  metadata.gz: 7b08fd566dfe1dc2b0e00133aabcc682f8fe846e123753116b44347522d96017934fa2a86f3aa756e59b8811018879e1356d25e1978ae67379aeeaefa0430731
-  data.tar.gz: 9b5828084f4737d7d16f01d729db25fbe2f040a1c099fed77d3045293af149a73e77eee4ed716e914f29656537e3715c4fb326992b3ac6a406a44b32369323bd
+  metadata.gz: 47dddb4a4fa185863f69e06b63526eaa197d4f6bbdd7c5185199f6890eaa10f5799d9137868e7632bf6b1e8fd74c79fea3a066d728ebf0270f91914cd9f81254
+  data.tar.gz: 2c423486fb396bd060acb919fe00ac4459b7119a0fe08790549300560e39ea8831fb6df792dc5006d9733b085d9eb0ef9d1b957645aaa21cf4b0acfab2dc85a6

data/lib/tangle/directed/acyclic/edge.rb

@@ -11,7 +11,7 @@ module Tangle
 
         def validate_edge
           super
-          raise CyclicError if @parent.ancestor?(@child) &&
+          raise CyclicError if @parent.ancestor?(@child) ||
                                @child.descendant?(@parent)
         end
       end

data/lib/tangle/mixin/ancestry.rb

@@ -40,7 +40,7 @@ module Tangle
         end
 
         def ancestor?(other)
-          connected?(other, test_method: :parent?)
+          other == self || parents.any? { |parent| parent.ancestor?(other) }
         end
 
         def child_edges
@@ -56,7 +56,7 @@ module Tangle
         end
 
         def descendant?(other)
-          connected?(other, test_method: :child?)
+          other == self || children.any? { |child| child.descendant?(other) }
         end
       end
     end

data/lib/tangle/mixin/connectedness.rb

@@ -53,20 +53,20 @@ module Tangle
         # Two vertices are connected if there is a path between them,
         # and a vertex is connected to itself.
         #
-        def connected?(other, test_method: :adjacent?)
+        def connected?(other)
           raise GraphError unless @graph == other.graph
           return true if self == other
 
-          connected_excluding?(other, test_method, Set[self])
+          connected_excluding?(other, Set[self])
         end
 
         protected
 
-        def connected_excluding?(other, test_method, history)
-          return true if send(test_method, other)
+        def connected_excluding?(other, history)
+          return true if other.adjacent?(self)
 
           (neighbours - history).any? do |vertex|
-            vertex.connected_excluding?(other, test_method, history << self)
+            vertex.connected_excluding?(other, history << self)
           end
         end
       end

metadata

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