Base on BaseGraph and BaseSet

Author: clue

src/Balance.php

@@ -2,7 +2,7 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
-use Fhaculty\Graph\Algorithm\Base;
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 
@@ -15,25 +15,8 @@
  * @link http://en.wikipedia.org/wiki/Flow_network
  * @see Algorithm\Degree if you're looking for balanced degrees instead of balanced flows
  */
-class Balance extends Base
+class Balance extends BaseGraph
 {
-    /**
-     * Graph to operate on
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     * instanciate new Balance algorithm
-     *
-     * @param Graph $graph graph to operate on
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     public function getBalance()
     {
         $balance = 0;

src/Bipartit.php

@@ -2,24 +2,13 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Exception\UnexpectedValueException;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 
-class Bipartit extends Base
+class Bipartit extends BaseGraph
 {
-    /**
-     * input graph to operate on
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * check whether this graph is bipartit
      *

src/Complete.php

@@ -2,6 +2,7 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 
 /**
@@ -13,25 +14,8 @@
  * @link http://en.wikipedia.org/wiki/Complete_graph
  * @link http://mathworld.wolfram.com/CompleteGraph.html
  */
-class Complete extends Base
+class Complete extends BaseGraph
 {
-    /**
-     * Graph to operate on
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     * instantiate new complete algorithm
-     *
-     * @param Graph $graph
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * checks whether this graph is complete (every vertex has an edge to any other vertex)
      *

src/ConnectedComponents.php

@@ -2,30 +2,16 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Algorithm\Search\BreadthFirst as SearchBreadthFirst;
 
 use Fhaculty\Graph\Exception\InvalidArgumentException;
 
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 
-class ConnectedComponents extends Base
+class ConnectedComponents extends BaseGraph
 {
-    /**
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     *
-     * @param Graph $graph
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * create subgraph with all vertices connected to given vertex (i.e. the connected component of ths given vertex)
      *

src/Degree.php

@@ -2,39 +2,22 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
-use Fhaculty\Graph\Algorithm\Base;
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Exception\UnexpectedValueException;
 
 /**
  * Basic algorithms for working with the degrees of Graphs.
- * 
+ *
  * The degree (or valency) of a Vertex of a Graph is the number of Edges
  * incident to the Vertex, with Loops counted twice.
- * 
+ *
  * @link http://en.wikipedia.org/wiki/Degree_%28graph_theory%29
  * @link http://en.wikipedia.org/wiki/Regular_graph
  */
-class Degree extends Base
+class Degree extends BaseGraph
 {
-    /**
-     * Graph to operate on
-     * 
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     * instanciate new degree algorithm
-     * 
-     * @param Graph $graph
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * get degree for k-regular-graph (only if each vertex has the same degree)
      *

src/DetectNegativeCycle.php

@@ -2,30 +2,16 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Exception\UnderflowException;
 
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Exception\NegativeCycleException;
 use Fhaculty\Graph\Algorithm\ShortestPath\MooreBellmanFord as SpMooreBellmanFord;
 
-class DetectNegativeCycle extends Base
+class DetectNegativeCycle extends BaseGraph
 {
-    /**
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     *
-     * @param Graph $graph
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * check if the input graph has any negative cycles
      *

src/Directed.php

@@ -2,37 +2,17 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
-use Fhaculty\Graph\Set;
-use Fhaculty\Graph\Algorithm\Base;
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Walk;
 
 /**
  * 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 Base
+class Directed extends BaseSet
 {
-    /**
-     * Graph/Walk to operate on
-     *
-     * @var Set
-     */
-    private $set;
-
-    /**
-     * instanciate new directed algorithm
-     *
-     * @param Set|Graph|Walk $graphOrWalk either the Graph or Walk to operate on (or the common base class Set)
-     */
-    public function __construct(Set $graphOrWalk)
-    {
-        $this->set = $graphOrWalk;
-    }
-
     /**
      * checks whether the graph has any directed edges (aka digraph)
      *

src/Eulerian.php

@@ -2,21 +2,11 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 
-class Eulerian extends Base
+class Eulerian extends BaseGraph
 {
-    /**
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * check whether this graph has an eulerian cycle
      *

src/Groups.php

@@ -2,27 +2,11 @@
 
 namespace Fhaculty\Graph\Algorithm;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 
-class Groups extends Base
+class Groups extends BaseGraph
 {
-    /**
-     * graph to operate on
-     *
-     * @var Graph
-     */
-    private $graph;
-
-    /**
-     * instanciate algorithm on given graph
-     *
-     * @param Graph $graph
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * count total number of different groups assigned to vertices
      *

src/MaximumMatching/Base.php

@@ -2,30 +2,12 @@
 
 namespace Fhaculty\Graph\Algorithm\MaximumMatching;
 
+use Fhaculty\Graph\Algorithm\BaseGraph;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Algorithm\Base as AlgorithmBase;
 
-abstract class Base extends AlgorithmBase
+abstract class Base extends BaseGraph
 {
-    /**
-     * Origianl graph
-     *
-     * @var Graph
-     */
-    protected $graph;
-
-    /**
-     * The given graph where the algorithm should operate on
-     *
-     * @param  Graph     $graph
-     * @throws Exception if the given graph is not balanced
-     */
-    public function __construct(Graph $graph)
-    {
-        $this->graph = $graph;
-    }
-
     /**
      * Get the count of edges that are in the match
      *