From 01a24997547e0e209502c4df7a16a33a10941a06 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kondas Date: Sun, 1 May 2016 00:56:43 +0200 Subject: [PATCH] cs-fixer --- src/Phpml/Clustering/Clusterer.php | 5 ++--- src/Phpml/Clustering/DBSCAN.php | 30 ++++++++++++++------------- tests/Phpml/Clustering/DBSCANTest.php | 15 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Phpml/Clustering/Clusterer.php b/src/Phpml/Clustering/Clusterer.php index 760c996..8324b41 100644 --- a/src/Phpml/Clustering/Clusterer.php +++ b/src/Phpml/Clustering/Clusterer.php @@ -1,16 +1,15 @@ $sample) { - if(isset($visited[$index])) { + foreach ($samples as $index => $sample) { + if (isset($visited[$index])) { continue; } $visited[$index] = true; $regionSamples = $this->getSamplesInRegion($sample, $samples); - if(count($regionSamples) >= $this->minSamples) { + if (count($regionSamples) >= $this->minSamples) { $clusters[] = $this->expandCluster($regionSamples, $visited); } } @@ -70,11 +71,12 @@ class DBSCAN implements Clusterer * * @return array */ - private function getSamplesInRegion($localSample, $samples) { + private function getSamplesInRegion($localSample, $samples) + { $region = []; - foreach($samples as $index => $sample) { - if($this->distanceMetric->distance($localSample, $sample) < $this->epsilon) { + foreach ($samples as $index => $sample) { + if ($this->distanceMetric->distance($localSample, $sample) < $this->epsilon) { $region[$index] = $sample; } } @@ -88,14 +90,15 @@ class DBSCAN implements Clusterer * * @return array */ - private function expandCluster($samples, &$visited) { + private function expandCluster($samples, &$visited) + { $cluster = []; - foreach($samples as $index => $sample) { - if(!isset($visited[$index])) { + foreach ($samples as $index => $sample) { + if (!isset($visited[$index])) { $visited[$index] = true; $regionSamples = $this->getSamplesInRegion($sample, $samples); - if(count($regionSamples) > $this->minSamples) { + if (count($regionSamples) > $this->minSamples) { $cluster = array_merge($regionSamples, $cluster); } } @@ -105,5 +108,4 @@ class DBSCAN implements Clusterer return $cluster; } - } diff --git a/tests/Phpml/Clustering/DBSCANTest.php b/tests/Phpml/Clustering/DBSCANTest.php index 748b87a..5952636 100644 --- a/tests/Phpml/Clustering/DBSCANTest.php +++ b/tests/Phpml/Clustering/DBSCANTest.php @@ -1,5 +1,6 @@ assertEquals($clustered, $dbscan->cluster($samples)); } - }