letournel / path-finder

src/Algorithms/ShortestPath/Dijkstra.php

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
     
     public function computePath(Node $source, Node $target)
     {
-        if(! $this->grid instanceof NodeGrid)
+        if (!$this->grid instanceof NodeGrid)
         {
             throw new \RuntimeException('Invalid Grid');
         }
@@ -52,20 +52,20 @@ 
         $priorityQueue->insert($source, 0);
         $distanceMap->insert($source, 0);
         
-        while(! $priorityQueue->isEmpty())
+        while (!$priorityQueue->isEmpty())
         {
             $node = $priorityQueue->extract();
             
-            if($node->getId() === $target->getId())
+            if ($node->getId() === $target->getId())
             {
                 return new NodePath($previousMap->lookupFrom($node));
             }
             
             $neighbors = $this->grid->getWalkableNeighbors($node);
-            foreach($neighbors as $neighbor)
+            foreach ($neighbors as $neighbor)
             {
                 $alternativeDistance = $distanceMap->lookup($node) + $this->distance->compute($node, $neighbor);
-                if(! $distanceMap->exists($neighbor) || $alternativeDistance < $distanceMap->lookup($neighbor))
+                if (!$distanceMap->exists($neighbor) || $alternativeDistance < $distanceMap->lookup($neighbor))
                 {
                     $priorityQueue->insert($neighbor, $alternativeDistance);
                     $distanceMap->insert($neighbor, $alternativeDistance);

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);
             }

Braces +2 added lines, -4 removed lines

@@ -81,12 +81,10 @@
             if ($key === $iKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($kKey);
-            }
-            elseif($key === $kKey)
+            } elseif($key === $kKey)
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($iKey);
-            }
-            else
+            } else
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($key);
             }

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);
             }

Braces +3 added lines, -6 removed lines

@@ -84,16 +84,13 @@
             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);
-            }
-            else
+            } else
             {
                 $newRouteNodes[] = $this->existingRoute->getKey($key);
             }