Create edges via Graph

Refs graphp/graph#175

Author: clue

README.md

@@ -40,7 +40,7 @@ $blue->setAttribute('graphviz.color', 'blue');
 $red = $graph->createVertex('red');
 $red->setAttribute('graphviz.color', 'red');
 
-$edge = $blue->createEdgeTo($red);
+$edge = $graph->createEdgeDirected($blue, $red);
 $edge->setAttribute('graphviz.color', 'grey');
 
 $graphviz = new Graphp\GraphViz\GraphViz();
@@ -92,7 +92,7 @@ $graph->setAttribute('graphviz.graph.rankdir', 'LR');
 
 $hello = $graph->createVertex('hello');
 $world = $graph->createVertex('wörld');
-$hello->createEdgeTo($world);
+$graph->createEdgeDirected($hello, $world);
 ```
 
 ![html graph example](examples/02-html.png)
@@ -164,7 +164,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$blue = $a->createEdgeTo($b);
+$blue = $graph->createEdgeDirected($a, $b);
 $blue->setAttribute('graphviz.color', 'blue');
 ```
 
@@ -179,7 +179,7 @@ $graph->setAttribute('graphviz.edge.color', 'grey');
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$grey = $a->createEdgeTo($b);
+$grey = $graph->createEdgeDirected($a, $b);
 ```
 
 These default attributes can be overriden on each edge instance by explicitly
@@ -192,7 +192,7 @@ $graph->setAttribute('graphviz.edge.color', 'grey');
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$blue = $a->createEdgeTo($b);
+$blue = $graph->createEdgeDirected($a, $b);
 $blue->setAttribute('graphviz.color', 'blue');
 ```
 
@@ -244,7 +244,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 ```
 
 If you assign an edge flow, capacity or weight, this library will automatically
@@ -257,7 +257,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setWeight(100);
 ```
 
@@ -270,7 +270,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setFlow(4);
 $edge->setCapacity(10);
 ```
@@ -284,7 +284,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setFlow(4);
 $edge->setCapacity(null);
 $edge->setWeight(100);
@@ -300,7 +300,7 @@ $graph = new Graphp\Graph\Graph();
 $a = $graph->createVertex('a');
 $b = $graph->createVertex('b');
 
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setAttribute('graphviz.label', 'important');
 ```
 
@@ -329,7 +329,7 @@ $a->setAttribute('graphviz.label', GraphViz::raw('<
 </table>>'));
 
 $b = $graph->createVertex('Block');
-$b->createEdgeTo($a);
+$graph->createEdgeDirected($b, $a);
 $b->setAttribute('graphviz.shape', 'none');
 $b->setAttribute('graphviz.label', GraphViz::raw('<
 <table cellspacing="0" border="0" cellborder="1">
@@ -368,7 +368,7 @@ $b->setAttribute('graphviz.shape', 'Mrecord');
 $b->setAttribute('graphviz.label', GraphViz::raw('"<f0> left |<f1> middle |<right> right"'));
 
 // a:middle -> b:right
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setAttribute('graphviz.tailport', 'middle');
 $edge->setAttribute('graphviz.headport', 'right');
 ```

composer.json

@@ -10,7 +10,7 @@
     },
     "require": {
         "php": ">=5.3.0",
-        "graphp/graph": "dev-master#9b4ff as 1.0.0"
+        "graphp/graph": "dev-master#9ce805c as 1.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"

examples/01-simple.php

@@ -10,6 +10,7 @@
 $red = $graph->createVertex('red');
 $red->setAttribute('graphviz.color', 'red');
 
+$edge = $graph->createEdgeDirected($blue, $red);
 $edge = $blue->createEdgeTo($red);
 $edge->setAttribute('graphviz.color', 'grey');
 

examples/02-html.php

@@ -9,7 +9,7 @@
 
 $hello = $graph->createVertex('hello');
 $world = $graph->createVertex('wörld');
-$hello->createEdgeTo($world);
+$graph->createEdgeDirected($hello, $world);
 
 $graphviz = new Graphp\GraphViz\GraphViz();
 $graphviz->setFormat('svg');

examples/11-uml-html.php

@@ -16,7 +16,7 @@
 </table>>'));
 
 $b = $graph->createVertex('Block');
-$b->createEdgeTo($a);
+$graph->createEdgeDirected($b, $a);
 $b->setAttribute('graphviz.shape', 'none');
 $b->setAttribute('graphviz.label', GraphViz::raw('<
 <table cellspacing="0" border="0" cellborder="1">

examples/12-uml-records.php

@@ -11,7 +11,7 @@
 $a->setAttribute('graphviz.label', GraphViz::raw('"{\N||+ touch()}"'));
 
 $b = $graph->createVertex('Block');
-$b->createEdgeTo($a);
+$graph->createEdgeDirected($b, $a);
 $b->setAttribute('graphviz.shape', 'record');
 $b->setAttribute('graphviz.label', GraphViz::raw('"{\N|- size:int|+ touch()}"'));
 

examples/13-record-ports.php

@@ -15,7 +15,7 @@
 $b->setAttribute('graphviz.label', GraphViz::raw('"<f0> left |<f1> middle |<right> right"'));
 
 // a:middle -> b:right
-$edge = $a->createEdgeTo($b);
+$edge = $graph->createEdgeDirected($a, $b);
 $edge->setAttribute('graphviz.tailport', 'middle');
 $edge->setAttribute('graphviz.headport', 'right');
 

tests/GraphVizTest.php

@@ -156,7 +156,7 @@ public function testGraphWithSimpleEdgeUsesGraphWithSimpleEdgeDefinition()
     {
         // a -- b
         $graph = new Graph();
-        $graph->createVertex('a')->createEdge($graph->createVertex('b'));
+        $graph->createEdgeUndirected($graph->createVertex('a'), $graph->createVertex('b'));
 
         $expected = <<<VIZ
 graph {
@@ -174,8 +174,8 @@ public function testGraphWithLoopUsesGraphWithSimpleLoopDefinition()
         //      |  |
         //      \--/
         $graph = new Graph();
-        $graph->createVertex('a')->createEdge($graph->createVertex('b'));
-        $graph->getVertex('b')->createEdge($graph->getVertex('b'));
+        $graph->createEdgeUndirected($graph->createVertex('a'), $graph->createVertex('b'));
+        $graph->createEdgeUndirected($graph->getVertex('b'), $graph->getVertex('b'));
 
         $expected = <<<VIZ
 graph {
@@ -190,8 +190,9 @@ public function testGraphWithLoopUsesGraphWithSimpleLoopDefinition()
 
     public function testGraphDirectedUsesDigraph()
     {
+        // a -> b
         $graph = new Graph();
-        $graph->createVertex('a')->createEdgeTo($graph->createVertex('b'));
+        $graph->createEdgeDirected($graph->createVertex('a'), $graph->createVertex('b'));
 
         $expected = <<<VIZ
 digraph {
@@ -209,8 +210,8 @@ public function testGraphDirectedWithLoopUsesDigraphWithSimpleLoopDefinition()
         //      ^  |
         //      \--/
         $graph = new Graph();
-        $graph->createVertex('a')->createEdgeTo($graph->createVertex('b'));
-        $graph->getVertex('b')->createEdgeTo($graph->getVertex('b'));
+        $graph->createEdgeDirected($graph->createVertex('a'), $graph->createVertex('b'));
+        $graph->createEdgeDirected($graph->getVertex('b'), $graph->getVertex('b'));
 
         $expected = <<<VIZ
 digraph {
@@ -227,8 +228,8 @@ public function testGraphMixedUsesDigraphWithExplicitDirectionNoneForUndirectedE
     {
         // a -> b -- c
         $graph = new Graph();
-        $graph->createVertex('a')->createEdgeTo($graph->createVertex('b'));
-        $graph->createVertex('c')->createEdge($graph->getVertex('b'));
+        $graph->createEdgeDirected($graph->createVertex('a'), $graph->createVertex('b'));
+        $graph->createEdgeUndirected($graph->createVertex('c'), $graph->getVertex('b'));
 
         $expected = <<<VIZ
 digraph {
@@ -247,8 +248,8 @@ public function testGraphMixedWithDirectedLoopUsesDigraphWithoutDirectionForDire
         //      ^  |
         //      \--/
         $graph = new Graph();
-        $graph->createVertex('a')->createEdge($graph->createVertex('b'));
-        $graph->getVertex('b')->createEdgeTo($graph->getVertex('b'));
+        $graph->createEdgeUndirected($graph->createVertex('a'), $graph->createVertex('b'));
+        $graph->createEdgeDirected($graph->getVertex('b'), $graph->getVertex('b'));
 
         $expected = <<<VIZ
 digraph {
@@ -266,8 +267,8 @@ public function testGraphUndirectedWithIsolatedVerticesFirst()
         // a -- b -- c   d
         $graph = new Graph();
         $graph->createVertices(array('a', 'b', 'c', 'd'));
-        $graph->getVertex('a')->createEdge($graph->getVertex('b'));
-        $graph->getVertex('b')->createEdge($graph->getVertex('c'));
+        $graph->createEdgeUndirected($graph->getVertex('a'), $graph->getVertex('b'));
+        $graph->createEdgeUndirected($graph->getVertex('b'), $graph->getVertex('c'));
 
         $expected = <<<VIZ
 graph {
@@ -307,11 +308,11 @@ public function testVertexLabels()
     public function testEdgeLayoutAtributes()
     {
         $graph = new Graph();
-        $graph->createVertex('1a')->createEdge($graph->createVertex('1b'));
-        $graph->createVertex('2a')->createEdge($graph->createVertex('2b'))->setAttribute('graphviz.numeric', 20);
-        $graph->createVertex('3a')->createEdge($graph->createVertex('3b'))->setAttribute('graphviz.textual', "forty");
-        $graph->createVertex('4a')->createEdge($graph->createVertex('4b'))->getAttributeBag()->setAttributes(array('graphviz.1' => 1, 'graphviz.2' => 2));
-        $graph->createVertex('5a')->createEdge($graph->createVertex('5b'))->getAttributeBag()->setAttributes(array('graphviz.a' => 'b', 'graphviz.c' => 'd'));
+        $graph->createEdgeUndirected($graph->createVertex('1a'), $graph->createVertex('1b'));
+        $graph->createEdgeUndirected($graph->createVertex('2a'), $graph->createVertex('2b'))->setAttribute('graphviz.numeric', 20);
+        $graph->createEdgeUndirected($graph->createVertex('3a'), $graph->createVertex('3b'))->setAttribute('graphviz.textual', "forty");
+        $graph->createEdgeUndirected($graph->createVertex('4a'), $graph->createVertex('4b'))->getAttributeBag()->setAttributes(array('graphviz.1' => 1, 'graphviz.2' => 2));
+        $graph->createEdgeUndirected($graph->createVertex('5a'), $graph->createVertex('5b'))->getAttributeBag()->setAttributes(array('graphviz.a' => 'b', 'graphviz.c' => 'd'));
 
         $expected = <<<VIZ
 graph {
@@ -330,13 +331,13 @@ public function testEdgeLayoutAtributes()
     public function testEdgeLabels()
     {
         $graph = new Graph();
-        $graph->createVertex('1a')->createEdge($graph->createVertex('1b'));
-        $graph->createVertex('2a')->createEdge($graph->createVertex('2b'))->setWeight(20);
-        $graph->createVertex('3a')->createEdge($graph->createVertex('3b'))->setCapacity(30);
-        $graph->createVertex('4a')->createEdge($graph->createVertex('4b'))->setFlow(40);
-        $graph->createVertex('5a')->createEdge($graph->createVertex('5b'))->setFlow(50)->setCapacity(60);
-        $graph->createVertex('6a')->createEdge($graph->createVertex('6b'))->setFlow(60)->setCapacity(70)->setWeight(80);
-        $graph->createVertex('7a')->createEdge($graph->createVertex('7b'))->setFlow(70)->setAttribute('graphviz.label', 'prefixed');
+        $graph->createEdgeUndirected($graph->createVertex('1a'), $graph->createVertex('1b'));
+        $graph->createEdgeUndirected($graph->createVertex('2a'), $graph->createVertex('2b'))->setWeight(20);
+        $graph->createEdgeUndirected($graph->createVertex('3a'), $graph->createVertex('3b'))->setCapacity(30);
+        $graph->createEdgeUndirected($graph->createVertex('4a'), $graph->createVertex('4b'))->setFlow(40);
+        $graph->createEdgeUndirected($graph->createVertex('5a'), $graph->createVertex('5b'))->setFlow(50)->setCapacity(60);
+        $graph->createEdgeUndirected($graph->createVertex('6a'), $graph->createVertex('6b'))->setFlow(60)->setCapacity(70)->setWeight(80);
+        $graph->createEdgeUndirected($graph->createVertex('7a'), $graph->createVertex('7b'))->setFlow(70)->setAttribute('graphviz.label', 'prefixed');
 
         $expected = <<<VIZ
 graph {