Merge branch 'master' into improve-minimumspanningtree

Author: clue

CHANGELOG.md

@@ -42,7 +42,7 @@ Looking for more example scripts? Check out [flos/graph-php](https://github.com/
 
 This library is built around the concept of [mathematical graph theory](http://en.wikipedia.org/wiki/Graph_%28mathematics%29) (i.e. it is **not** a [charting](http://en.wikipedia.org/wiki/Chart) library for drawing a [graph of a function](http://en.wikipedia.org/wiki/Graph_of_a_function)). In essence, a graph is a set of *nodes* with any number of *connections* inbetween. In graph theory, [vertices](http://en.wikipedia.org/wiki/Vertex_%28graph_theory%29) (plural of vertex) are an abstract representation of these *nodes*, while *connections* are represented as *edges*. Edges may be either undirected ("two-way") or directed ("one-way", aka di-edges, arcs).
 
-Depending no how the edges are constructed, the whole graph can either be undirected, can be a [directed graph](http://en.wikipedia.org/wiki/Directed_graph) (aka digraph) or be a [mixed graph](http://en.wikipedia.org/wiki/Simple_graph#Mixed_graph). Edges are also allowed to form [loops](http://en.wikipedia.org/wiki/Loop_%28graph_theory%29) (i.e. an edge from vertex A pointing to vertex A again). Also, [multiple edges](http://en.wikipedia.org/wiki/Multiple_edges) from vertex A to vertex B  are supported as well (aka parallel edges), effectively forming a [multigraph](http://en.wikipedia.org/wiki/Multigraph) (aka pseudograph). And of course, any combination thereof is supported as well. While many authors try to differentiate between these core concepts, this library tries hard to not impose any artificial limitations or assumptions on your graphs.
+Depending on how the edges are constructed, the whole graph can either be undirected, can be a [directed graph](http://en.wikipedia.org/wiki/Directed_graph) (aka digraph) or be a [mixed graph](http://en.wikipedia.org/wiki/Simple_graph#Mixed_graph). Edges are also allowed to form [loops](http://en.wikipedia.org/wiki/Loop_%28graph_theory%29) (i.e. an edge from vertex A pointing to vertex A again). Also, [multiple edges](http://en.wikipedia.org/wiki/Multiple_edges) from vertex A to vertex B  are supported as well (aka parallel edges), effectively forming a [multigraph](http://en.wikipedia.org/wiki/Multigraph) (aka pseudograph). And of course, any combination thereof is supported as well. While many authors try to differentiate between these core concepts, this library tries hard to not impose any artificial limitations or assumptions on your graphs.
 
 ### Graph drawing
 

README.md

@@ -11,6 +11,7 @@
 use Fhaculty\Graph\Algorithm\MaxFlow\EdmondsKarp as MaxFlowEdmondsKarp;
 use Fhaculty\Graph\Algorithm\Groups;
 use Fhaculty\Graph\Exception;
+use Fhaculty\Graph\Set\Edges;
 
 class Flow extends Base
 {
@@ -81,6 +82,6 @@ public function getEdges()
             }
         }
 
-        return $returnEdges;
+        return new Edges($returnEdges);
     }
 }

lib/Fhaculty/Graph/Algorithm/MaximumMatching/Flow.php

@@ -8,24 +8,24 @@
 class Image implements ExporterInterface
 {
     private $format = 'png';
-    
+
     public function getOutput(Graph $graph)
     {
         $graphviz = new GraphViz($graph);
         $graphviz->setFormat($this->format);
         return $graphviz->createImageData();
     }
-    
+
     /**
      * set the image output format to use
-     * 
+     *
      * @param string $type png, svg
      * @return self $this (chainable)
      * @see GraphViz::setFormat()
      */
     public function setFormat($type)
     {
-        $this->type = $type;
+        $this->format = $type;
         return $this;
     }
 }

lib/Fhaculty/Graph/Exporter/Image.php

@@ -135,10 +135,12 @@ public function display()
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             echo "ausgabe\n";
             exec($tmp . ' >NUL');
+        } elseif (strtoupper(PHP_OS) === 'DARWIN') {
+            // open image in background (redirect stdout to /dev/null, sterr to stdout and run in background)
+            exec('open ' . escapeshellarg($tmp) . ' > /dev/null 2>&1 &');
         } else {
             // open image in background (redirect stdout to /dev/null, sterr to stdout and run in background)
             exec('xdg-open ' . escapeshellarg($tmp) . ' > /dev/null 2>&1 &');
-
         }
 
         $next = microtime(true) + self::DELAY_OPEN;

lib/Fhaculty/Graph/GraphViz.php

@@ -30,7 +30,7 @@ public function testSingleEdge()
         // correct number of edges
         $this->assertEquals(1, $alg->getNumberOfMatches());
         // actual edge instance returned
-        $this->assertEquals(array($edge), $alg->getEdges());
+        $this->assertEquals(array($edge), $alg->getEdges()->getVector());
 
         // check
         $flowgraph = $alg->createGraph();