Use Set\Vertices for accessing Graph's Vertices

Author: clue

src/Degree.php

@@ -6,6 +6,7 @@
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Exception\UnexpectedValueException;
+use Fhaculty\Graph\Set\Vertices;
 
 /**
  * Basic algorithms for working with the degrees of Graphs.
@@ -49,25 +50,25 @@ public function getDegree()
      *
      * @return int
      * @throws Exception if graph is empty or directed
-     * @uses Vertex::getFirst()
+     * @uses Vertices::getVertexOrder()
      * @uses Vertex::getDegree()
      */
     public function getDegreeMin()
     {
-        return Vertex::getFirst($this->graph->getVertices(), Vertex::ORDER_DEGREE)->getDegree();
+        return $this->graph->getVertices()->getVertexOrder(Vertices::ORDER_DEGREE)->getDegree();
     }
 
     /**
      * get maximum degree of vertices
      *
      * @return int
      * @throws Exception if graph is empty or directed
-     * @uses Vertex::getFirst()
+     * @uses Vertices::getVertexOrder()
      * @uses Vertex::getDegree()
      */
     public function getDegreeMax()
     {
-        return Vertex::getFirst($this->graph->getVertices(), Vertex::ORDER_DEGREE, true)->getDegree();
+        return $this->graph->getVertices()->getVertexOrder(Vertices::ORDER_DEGREE, true)->getDegree();
     }
 
     /**

src/MaximumMatching/Flow.php

@@ -29,11 +29,6 @@ public function getEdges()
         // create temporary flow graph with supersource and supersink
         $graphFlow = $this->graph->createGraphCloneEdgeless();
 
-        // get all vertices
-        $vertices = $graphFlow->getVertices();
-        // above $vertices does NOT contain supersource and supersink, because
-        // we want to skip over them as they do not have a partition assigned
-
         $superSource = $graphFlow->createVertex()->setLayoutAttribute('label', 's*');
         $superSink   = $graphFlow->createVertex()->setLayoutAttribute('label', 't*');
 
@@ -42,7 +37,10 @@ public function getEdges()
         $groupB = $groups[1];
 
         // connect supersource s* to set A and supersink t* to set B
-        foreach ($vertices as $vertex) {
+        foreach ($graphFlow->getVertices() as $vertex) {
+            // we want to skip over supersource & supersink as they do not have a partition assigned
+            if ($vertex === $superSource || $vertex === $superSink) continue;
+
             $group = $vertex->getGroup();
 
             // source

src/TopologicalSort.php

@@ -5,6 +5,7 @@
 use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Exception\UnexpectedValueException;
 use Fhaculty\Graph\Vertex;
+use Fhaculty\Graph\Set\Vertices;
 use Fhaculty\Graph\Graph;
 
 /**
@@ -32,11 +33,11 @@ public function getVertices()
         // TODO: find alternative to recursive algorithm to avoid hitting recursion limit with ~100 nodes
         // TODO: avoid having to reverse all vertices multiple times
 
-        foreach(array_reverse($this->graph->getVertices()) as $vertex) {
+        foreach(array_reverse($this->graph->getVertices()->getVector()) as $vertex) {
             $this->visit($vertex, $visited, $tsl);
         }
 
-        return array_reverse($tsl, true);
+        return new Vertices(array_reverse($tsl, true));
     }
 
     protected function visit(Vertex $vertex, array &$visited, array &$tsl)

tests/ShortestPath/BreadthFirstTest.php

@@ -6,6 +6,7 @@
 use Fhaculty\Graph\Edge\Base as Edge;
 use Fhaculty\Graph\Algorithm\ShortestPath\BreadthFirst;
 use Fhaculty\Graph\Loader\CompleteGraph;
+use Fhaculty\Graph\Set\Vertices;
 
 class BreadthFirstTest extends PHPUnit_Framework_TestCase
 {
@@ -24,7 +25,7 @@ public function testOne()
             $edge->destroy();
         }
 
-        $start = Vertex::getFirst($graph, Vertex::ORDER_RANDOM);
+        $start = $graph->getVertices()->getVertexOrder(Vertices::ORDER_RANDOM);
         $start->setLayoutAttribute('shape', 'doublecircle');
 
         // actually start breadth search

tests/TopologicalSortTest.php

@@ -13,7 +13,8 @@ public function testGraphEmpty()
 
         $alg = new TopologicalSort($graph);
 
-        $this->assertSame(array(), $alg->getVertices());
+        $this->assertInstanceOf('Fhaculty\Graph\Set\Vertices', $alg->getVertices());
+        $this->assertTrue($alg->getVertices()->isEmpty());
     }
 
     public function testGraphIsolated()
@@ -24,7 +25,7 @@ public function testGraphIsolated()
 
         $alg = new TopologicalSort($graph);
 
-        $this->assertSame(array(1 => $graph->getVertex(1), 2 => $graph->getVertex(2)), $alg->getVertices());
+        $this->assertSame(array($graph->getVertex(1), $graph->getVertex(2)), $alg->getVertices()->getVector());
     }
 
     public function testGraphSimple()
@@ -34,7 +35,7 @@ public function testGraphSimple()
 
         $alg = new TopologicalSort($graph);
 
-        $this->assertSame(array(1 => $graph->getVertex(1), 2 => $graph->getVertex(2)), $alg->getVertices());
+        $this->assertSame(array($graph->getVertex(1), $graph->getVertex(2)), $alg->getVertices()->getVector());
     }
 
     /**