From cbdc0495266ff2adc042bf58c3489f772d298484 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kondas Date: Sun, 20 Nov 2016 22:53:17 +0100 Subject: [PATCH] Update php-cs-fixer --- CHANGELOG.md | 4 +++- src/Phpml/Association/Apriori.php | 2 +- src/Phpml/Association/Associator.php | 2 +- src/Phpml/Classification/Classifier.php | 2 +- src/Phpml/Classification/KNearestNeighbors.php | 2 +- src/Phpml/Classification/NaiveBayes.php | 2 +- src/Phpml/Classification/SVC.php | 2 +- src/Phpml/Clustering/Clusterer.php | 2 +- src/Phpml/Clustering/DBSCAN.php | 2 +- src/Phpml/Clustering/KMeans.php | 2 +- src/Phpml/Clustering/KMeans/Cluster.php | 2 +- src/Phpml/Clustering/KMeans/Point.php | 4 ++-- src/Phpml/Clustering/KMeans/Space.php | 2 +- src/Phpml/CrossValidation/RandomSplit.php | 2 +- src/Phpml/CrossValidation/Split.php | 2 +- src/Phpml/CrossValidation/StratifiedRandomSplit.php | 2 +- src/Phpml/Dataset/ArrayDataset.php | 2 +- src/Phpml/Dataset/CsvDataset.php | 2 +- src/Phpml/Dataset/Dataset.php | 2 +- src/Phpml/Dataset/Demo/GlassDataset.php | 2 +- src/Phpml/Dataset/Demo/IrisDataset.php | 2 +- src/Phpml/Dataset/Demo/WineDataset.php | 2 +- src/Phpml/Dataset/FilesDataset.php | 2 +- src/Phpml/Estimator.php | 2 +- src/Phpml/Exception/DatasetException.php | 2 +- src/Phpml/Exception/InvalidArgumentException.php | 2 +- src/Phpml/Exception/MatrixException.php | 2 +- src/Phpml/Exception/NormalizerException.php | 2 +- src/Phpml/FeatureExtraction/StopWords.php | 2 +- src/Phpml/FeatureExtraction/StopWords/English.php | 2 +- src/Phpml/FeatureExtraction/StopWords/Polish.php | 2 +- src/Phpml/FeatureExtraction/TfIdfTransformer.php | 2 +- src/Phpml/FeatureExtraction/TokenCountVectorizer.php | 4 ++-- src/Phpml/Helper/Predictable.php | 2 +- src/Phpml/Helper/Trainable.php | 2 +- src/Phpml/Math/Distance.php | 2 +- src/Phpml/Math/Distance/Chebyshev.php | 2 +- src/Phpml/Math/Distance/Euclidean.php | 2 +- src/Phpml/Math/Distance/Manhattan.php | 2 +- src/Phpml/Math/Distance/Minkowski.php | 2 +- src/Phpml/Math/Kernel.php | 2 +- src/Phpml/Math/Kernel/RBF.php | 2 +- src/Phpml/Math/Matrix.php | 4 ++-- src/Phpml/Math/Product.php | 2 +- src/Phpml/Math/Set.php | 2 +- src/Phpml/Math/Statistic/Correlation.php | 4 ++-- src/Phpml/Math/Statistic/Mean.php | 2 +- src/Phpml/Math/Statistic/StandardDeviation.php | 4 ++-- src/Phpml/Metric/Accuracy.php | 2 +- src/Phpml/Metric/ClassificationReport.php | 4 ++-- src/Phpml/Metric/ConfusionMatrix.php | 2 +- src/Phpml/NeuralNetwork/ActivationFunction.php | 2 +- .../NeuralNetwork/ActivationFunction/BinaryStep.php | 2 +- .../NeuralNetwork/ActivationFunction/Gaussian.php | 2 +- .../ActivationFunction/HyperbolicTangent.php | 2 +- .../NeuralNetwork/ActivationFunction/Sigmoid.php | 2 +- src/Phpml/NeuralNetwork/Layer.php | 2 +- src/Phpml/NeuralNetwork/Network.php | 2 +- src/Phpml/NeuralNetwork/Network/LayeredNetwork.php | 2 +- .../NeuralNetwork/Network/MultilayerPerceptron.php | 4 ++-- src/Phpml/NeuralNetwork/Node.php | 2 +- src/Phpml/NeuralNetwork/Node/Bias.php | 2 +- src/Phpml/NeuralNetwork/Node/Input.php | 2 +- src/Phpml/NeuralNetwork/Node/Neuron.php | 2 +- src/Phpml/NeuralNetwork/Node/Neuron/Synapse.php | 2 +- src/Phpml/NeuralNetwork/Training.php | 2 +- src/Phpml/NeuralNetwork/Training/Backpropagation.php | 4 ++-- .../NeuralNetwork/Training/Backpropagation/Sigma.php | 2 +- src/Phpml/Pipeline.php | 4 ++-- src/Phpml/Preprocessing/Imputer.php | 6 +++--- src/Phpml/Preprocessing/Imputer/Strategy.php | 2 +- .../Preprocessing/Imputer/Strategy/MeanStrategy.php | 4 ++-- .../Preprocessing/Imputer/Strategy/MedianStrategy.php | 4 ++-- .../Imputer/Strategy/MostFrequentStrategy.php | 4 ++-- src/Phpml/Preprocessing/Normalizer.php | 2 +- src/Phpml/Preprocessing/Preprocessor.php | 2 +- src/Phpml/Regression/LeastSquares.php | 2 +- src/Phpml/Regression/MLPRegressor.php | 2 +- src/Phpml/Regression/Regression.php | 2 +- src/Phpml/Regression/SVR.php | 2 +- src/Phpml/SupportVectorMachine/DataTransformer.php | 2 +- src/Phpml/SupportVectorMachine/Kernel.php | 2 +- .../SupportVectorMachine/SupportVectorMachine.php | 2 +- src/Phpml/SupportVectorMachine/Type.php | 2 +- src/Phpml/Tokenization/Tokenizer.php | 4 ++-- src/Phpml/Tokenization/WhitespaceTokenizer.php | 2 +- src/Phpml/Tokenization/WordTokenizer.php | 2 +- src/Phpml/Transformer.php | 2 +- tests/Phpml/Association/AprioriTest.php | 2 +- tests/Phpml/Classification/KNearestNeighborsTest.php | 2 +- tests/Phpml/Classification/NaiveBayesTest.php | 2 +- tests/Phpml/Classification/SVCTest.php | 2 +- tests/Phpml/Clustering/DBSCANTest.php | 2 +- tests/Phpml/Clustering/KMeansTest.php | 2 +- tests/Phpml/CrossValidation/RandomSplitTest.php | 2 +- .../CrossValidation/StratifiedRandomSplitTest.php | 2 +- tests/Phpml/Dataset/ArrayDatasetTest.php | 2 +- tests/Phpml/Dataset/CsvDatasetTest.php | 2 +- tests/Phpml/Dataset/Demo/GlassDatasetTest.php | 2 +- tests/Phpml/Dataset/Demo/IrisDatasetTest.php | 2 +- tests/Phpml/Dataset/Demo/WineDatasetTest.php | 2 +- tests/Phpml/Dataset/FilesDatasetTest.php | 2 +- tests/Phpml/FeatureExtraction/StopWordsTest.php | 2 +- .../Phpml/FeatureExtraction/TfIdfTransformerTest.php | 2 +- .../FeatureExtraction/TokenCountVectorizerTest.php | 2 +- tests/Phpml/Math/Distance/ChebyshevTest.php | 2 +- tests/Phpml/Math/Distance/EuclideanTest.php | 2 +- tests/Phpml/Math/Distance/ManhattanTest.php | 2 +- tests/Phpml/Math/Distance/MinkowskiTest.php | 2 +- tests/Phpml/Math/Kernel/RBFTest.php | 2 +- tests/Phpml/Math/MatrixTest.php | 2 +- tests/Phpml/Math/ProductTest.php | 2 +- tests/Phpml/Math/Statistic/CorrelationTest.php | 2 +- tests/Phpml/Math/Statistic/MeanTest.php | 2 +- tests/Phpml/Math/Statistic/StandardDeviationTest.php | 2 +- tests/Phpml/Metric/AccuracyTest.php | 2 +- tests/Phpml/Metric/ClassificationReportTest.php | 11 +++++------ tests/Phpml/Metric/ConfusionMatrixTest.php | 2 +- .../ActivationFunction/BinaryStepTest.php | 2 +- .../NeuralNetwork/ActivationFunction/GaussianTest.php | 2 +- .../ActivationFunction/HyperboliTangentTest.php | 2 +- .../NeuralNetwork/ActivationFunction/SigmoidTest.php | 2 +- tests/Phpml/NeuralNetwork/LayerTest.php | 2 +- .../NeuralNetwork/Network/LayeredNetworkTest.php | 2 +- .../Network/MultilayerPerceptronTest.php | 2 +- tests/Phpml/NeuralNetwork/Node/BiasTest.php | 2 +- tests/Phpml/NeuralNetwork/Node/InputTest.php | 2 +- tests/Phpml/NeuralNetwork/Node/Neuron/SynapseTest.php | 2 +- tests/Phpml/NeuralNetwork/Node/NeuronTest.php | 2 +- .../NeuralNetwork/Training/BackpropagationTest.php | 2 +- tests/Phpml/PipelineTest.php | 2 +- tests/Phpml/Preprocessing/ImputerTest.php | 2 +- tests/Phpml/Preprocessing/NormalizerTest.php | 2 +- tests/Phpml/Regression/LeastSquaresTest.php | 2 +- tests/Phpml/Regression/SVRTest.php | 2 +- .../SupportVectorMachine/DataTransformerTest.php | 2 +- .../SupportVectorMachine/SupportVectorMachineTest.php | 2 +- tests/Phpml/Tokenization/WhitespaceTokenizerTest.php | 2 +- tests/Phpml/Tokenization/WordTokenizerTest.php | 2 +- 139 files changed, 160 insertions(+), 159 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c8f2ae..781d5fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ CHANGELOG This changelog references the relevant changes done in PHP-ML library. -* 0.2.1 (in plan/progress) +* 0.2.2 (in plan/progress) * feature [Regression] - SSE, SSTo, SSR - sum of the squared + +* 0.2.1 (2016-11-20) * feature [Association] - Apriori algorithm implementation * bug [Metric] - division by zero diff --git a/src/Phpml/Association/Apriori.php b/src/Phpml/Association/Apriori.php index bec1510..4855691 100644 --- a/src/Phpml/Association/Apriori.php +++ b/src/Phpml/Association/Apriori.php @@ -1,6 +1,6 @@ dimension; ++$n) { $difference = $this->coordinates[$n] - $point->coordinates[$n]; - $distance += $difference * $difference; + $distance += $difference * $difference; } return $precise ? sqrt((float) $distance) : $distance; diff --git a/src/Phpml/Clustering/KMeans/Space.php b/src/Phpml/Clustering/KMeans/Space.php index 89a0d09..40b1f1d 100644 --- a/src/Phpml/Clustering/KMeans/Space.php +++ b/src/Phpml/Clustering/KMeans/Space.php @@ -1,6 +1,6 @@ $metric); - if(0==count($values)) { + if (0 == count($values)) { $this->average[$metric] = 0.0; continue; } diff --git a/src/Phpml/Metric/ConfusionMatrix.php b/src/Phpml/Metric/ConfusionMatrix.php index 6aeaa87..664e355 100644 --- a/src/Phpml/Metric/ConfusionMatrix.php +++ b/src/Phpml/Metric/ConfusionMatrix.php @@ -1,6 +1,6 @@ layers) - 1; - for ($i = 0;$i < $biasLayers;++$i) { + for ($i = 0; $i < $biasLayers; ++$i) { $this->layers[$i]->addNode(new Bias()); } } diff --git a/src/Phpml/NeuralNetwork/Node.php b/src/Phpml/NeuralNetwork/Node.php index 77e0c00..65d5cdc 100644 --- a/src/Phpml/NeuralNetwork/Node.php +++ b/src/Phpml/NeuralNetwork/Node.php @@ -1,6 +1,6 @@ addTransformer($transformer); diff --git a/src/Phpml/Preprocessing/Imputer.php b/src/Phpml/Preprocessing/Imputer.php index 012bb79..805d3f6 100644 --- a/src/Phpml/Preprocessing/Imputer.php +++ b/src/Phpml/Preprocessing/Imputer.php @@ -1,6 +1,6 @@ missingValue = $missingValue; $this->strategy = $strategy; @@ -78,7 +78,7 @@ class Imputer implements Preprocessor /** * @param int $column * @param array $currentSample - * + * * @return array */ private function getAxis(int $column, array $currentSample): array diff --git a/src/Phpml/Preprocessing/Imputer/Strategy.php b/src/Phpml/Preprocessing/Imputer/Strategy.php index 2cf1144..9125e06 100644 --- a/src/Phpml/Preprocessing/Imputer/Strategy.php +++ b/src/Phpml/Preprocessing/Imputer/Strategy.php @@ -1,6 +1,6 @@ assertEquals([ 'precision' => 0, 'recall' => 0, - 'f1score' => 0 + 'f1score' => 0, ], $report->getAverage(), '', 0.01); } - } diff --git a/tests/Phpml/Metric/ConfusionMatrixTest.php b/tests/Phpml/Metric/ConfusionMatrixTest.php index d133ae2..1b2782b 100644 --- a/tests/Phpml/Metric/ConfusionMatrixTest.php +++ b/tests/Phpml/Metric/ConfusionMatrixTest.php @@ -1,6 +1,6 @@