Detach the right splos.

Fixes #13. Conflicts: src/Gliph/Graph/AdjacencyList.php src/Gliph/Graph/DirectedAdjacencyList.php src/Gliph/Graph/UndirectedAdjacencyList.php tests/Gliph/Graph/DirectedAdjacencyListTest.php tests/Gliph/Graph/UndirectedAdjacencyListTest.php
sdboyer · Aug 3, 2014 · db9e4b7 · db9e4b7
1 parent d66ae44
commit db9e4b7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 17 deletions.
diff --git a/src/Gliph/Graph/AdjacencyList.php b/src/Gliph/Graph/AdjacencyList.php
@@ -75,11 +75,11 @@ public function eachAdjacent($vertex, $callback) {
             throw new NonexistentVertexException('Vertex is not in graph; cannot iterate over its adjacent vertices.');
         }
 
-        foreach ($this->_getTraversableSplos($this->vertices[$vertex]) as $adjacent_vertex) {
+        $set = $this->_getTraversableSplos($this->vertices[$vertex]);
+        foreach ($set as $adjacent_vertex) {
             call_user_func($callback, $adjacent_vertex);
         }
-        $this->walking->detach($this->vertices[$vertex]);
-
+        $this->walking->detach($set);
         return $this;
     }
 
@@ -121,7 +121,7 @@ protected function fev($callback) {
             $outgoing = $set->getInfo();
             $callback($vertex, $outgoing);
         }
-        $this->walking->detach($this->vertices);
+        $this->walking->detach($set);
 
         return $this;
         }

diff --git a/src/Gliph/Graph/DirectedAdjacencyList.php b/src/Gliph/Graph/DirectedAdjacencyList.php
@@ -52,10 +52,11 @@ public function eachEdge($callback) {
         $edges = array();
         $that = $this;
         $this->fev(function ($from, $outgoing) use (&$edges, $that) {
-            foreach ($that->_getTraversableSplos($outgoing) as $to) {
+            $set = $that->_getTraversableSplos($outgoing);
+            foreach ($set as $to) {
                 $edges[] = array($from, $to);
             }
-            $that->_cleanupSplosTraversal($outgoing);
+            $that->_cleanupSplosTraversal($set);
         });
 
         foreach ($edges as $edge) {

diff --git a/src/Gliph/Graph/UndirectedAdjacencyList.php b/src/Gliph/Graph/UndirectedAdjacencyList.php
@@ -49,12 +49,13 @@ public function eachEdge($callback) {
         $complete = new \SplObjectStorage();
         $that = $this;
         $this->fev(function ($a, $adjacent) use (&$edges, &$complete, $that) {
-            foreach ($that->_getTraversableSplos($adjacent) as $b) {
+            $set = $that->_getTraversableSplos($adjacent);
+            foreach ($set as $b) {
                 if (!$complete->contains($b)) {
                     $edges[] = array($a, $b);
                 }
             }
-            $that->_cleanupSplosTraversal($adjacent);
+            $that->_cleanupSplosTraversal($set);
             $complete->attach($a);
         });
 

diff --git a/tests/Gliph/Graph/DirectedAdjacencyListTest.php b/tests/Gliph/Graph/DirectedAdjacencyListTest.php
@@ -65,8 +65,11 @@ public function testEachAdjacent() {
               $g->eachAdjacent($a, function($to) use (&$found) {
                     $found[] = $to;
                 });
+              $g->eachAdjacent($a, function($to) use (&$found) {
+                    $found[] = $to;
+                });
           });
-        $this->assertEquals(array($b, $b, $c, $c, $b, $c), $found);
+        $this->assertEquals(array($b, $b, $c, $b, $c, $c, $b, $c, $b, $c), $found);
     }
 
     /**
@@ -129,12 +132,19 @@ public function testEachEdge() {
               $g->eachEdge(function($edge) use (&$found) {
                     $found[] = $edge;
                 });
+              $g->eachEdge(function($edge) use (&$found) {
+                    $found[] = $edge;
+                });
           });
 
         $expected = array(
             array($a, $b),
             array($a, $b),
             array($a, $c),
+            array($a, $b),
+            array($a, $c),
+            array($a, $c),
+            array($a, $b),
             array($a, $c),
             array($a, $b),
             array($a, $c),

diff --git a/tests/Gliph/Graph/UndirectedAdjacencyListTest.php b/tests/Gliph/Graph/UndirectedAdjacencyListTest.php
@@ -69,9 +69,13 @@ public function testEachAdjacent() {
               $g->eachAdjacent($b, function($to) use (&$found) {
                     $found[] = $to;
                 });
+              $g->eachAdjacent($b, function($to) use (&$found) {
+                    $found[] = $to;
+                });
           });
 
-        $this->assertCount(6, $found);
+        $this->assertCount(10, $found);
+        $this->assertEquals(array($a, $a, $c, $a, $c, $c, $a, $c, $a, $c), $found);
     }
 
     /**
@@ -120,15 +124,25 @@ public function testEachEdge() {
               $g->eachEdge(function($edge) use (&$found) {
                     $found[] = $edge;
                 });
+              $g->eachEdge(function($edge) use (&$found) {
+                    $found[] = $edge;
+                });
           });
 
-        $this->assertCount(6, $found);
-        $this->assertEquals(array($a, $b), $found[0]);
-        $this->assertEquals(array($a, $b), $found[1]);
-        $this->assertEquals(array($b, $c), $found[2]);
-        $this->assertEquals(array($b, $c), $found[3]);
-        $this->assertEquals(array($a, $b), $found[4]);
-        $this->assertEquals(array($b, $c), $found[5]);
+        $this->assertCount(10, $found);
+        $expected = array(
+            array($a, $b),
+            array($a, $b),
+            array($b, $c),
+            array($a, $b),
+            array($b, $c),
+            array($b, $c),
+            array($a, $b),
+            array($b, $c),
+            array($a, $b),
+            array($b, $c),
+        );
+        $this->assertEquals($expected, $found);
     }
 
     /**