Fix accessing Sets of Vertices and Edges

Author: clue

src/Degree.php

@@ -175,7 +175,7 @@ public function getDegreeVertex(Vertex $vertex)
      */
     public function isVertexIsolated(Vertex $vertex)
     {
-        return !$vertex->getEdges();
+        return $vertex->getEdges()->isEmpty();
     }
 
     /**

src/MinimumSpanningTree/Prim.php

@@ -54,15 +54,15 @@ public function getEdges()
                 try {
                     // Get next cheapest edge
                     $cheapestEdge = $edgeQueue->extract();
+                    /* @var $cheapestEdge EdgeDirected */
                 } catch (Exception $e) {
                     return $returnEdges;
                     throw new UnexpectedValueException('Graph has more than one component');
                 }
 
                 // Check if edge is between unmarked and marked edge
 
-                $startVertices = $cheapestEdge->getVerticesStart();
-                $vertexA = $startVertices[0];
+                $vertexA = $cheapestEdge->getVerticesStart()->getVertexFirst();
                 $vertexB = $cheapestEdge->getVertexToFrom($vertexA);
 
             // Edge is between marked and unmared vertex

src/Property/GraphProperty.php

@@ -18,7 +18,7 @@ class GraphProperty extends BaseGraph
      */
     public function isEdgeless()
     {
-        return !$this->graph->getEdges();
+        return $this->graph->getEdges()->isEmpty();
     }
 
     /**
@@ -28,6 +28,6 @@ public function isEdgeless()
      */
     public function isTrivial()
     {
-        return (!$this->graph->getEdges() && $this->graph->getNumberOfVertices() === 1);
+        return ($this->graph->getEdges()->isEmpty() && $this->graph->getNumberOfVertices() === 1);
     }
 }

src/Property/WalkProperty.php

@@ -3,6 +3,7 @@
 namespace Fhaculty\Graph\Algorithm\Property;
 
 use Fhaculty\Graph\Walk;
+use Fhaculty\Graph\Set\Edges;
 use Fhaculty\Graph\Algorithm\Base as BaseAlgorithm;
 use Fhaculty\Graph\Algorithm\Loop as AlgorithmLoop;
 
@@ -60,8 +61,8 @@ public function __construct(Walk $walk)
      */
     public function isCycle()
     {
-        $vertices = $this->walk->getVerticesSequence();
-        return (reset($vertices) === end($vertices) && $this->walk->getEdges());
+        $vertices = $this->walk->getVertices()->getVector();
+        return (reset($vertices) === end($vertices) && !$this->walk->getEdges()->isEmpty());
     }
 
     /**
@@ -114,7 +115,7 @@ public function isCircuit()
      */
     public function isPath()
     {
-        return !$this->hasArrayDuplicates($this->walk->getEdgesSequence());
+        return !$this->hasArrayDuplicates($this->walk->getEdges()->getVector());
     }
 
     /**
@@ -138,7 +139,7 @@ public function isPath()
      */
     public function hasCycle()
     {
-        return $this->hasArrayDuplicates($this->walk->getVerticesSequence());
+        return $this->hasArrayDuplicates($this->walk->getVertices()->getVector());
     }
 
     /**
@@ -215,9 +216,9 @@ public function isDigon()
         // exactly 2 edges
         return ($this->walk->getNumberOfEdges() === 2 &&
                 // no duplicate edges
-                !$this->hasArrayDuplicates($this->walk->getEdgesSequence()) &&
+                !$this->hasArrayDuplicates($this->walk->getEdges()->getVector()) &&
                 // exactly two distinct vertices
-                count($this->walk->getVertices()) === 2 &&
+                count($this->walk->getVertices()->getVerticesDistinct()) === 2 &&
                 // this is actually a cycle
                 $this->isCycle());
     }
@@ -239,7 +240,7 @@ public function isTriangle()
         // exactly 3 (implicitly distinct) edges
         return ($this->walk->getNumberOfEdges() === 3 &&
                 // exactly three distinct vertices
-                count($this->walk->getVertices()) === 3 &&
+                count($this->walk->getVertices()->getVerticesDistinct()) === 3 &&
                 // this is actually a cycle
                 $this->isCycle());
     }
@@ -293,7 +294,7 @@ public function isTriangle()
      */
     public function isSimple()
     {
-        $vertices = $this->walk->getVerticesSequence();
+        $vertices = $this->walk->getVertices()->getVector();
         // ignore starting vertex for cycles as it's always the same as ending vertex
         if ($this->isCycle()) {
             unset($vertices[0]);
@@ -314,12 +315,12 @@ public function isSimple()
      */
     public function isHamiltonian()
     {
-        $vertices = $this->walk->getVerticesSequence();
+        $vertices = $this->walk->getVertices()->getVector();
         // ignore starting vertex for cycles as it's always the same as ending vertex
         if ($this->isCycle()) {
             unset($vertices[0]);
         }
-        return $this->isArrayContentsEqual($vertices, $this->walk->getGraph()->getVertices());
+        return $this->isArrayContentsEqual($vertices, $this->walk->getGraph()->getVertices()->getVector());
     }
 
     /**
@@ -332,7 +333,7 @@ public function isHamiltonian()
      */
     public function isEulerian()
     {
-        return $this->isArrayContentsEqual($this->walk->getEdgesSequence(), $this->walk->getGraph()->getEdges());
+        return $this->isArrayContentsEqual($this->walk->getEdges()->getVector(), $this->walk->getGraph()->getEdges()->getVector());
     }
 
     /**