Update to graphp/graph

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.3",
-        "clue/graph": "~0.9.0|~0.8.0"
+        "graphp/graph": "dev-master#fb198e4 as 1.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"

src/BaseDual.php

@@ -2,9 +2,9 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\DualAggregate;
-use Fhaculty\Graph\Walk;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\DualAggregate;
+use Graphp\Graph\Walk;
 
 /**
  * Abstract base class for algorithms that operate on a given Set instance

src/BaseGraph.php

@@ -2,7 +2,7 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Graph;
+use Graphp\Graph\Graph;
 
 /**
  * Abstract base class for algorithms that operate on a given Graph instance

src/BaseVertex.php

@@ -2,7 +2,7 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\Vertex;
 
 /**
  * Abstract base class for algorithms that operate on a given Vertex instance

src/Bipartit.php

@@ -2,8 +2,8 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
 
 class Bipartit extends BaseGraph
 {

src/ConnectedComponents.php

@@ -2,11 +2,11 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Exception\InvalidArgumentException;
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Vertex;
 use Graphp\Algorithms\Search\BreadthFirst as SearchBreadthFirst;
+use Graphp\Graph\Exception\InvalidArgumentException;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Vertex;
 
 /**
  * Algorithm for working with connected components

src/Degree.php

@@ -2,9 +2,9 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Vertex;
 
 /**
  * Basic algorithms for working with the degrees of Graphs.

src/DetectNegativeCycle.php

@@ -2,11 +2,11 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Exception\NegativeCycleException;
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Walk;
 use Graphp\Algorithms\ShortestPath\MooreBellmanFord as SpMooreBellmanFord;
+use Graphp\Graph\Exception\NegativeCycleException;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Walk;
 
 class DetectNegativeCycle extends BaseGraph
 {

src/Directed.php

@@ -2,8 +2,8 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Edge\Undirected as EdgeUndirected;
+use Graphp\Graph\EdgeDirected;
+use Graphp\Graph\EdgeUndirected;
 
 /**
  * Basic algorithms for working with the undirected or directed Graphs (digraphs) / Walks.

src/Flow.php

@@ -2,9 +2,9 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\EdgeDirected;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Vertex;
 
 /**
  * Basic algorithms for working with flow graphs

src/Groups.php

@@ -2,8 +2,8 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Set\Vertices;
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\Set\Vertices;
+use Graphp\Graph\Vertex;
 
 class Groups extends BaseGraph
 {

src/Loop.php

@@ -2,7 +2,7 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\Vertex;
 
 /**
  * Basic algorithms for working with loop edges

src/MaxFlow/EdmondsKarp.php

@@ -2,17 +2,17 @@
 
 namespace Graphp\Algorithms\MaxFlow;
 
-use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Exception\InvalidArgumentException;
-use Fhaculty\Graph\Exception\OutOfBoundsException;
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
-use Fhaculty\Graph\Vertex;
 use Graphp\Algorithms\Base;
 use Graphp\Algorithms\ResidualGraph;
 use Graphp\Algorithms\ShortestPath\BreadthFirst;
+use Graphp\Graph\EdgeDirected;
+use Graphp\Graph\Exception\InvalidArgumentException;
+use Graphp\Graph\Exception\OutOfBoundsException;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
+use Graphp\Graph\Vertex;
 
 class EdmondsKarp extends Base
 {

src/MaximumMatching/Base.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms\MaximumMatching;
 
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
 use Graphp\Algorithms\BaseGraph;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
 
 abstract class Base extends BaseGraph
 {

src/MaximumMatching/Flow.php

@@ -2,12 +2,12 @@
 
 namespace Graphp\Algorithms\MaximumMatching;
 
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Set\Edges;
-use Fhaculty\Graph\Vertex;
 use Graphp\Algorithms\Directed;
 use Graphp\Algorithms\Groups;
 use Graphp\Algorithms\MaxFlow\EdmondsKarp as MaxFlowEdmondsKarp;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Set\Edges;
+use Graphp\Graph\Vertex;
 
 class Flow extends Base
 {
@@ -42,16 +42,16 @@ public function getEdges()
 
             if ($group === $groupA) {
                 // group A: source
-                $superSource->createEdgeTo($vertex)->setCapacity(1)->setFlow(0);
+                $graphFlow->createEdgeDirected($superSource, $vertex)->setCapacity(1)->setFlow(0);
 
                 // temporarily create edges from A->B for flow graph
                 $originalVertex = $this->graph->getVertex($vertex->getId());
                 foreach ($originalVertex->getVerticesEdgeTo() as $vertexTarget) {
-                    $vertex->createEdgeTo($graphFlow->getVertex($vertexTarget->getId()))->setCapacity(1)->setFlow(0);
+                    $graphFlow->createEdgeDirected($vertex, $graphFlow->getVertex($vertexTarget->getId()))->setCapacity(1)->setFlow(0);
                 }
             } else {
                 // group B: sink
-                $vertex->createEdgeTo($superSink)->setCapacity(1)->setFlow(0);
+                $graphFlow->createEdgeDirected($vertex, $superSink)->setCapacity(1)->setFlow(0);
             }
         }
 

src/MinimumCostFlow/Base.php

@@ -5,10 +5,10 @@
 use Graphp\Algorithms\BaseGraph;
 use Graphp\Algorithms\Weight as AlgorithmWeight;
 use Graphp\Algorithms\Flow as AlgorithmFlow;
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
 
 abstract class Base extends BaseGraph
 {

src/MinimumCostFlow/CycleCanceling.php

@@ -2,12 +2,12 @@
 
 namespace Graphp\Algorithms\MinimumCostFlow;
 
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Set\Edges;
 use Graphp\Algorithms\DetectNegativeCycle;
 use Graphp\Algorithms\MaxFlow\EdmondsKarp as MaxFlowEdmondsKarp;
 use Graphp\Algorithms\ResidualGraph;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Set\Edges;
 
 class CycleCanceling extends Base
 {
@@ -29,12 +29,12 @@ public function createGraph()
 
             if ($balance > 0) {
                 // positive balance => source capacity
-                $superSource->createEdgeTo($vertex)->setCapacity($balance);
+                $resultGraph->createEdgeDirected($superSource, $vertex)->setCapacity($balance);
 
                 $sumBalance += $balance;
             } elseif ($balance < 0) {
                 // negative balance => sink capacity (positive)
-                $vertex->createEdgeTo($superSink)->setCapacity(-$balance);
+                $resultGraph->createEdgeDirected($vertex, $superSink)->setCapacity(-$balance);
             }
         }
 

src/MinimumCostFlow/SuccessiveShortestPath.php

@@ -2,15 +2,15 @@
 
 namespace Graphp\Algorithms\MinimumCostFlow;
 
-use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Exception\UnderflowException;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
-use Fhaculty\Graph\Vertex;
 use Graphp\Algorithms\ResidualGraph;
 use Graphp\Algorithms\ShortestPath\MooreBellmanFord as SpMooreBellmanFord;
 use Graphp\Algorithms\Search\BreadthFirst as SearchBreadthFirst;
+use Graphp\Graph\EdgeDirected;
+use Graphp\Graph\Exception\UnderflowException;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
+use Graphp\Graph\Vertex;
 
 class SuccessiveShortestPath extends Base
 {

src/MinimumSpanningTree/Base.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms\MinimumSpanningTree;
 
-use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
 use Graphp\Algorithms\Base as AlgorithmBase;
+use Graphp\Graph\Edge;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
 use SplPriorityQueue;
 
 /**

src/MinimumSpanningTree/Kruskal.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms\MinimumSpanningTree;
 
-use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
+use Graphp\Graph\Edge;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
+use Graphp\Graph\Set\Edges;
 use SplPriorityQueue;
 
 class Kruskal extends Base

src/MinimumSpanningTree/Prim.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms\MinimumSpanningTree;
 
-use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Set\Edges;
-use Fhaculty\Graph\Vertex;
+use Graphp\Graph\Edge;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Set\Edges;
+use Graphp\Graph\Vertex;
 use SplPriorityQueue;
 
 class Prim extends Base

src/Parallel.php

@@ -2,10 +2,9 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Edge\Directed as DirectedEdge;
-use Fhaculty\Graph\Set\Edges;
-use LogicException;
+use Graphp\Graph\Edge;
+use Graphp\Graph\EdgeDirected as EdgeDirected;
+use Graphp\Graph\Set\Edges;
 
 /**
  * Basic algorithms for working with parallel edges
@@ -52,11 +51,10 @@ public function hasEdgeParallelEdge(Edge $edge)
      *
      * @param Edge $edge
      * @return Edges
-     * @throws LogicException
      */
     public function getEdgesParallelEdge(Edge $edge)
     {
-        if ($edge instanceof DirectedEdge) {
+        if ($edge instanceof EdgeDirected) {
             // get all edges between this edge's endpoints
             $edges = $edge->getVertexStart()->getEdgesTo($edge->getVertexEnd())->getVector();
         } else {

src/Property/WalkProperty.php

@@ -2,9 +2,9 @@
 
 namespace Graphp\Algorithms\Property;
 
-use Fhaculty\Graph\Walk;
 use Graphp\Algorithms\Base as BaseAlgorithm;
 use Graphp\Algorithms\Loop as AlgorithmLoop;
+use Graphp\Graph\Walk;
 
 /**
  * Simple algorithms for working with Walk properties

src/ResidualGraph.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms;
 
-use Fhaculty\Graph\Edge\Base as Edge;
-use Fhaculty\Graph\Edge\Directed as EdgeDirected;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Graph;
+use Graphp\Graph\Edge;
+use Graphp\Graph\EdgeDirected;
+use Graphp\Graph\Exception\UnexpectedValueException;
+use Graphp\Graph\Graph;
 
 class ResidualGraph extends BaseGraph
 {

src/Search/Base.php

@@ -2,10 +2,10 @@
 
 namespace Graphp\Algorithms\Search;
 
-use Fhaculty\Graph\Exception\InvalidArgumentException;
-use Fhaculty\Graph\Set\Vertices;
-use Fhaculty\Graph\Vertex;
 use Graphp\Algorithms\BaseVertex;
+use Graphp\Graph\Exception\InvalidArgumentException;
+use Graphp\Graph\Set\Vertices;
+use Graphp\Graph\Vertex;
 
 abstract class Base extends BaseVertex
 {