Merge branch 'master' into fix-algo-minimumcostflow

Conflicts:
	lib/Fhaculty/Graph/Algorithm/MinimumCostFlow/SuccessiveShortestPath.php

Author: clue

src/BaseSet.php renamed to src/BaseDual.php

@@ -3,7 +3,7 @@
 namespace Fhaculty\Graph\Algorithm;
 
 use Fhaculty\Graph\Algorithm\Base;
-use Fhaculty\Graph\Set;
+use Fhaculty\Graph\Set\DualAggregate;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Walk;
 
@@ -12,12 +12,12 @@
  *
  * @see Set
  */
-abstract class BaseSet extends Base
+abstract class BaseDual extends Base
 {
     /**
      * Set to operate on
      *
-     * @var Set
+     * @var DualAggregate
      */
     protected $set;
 
@@ -26,7 +26,7 @@ abstract class BaseSet extends Base
      *
      * @param Graph|Walk|Set $graphOrWalk either the Graph or Walk to operate on (or the common base class Set)
      */
-    public function __construct(Set $graphOrWalk)
+    public function __construct(DualAggregate $graphOrWalk)
     {
         $this->set = $graphOrWalk;
     }

src/ConnectedComponents.php

@@ -65,21 +65,20 @@ private function createSearch(Vertex $vertex)
      * connected here.
      *
      * @return boolean
-     * @uses AlgorithmSearchBreadthFirst::getNumberOfVertices()
      * @see self::getNumberOfComponents()
      */
     public function isSingle()
     {
         try {
-            $vertex = $this->graph->getVertexFirst();
+            $vertex = $this->graph->getVertices()->getVertexFirst();
         }
         catch (UnderflowException $e) {
             // no first vertex => empty graph => has zero components
             return false;
         }
         $alg = $this->createSearch($vertex);
 
-        return ($this->graph->getNumberOfVertices() === $alg->getNumberOfVertices());
+        return (count($this->graph->getVertices()) === count($alg->getVertices()));
     }
 
     /**

src/Degree.php

@@ -31,7 +31,7 @@ class Degree extends BaseGraph
     public function getDegree()
     {
         // get initial degree of any start vertex to compare others to
-        $degree = $this->getDegreeVertex($this->graph->getVertexFirst());
+        $degree = $this->getDegreeVertex($this->graph->getVertices()->getVertexFirst());
 
         foreach ($this->graph->getVertices() as $vertex) {
             /** @var $vertex Vertex */

src/Directed.php

@@ -4,21 +4,25 @@
 
 use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Edge\Directed as EdgeDirected;
+use Fhaculty\Graph\Edge\Undirected as EdgeUndirected;
 
 /**
  * Basic algorithms for working with the undirected or directed Graphs (digraphs) / Walks.
  *
  * @link http://en.wikipedia.org/wiki/Glossary_of_graph_theory#Direction
  * @link http://en.wikipedia.org/wiki/Digraph_%28mathematics%29
  */
-class Directed extends BaseSet
+class Directed extends BaseDual
 {
     /**
-     * checks whether the graph has any directed edges (aka digraph)
+     * checks whether the graph has any directed edges
+     *
+     * This method is intentionally not named "isDirected()" (aka digraph),
+     * because that might be misleading in regards to empty and/or mixed graphs.
      *
      * @return boolean
      */
-    public function isDirected()
+    public function hasDirected()
     {
         foreach ($this->set->getEdges() as $edge) {
             if ($edge instanceof EdgeDirected) {
@@ -28,4 +32,35 @@ public function isDirected()
 
         return false;
     }
+
+    /**
+     * checks whether the graph has any undirected edges
+     *
+     * This method is intentionally not named "isUndirected()",
+     * because that might be misleading in regards to empty and/or mixed graphs.
+     *
+     * @return boolean
+     */
+    public function hasUndirected()
+    {
+        foreach ($this->set->getEdges() as $edge) {
+            if ($edge instanceof EdgeUndirected) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * checks whether this is a mixed graph (contains both directed and undirected edges)
+     *
+     * @return boolean
+     * @uses self::hasDirected()
+     * @uses self::hasUndirected()
+     */
+    public function isMixed()
+    {
+        return ($this->hasDirected() && $this->hasUndirected());
+    }
 }

src/Flow.php

@@ -18,7 +18,7 @@
  * @link http://en.wikipedia.org/wiki/Flow_network
  * @see Algorithm\Balance
  */
-class Flow extends BaseSet
+class Flow extends BaseDual
 {
     /**
      * check if this graph has any flow set (any edge has a non-NULL flow)

src/Loop.php

@@ -2,7 +2,7 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
-use Fhaculty\Graph\Algorithm\BaseSet;
+use Fhaculty\Graph\Algorithm\BaseDual;
 use Fhaculty\Graph\Edge\Base as Edge;
 use Fhaculty\Graph\Vertex;
 
@@ -14,7 +14,7 @@
  *
  * @link http://en.wikipedia.org/wiki/Loop_%28graph_theory%29
  */
-class Loop extends BaseSet
+class Loop extends BaseDual
 {
     /**
      * checks whether this graph has any loops (edges from vertex to itself)

src/MaximumMatching/Flow.php

@@ -18,7 +18,7 @@ class Flow extends Base
     public function getEdges()
     {
         $alg = new Directed($this->graph);
-        if ($alg->isDirected()) {
+        if ($alg->hasDirected()) {
             throw new UnexpectedValueException('Input graph contains directed edges');
         }
 

src/MinimumSpanningTree/Kruskal.php

@@ -125,7 +125,7 @@ public function getEdges()
 
         // definition of spanning tree: number of edges = number of vertices - 1
         // above algorithm does not check isolated edges or may otherwise return multiple connected components => force check
-        if (count($returnEdges) !== ($this->graph->getNumberOfVertices() - 1)) {
+        if (count($returnEdges) !== (count($this->graph->getVertices()) - 1)) {
             throw new UnexpectedValueException('Graph is not connected');
         }
 

src/MinimumSpanningTree/Prim.php

@@ -35,7 +35,7 @@ public function getEdges()
         $returnEdges = array();
 
         // iterate n-1 times (per definition, resulting MST MUST have n-1 edges)
-        for ($i = 0, $n = $this->startVertex->getGraph()->getNumberOfVertices() - 1; $i < $n; ++$i) {
+        for ($i = 0, $n = count($this->startVertex->getGraph()->getVertices()) - 1; $i < $n; ++$i) {
             $markInserted[$vertexCurrent->getId()] = true;
 
             // get unvisited vertex of the edge and add edges from new vertex

src/Property/GraphProperty.php

@@ -46,6 +46,6 @@ public function isNull()
      */
     public function isTrivial()
     {
-        return ($this->graph->getEdges()->isEmpty() && $this->graph->getNumberOfVertices() === 1);
+        return ($this->graph->getEdges()->isEmpty() && count($this->graph->getVertices()) === 1);
     }
 }