letournel / path-finder

src/Algorithms/TravelingSalesman/NearestNeighbour.php

Spacing +5 added lines, -5 removed lines

@@ -24,13 +24,13 @@ 
     
     public function computeRoute()
     {
-        if(! $this->graph instanceof NodeGraph)
+        if (!$this->graph instanceof NodeGraph)
         {
             throw new \RuntimeException('Invalid Graph');
         }
         
         $vertexes = $this->graph->getVertexes();
-        if(count($vertexes) <= 2)
+        if (count($vertexes) <= 2)
         {
             return new NodePath($vertexes);
         }
@@ -40,15 +40,15 @@ 
         
         $pathMap = new NodeMap();
         $pathMap->insert($vertexFrom, $vertexTo);
-        while(! empty($vertexes))
+        while (!empty($vertexes))
         {
             $minimalVertexTo = null;
             $minimalEdge = INF;
             $edges = $this->graph->getEdgesFrom($vertexFrom);
-            foreach($edges as $vertexToId => $edge)
+            foreach ($edges as $vertexToId => $edge)
             {
                 $vertexTo = $this->graph->getVertex($vertexToId);
-                if(! $pathMap->exists($vertexTo) && $edge < $minimalEdge)
+                if (!$pathMap->exists($vertexTo) && $edge < $minimalEdge)
                 {
                     $minimalVertexTo = $vertexTo;
                     $minimalEdge = $edge;

src/Algorithms/TravelingSalesman/TwoOpt.php

Spacing +10 added lines, -10 removed lines

@@ -30,15 +30,15 @@ 
     
     public function computeRoute()
     {
-        if(! $this->graph instanceof NodeGraph)
+        if (!$this->graph instanceof NodeGraph)
         {
             throw new \RuntimeException('Invalid Graph');
         }
-        if(! $this->existingRoute instanceof NodePath)
+        if (!$this->existingRoute instanceof NodePath)
         {
             throw new \RuntimeException('Invalid ExistingRoute');
         }
-        if(count($this->existingRoute) < 2)
+        if (count($this->existingRoute) < 2)
         {
             return $this->existingRoute;
         }
@@ -48,17 +48,17 @@ 
         do
         {
             $improvementMade = false;
-            foreach($this->existingRoute->getKeys() as $iKey)
+            foreach ($this->existingRoute->getKeys() as $iKey)
             {
-                foreach($this->existingRoute->getKeys() as $kKey)
+                foreach ($this->existingRoute->getKeys() as $kKey)
                 {
-                    if($iKey == $kKey)
+                    if ($iKey == $kKey)
                     {
                         continue;
                     }
                     $newRoute = $this->twoOptSwap($iKey, $kKey);
                     $newDistance = $this->graph->computeLength($newRoute);
-                    if($newDistance < $existingDistance)
+                    if ($newDistance < $existingDistance)
                     {
                         $this->existingRoute = $newRoute;
                         $existingDistance = $newDistance;
@@ -68,7 +68,7 @@ 
                     }
                 }
             }
-        } while($improvementMade);
+        } while ($improvementMade);
         
         return $this->existingRoute;
     }
@@ -76,13 +76,13 @@ 
     private function twoOptSwap($iKey, $kKey)
     {
         $newRouteNodes = array();
-        foreach($this->existingRoute->getKeys() as $key)
+        foreach ($this->existingRoute->getKeys() as $key)
         {
             if ($key === $iKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($kKey);
             }
-            elseif($key === $kKey)
+            elseif ($key === $kKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($iKey);
             }

src/Algorithms/TravelingSalesman/ThreeOpt.php

Spacing +12 added lines, -12 removed lines

@@ -30,15 +30,15 @@ 
     
     public function computeRoute()
     {
-        if(! $this->graph instanceof NodeGraph)
+        if (!$this->graph instanceof NodeGraph)
         {
             throw new \RuntimeException('Invalid Graph');
         }
-        if(! $this->existingRoute instanceof NodePath)
+        if (!$this->existingRoute instanceof NodePath)
         {
             throw new \RuntimeException('Invalid ExistingRoute');
         }
-        if(count($this->existingRoute) < 3)
+        if (count($this->existingRoute) < 3)
         {
             return $this->existingRoute;
         }
@@ -48,19 +48,19 @@ 
         do
         {
             $improvementMade = false;
-            foreach($this->existingRoute->getKeys() as $iKey)
+            foreach ($this->existingRoute->getKeys() as $iKey)
             {
-                foreach($this->existingRoute->getKeys() as $jKey)
+                foreach ($this->existingRoute->getKeys() as $jKey)
                 {
-                    foreach($this->existingRoute->getKeys() as $kKey)
+                    foreach ($this->existingRoute->getKeys() as $kKey)
                     {
-                        if($iKey == $jKey || $iKey == $kKey || $jKey == $kKey)
+                        if ($iKey == $jKey || $iKey == $kKey || $jKey == $kKey)
                         {
                             continue;
                         }
                         $newRoute = $this->threeOptSwap($iKey, $jKey, $kKey);
                         $newDistance = $this->graph->computeLength($newRoute);
-                        if($newDistance < $existingDistance)
+                        if ($newDistance < $existingDistance)
                         {
                             $this->existingRoute = $newRoute;
                             $existingDistance = $newDistance;
@@ -71,7 +71,7 @@ 
                     }
                 }
             }
-        } while($improvementMade);
+        } while ($improvementMade);
         
         return $this->existingRoute;
     }
@@ -79,17 +79,17 @@ 
     private function threeOptSwap($iKey, $jKey, $kKey)
     {
         $newRouteNodes = array();
-        foreach($this->existingRoute->getKeys() as $key)
+        foreach ($this->existingRoute->getKeys() as $key)
         {
             if ($key === $iKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($kKey);
             }
-            elseif($key === $jKey)
+            elseif ($key === $jKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($iKey);
             }
-            elseif($key === $kKey)
+            elseif ($key === $kKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($jKey);
             }

src/Converters/Grid/ASCIISyntax.php

Spacing +24 added lines, -24 removed lines

@@ -20,9 +20,9 @@ 
     {
         $matrix = $this->convertToMatrix($syntax);
         
-        foreach($matrix as $x => $line)
+        foreach ($matrix as $x => $line)
         {
-            foreach($line as $y => $char)
+            foreach ($line as $y => $char)
             {
                 $matrix[$x][$y] = ($char !== self::WALL) ? 1 : 0;
             }
@@ -35,7 +35,7 @@ 
     {
         $matrix = array_filter(explode("\n", $syntax));
         
-        foreach($matrix as $key => $line)
+        foreach ($matrix as $key => $line)
         {
             $matrix[$key] = array_filter(str_split($line));
         }
@@ -48,9 +48,9 @@ 
         $syntax = '';
         
         $nodes = $grid->getNodes();
-        foreach($nodes as $line)
+        foreach ($nodes as $line)
         {
-            foreach($line as $node)
+            foreach ($line as $node)
             {
                 $syntax .= ($node->isWalkable() ? self::FREE : self::WALL);
             }
@@ -65,23 +65,23 @@ 
         $syntax = '';
         
         $nodes = $grid->getNodes();
-        foreach($nodes as $line)
+        foreach ($nodes as $line)
         {
-            foreach($line as $node)
+            foreach ($line as $node)
             {
-                if(! $node->isWalkable())
+                if (!$node->isWalkable())
                 {
                     $syntax .= self::WALL;
                 }
-                elseif($node->toString() == $path->getStartNode()->toString())
+                elseif ($node->toString() == $path->getStartNode()->toString())
                 {
                     $syntax .= self::IN;
                 }
-                elseif($node->toString() == $path->getEndNode()->toString())
+                elseif ($node->toString() == $path->getEndNode()->toString())
                 {
                     $syntax .= self::OUT;
                 }
-                elseif($path->contains($node))
+                elseif ($path->contains($node))
                 {
                     $syntax .= self::STEP;
                 }
@@ -99,12 +99,12 @@ 
     public function findAndCreateNode($syntax, $charToFind)
     {
         $xCount = count($syntax);
-        for($x = 0; $x < $xCount; $x++)
+        for ($x = 0; $x < $xCount; $x++)
         {
             $yCount = count($syntax[$x]);
-            for($y = 0; $y < $yCount; $y++)
+            for ($y = 0; $y < $yCount; $y++)
             {
-                if($syntax[$x][$y] === $charToFind)
+                if ($syntax[$x][$y] === $charToFind)
                 {
                     return new Node($x, $y);
                 }
@@ -116,12 +116,12 @@ 
     {
         $nodes = array();
         $xCount = count($syntax);
-        for($x = 0; $x < $xCount; $x++)
+        for ($x = 0; $x < $xCount; $x++)
         {
             $yCount = count($syntax[$x]);
-            for($y = 0; $y < $yCount; $y++)
+            for ($y = 0; $y < $yCount; $y++)
             {
-                if($syntax[$x][$y] === $charToFind)
+                if ($syntax[$x][$y] === $charToFind)
                 {
                     $nodes[] = new Node($x, $y);
                 }
@@ -135,32 +135,32 @@ 
     {
         $deltas = array(
             array(-1, -1), array(-1, +0), array(-1, +1),
-            array(+0, -1),                array(+0, +1),
+            array(+0, -1), array(+0, +1),
             array(+1, -1), array(+1, +0), array(+1, +1),
         );
         
         $node = $this->findAndCreateNode($matrix, self::IN);
         $target = $this->findAndCreateNode($matrix, self::OUT);
         $path = array($node);
-        while($node->getId() !== $target->getId())
+        while ($node->getId() !== $target->getId())
         {
             $newNode = null;
-            foreach($deltas as $delta)
+            foreach ($deltas as $delta)
             {
                 $x = $node->getX() + $delta[0];
                 $y = $node->getY() + $delta[1];
                 
-                if(! array_key_exists($x, $matrix))
+                if (!array_key_exists($x, $matrix))
                 {
                     continue;
                 }
                 
-                if(! array_key_exists($y, $matrix[$x]))
+                if (!array_key_exists($y, $matrix[$x]))
                 {
                     continue;
                 }
                 
-                if($matrix[$x][$y] === self::STEP || $matrix[$x][$y] === self::OUT)
+                if ($matrix[$x][$y] === self::STEP || $matrix[$x][$y] === self::OUT)
                 {
                     $matrix[$x][$y] = self::FREE;
                     $newNode = new Node($x, $y);
@@ -168,7 +168,7 @@ 
                 }
             }
             
-            if(! $newNode instanceof Node)
+            if (!$newNode instanceof Node)
             {
                 throw new \RuntimeException('Path is not continous in the grid');
             }