Merge pull request #39 from clue-labs/no-algorithms

Remove unneeded dependency on graphp/algorithms

Author: clue

composer.json

@@ -10,8 +10,7 @@
     },
     "require": {
         "php": ">=5.3.0",
-        "clue/graph": "~0.9.0|~0.8.0",
-        "graphp/algorithms": "~0.8.0"
+        "clue/graph": "~0.9.0|~0.8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"

src/GraphViz.php

@@ -2,13 +2,10 @@
 
 namespace Graphp\GraphViz;
 
-use Graphp\Algorithms\Directed;
-use Graphp\Algorithms\Groups;
-use Graphp\Algorithms\Degree;
-use Fhaculty\Graph\Exception\UnexpectedValueException;
-use Fhaculty\Graph\Edge\Base as Edge;
-use \stdClass;
 use Fhaculty\Graph\Attribute\AttributeBagNamespaced;
+use Fhaculty\Graph\Edge\Base as Edge;
+use Fhaculty\Graph\Edge\Directed as EdgeDirected;
+use Fhaculty\Graph\Exception\UnexpectedValueException;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 
@@ -225,8 +222,13 @@ public function createImageFile(Graph $graph)
      */
     public function createScript(Graph $graph)
     {
-        $alg = new Directed($graph);
-        $directed = $alg->hasDirected();
+        $directed = false;
+        foreach ($graph->getEdges() as $edge) {
+            if ($edge instanceof EdgeDirected) {
+                $directed = true;
+                break;
+            }
+        }
 
         /*
          * The website [http://www.graphviz.org/content/dot-language] uses the term `ID` when displaying
@@ -255,39 +257,38 @@ public function createScript(Graph $graph)
             }
         }
 
-        $alg = new Groups($graph);
-        // only append group number to vertex label if there are at least 2 different groups
-        $showGroups = ($alg->getNumberOfGroups() > 1);
+        $groups = array();
+        foreach ($graph->getVertices()->getMap() as $vid => $vertex) {
+            $groups[$vertex->getGroup()][$vid] = $vertex;
+        }
 
-        if ($showGroups) {
-            $gid = 0;
+        // only cluster vertices into groups if there are at least 2 different groups
+        if (count($groups) > 1) {
             $indent = str_repeat($this->formatIndent, 2);
             // put each group of vertices in a separate subgraph cluster
-            foreach ($alg->getGroups() as $group) {
-                $script .= $this->formatIndent . 'subgraph cluster_' . $gid++ . ' {' . self::EOL .
+            foreach ($groups as $group => $vertices) {
+                $script .= $this->formatIndent . 'subgraph cluster_' . $group . ' {' . self::EOL .
                            $indent . 'label = ' . $this->escape($group) . self::EOL;
-                foreach($alg->getVerticesGroup($group)->getMap() as $vid => $vertex) {
+                foreach ($vertices as $vid => $vertex) {
                     $layout = $this->getLayoutVertex($vertex);
 
                     $script .= $indent . $this->escapeId($vid);
-                    if($layout){
+                    if ($layout) {
                         $script .= ' ' . $this->escapeAttributes($layout);
                     }
                     $script .= self::EOL;
                 }
                 $script .= '  }' . self::EOL;
             }
         } else {
-            $alg = new Degree($graph);
-
             // explicitly add all isolated vertices (vertices with no edges) and vertices with special layout set
             // other vertices wil be added automatically due to below edge definitions
             foreach ($graph->getVertices()->getMap() as $vid => $vertex){
                 $layout = $this->getLayoutVertex($vertex);
 
-                if($layout || $alg->isVertexIsolated($vertex)){
+                if ($layout || $vertex->getEdges()->isEmpty()) {
                     $script .= $this->formatIndent . $this->escapeId($vid);
-                    if($layout){
+                    if ($layout) {
                         $script .= ' ' . $this->escapeAttributes($layout);
                     }
                     $script .= self::EOL;
@@ -337,7 +338,7 @@ private function escapeId($id)
     public static function escape($id)
     {
         // see raw()
-        if ($id instanceof stdClass && isset($id->string)) {
+        if ($id instanceof \stdClass && isset($id->string)) {
             return $id->string;
         }
         // see @link: There is no semantic difference between abc_2 and "abc_2"
@@ -377,7 +378,7 @@ private function escapeAttributes($attrs)
      * create a raw string representation, i.e. do NOT escape the given string when used in graphviz output
      *
      * @param  string   $string
-     * @return StdClass
+     * @return \stdClass
      * @see GraphViz::escape()
      */
     public static function raw($string)

tests/GraphVizTest.php

@@ -66,6 +66,29 @@ public function testGraphIsolatedVertices()
   "b"
 }
 
+VIZ;
+
+        $this->assertEquals($expected, $this->graphViz->createScript($graph));
+    }
+
+    public function testGraphIsolatedVerticesWithGroupsWillBeAddedToClusters()
+    {
+        $graph = new Graph();
+        $graph->createVertex('a')->setGroup(0);
+        $graph->createVertex('b')->setGroup(1)->setAttribute('graphviz.label', 'second');
+
+        $expected = <<<VIZ
+graph {
+  subgraph cluster_0 {
+    label = 0
+    "a"
+  }
+  subgraph cluster_1 {
+    label = 1
+    "b" [label="second"]
+  }
+}
+
 VIZ;
 
         $this->assertEquals($expected, $this->graphViz->createScript($graph));