Merge branch '2.5' into 3.0

Author: andrewdalpino

.php-cs-fixer.dist.php

@@ -14,6 +14,7 @@
     'array_syntax' => ['syntax' => 'short'],
     'backtick_to_shell_exec' => true,
     'binary_operator_spaces' => true,
+    'blank_lines_before_namespace' => true,
     'blank_line_after_namespace' => true,
     'blank_line_after_opening_tag' => true,
     'blank_line_before_statement' => [
@@ -22,19 +23,13 @@
             'if', 'foreach', 'return', 'switch', 'try', 'while',
         ],
     ],
-    'braces' => [
-        'allow_single_line_closure' => false,
-        'position_after_control_structures' => 'same',
-        'position_after_functions_and_oop_constructs' => 'next',
-    ],
     'cast_spaces' => ['space' => 'single'],
     'class_attributes_separation' => true,
     'combine_consecutive_issets' => true,
     'combine_consecutive_unsets' => true,
     'compact_nullable_typehint' => true,
     'concat_space' => ['spacing' => 'one'],
     'fully_qualified_strict_types' => true,
-    'function_typehint_space' => true,
     'increment_style' => ['style' => 'pre'],
     'linebreak_after_opening_tag' => true,
     'list_syntax' => ['syntax' => 'short'],
@@ -111,11 +106,11 @@
     'semicolon_after_instruction' => true,
     'short_scalar_cast' => true,
     'simplified_null_return' => true,
-    'single_blank_line_before_namespace' => true,
     'single_quote' => true,
     'single_line_comment_style' => true,
     'ternary_operator_spaces' => true,
     'ternary_to_null_coalescing' => true,
+    'type_declaration_spaces' => true,
     'trim_array_spaces' => true,
     'unary_operator_spaces' => true,
     'whitespace_after_comma_in_array' => true,

CHANGELOG.md

@@ -9,8 +9,13 @@
     - Remove Network interface
     - RBX Serializer only tracks major library version number
 
+- 2.5.0
+    - Added Vantage Point Spatial tree
+    - Blob Generator can now `simulate()` a Dataset object
+
 - 2.4.1
     - Sentence Tokenizer fix Arabic and Farsi language support
+    - Optimize online variance updating
 
 - 2.4.0
     - Add GELU activation function

benchmarks/AnomalyDetectors/GaussianMLEBench.php

@@ -12,7 +12,7 @@
  */
 class GaussianMLEBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/AnomalyDetectors/IsolationForestBench.php

@@ -12,7 +12,7 @@
  */
 class IsolationForestBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/AnomalyDetectors/LocalOutlierFactorBench.php

@@ -12,7 +12,7 @@
  */
 class LocalOutlierFactorBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/AnomalyDetectors/LodaBench.php

@@ -12,7 +12,7 @@
  */
 class LodaBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/AnomalyDetectors/OneClassSVMBench.php

@@ -12,7 +12,7 @@
  */
 class OneClassSVMBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/AnomalyDetectors/RobustZScoreBench.php

@@ -12,7 +12,7 @@
  */
 class RobustZScoreBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/AdaBoostBench.php

@@ -13,7 +13,7 @@
  */
 class AdaBoostBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/ClassificationTreeBench.php

@@ -12,7 +12,7 @@
  */
 class ClassificationTreeBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/ExtraTreeClassifierBench.php

@@ -12,7 +12,7 @@
  */
 class ExtraTreeClassifierBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/GaussianNBBench.php

@@ -12,7 +12,7 @@
  */
 class GaussianNBBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/KDNeighborsBench.php

@@ -12,7 +12,7 @@
  */
 class KDNeighborsBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/KNearestNeighborsBench.php

@@ -12,7 +12,7 @@
  */
 class KNearestNeighborsBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/LogisticRegressionBench.php

@@ -12,7 +12,7 @@
  */
 class LogisticRegressionBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/LogitBoostBench.php

@@ -12,7 +12,7 @@
  */
 class LogitBoostBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/MultilayerPerceptronBench.php

@@ -15,7 +15,7 @@
  */
 class MultilayerPerceptronBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/NaiveBayesBench.php

@@ -13,7 +13,7 @@
  */
 class NaiveBayesBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/OneVsRestBench.php

@@ -14,7 +14,7 @@
  */
 class OneVsRestBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/RadiusNeighborsBench.php

@@ -12,7 +12,7 @@
  */
 class RadiusNeighborsBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/RandomForestBench.php

@@ -13,7 +13,7 @@
  */
 class RandomForestBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/SVCBench.php

@@ -13,7 +13,7 @@
  */
 class SVCBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Classifiers/SoftmaxClassifierBench.php

@@ -12,7 +12,7 @@
  */
 class SoftmaxClassifierBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Clusterers/FuzzyCMeansBench.php

@@ -12,7 +12,7 @@
  */
 class FuzzyCMeansBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Clusterers/GaussianMixtureBench.php

@@ -12,7 +12,7 @@
  */
 class GaussianMixtureBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Clusterers/KMeansBench.php

@@ -12,7 +12,7 @@
  */
 class KMeansBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Clusterers/MeanShiftBench.php

@@ -12,7 +12,7 @@
  */
 class MeanShiftBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Graph/Trees/VantageTreeBench.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Rubix\ML\Benchmarks\Graph\Trees;
+
+use Rubix\ML\Graph\Trees\VantageTree;
+use Rubix\ML\Datasets\Generators\Blob;
+use Rubix\ML\Datasets\Generators\Agglomerate;
+
+/**
+ * @Groups({"Trees"})
+ * @BeforeMethods({"setUp"})
+ */
+class VantageTreeBench
+{
+    protected const DATASET_SIZE = 10000;
+
+    /**
+     * @var \Rubix\ML\Datasets\Labeled;
+     */
+    protected $dataset;
+
+    /**
+     * @var \Rubix\ML\Graph\Trees\VantageTree
+     */
+    protected $tree;
+
+    public function setUp() : void
+    {
+        $generator = new Agglomerate([
+            'Iris-setosa' => new Blob([5.0, 3.42, 1.46, 0.24], [0.35, 0.38, 0.17, 0.1]),
+            'Iris-versicolor' => new Blob([5.94, 2.77, 4.26, 1.33], [0.51, 0.31, 0.47, 0.2]),
+            'Iris-virginica' => new Blob([6.59, 2.97, 5.55, 2.03], [0.63, 0.32, 0.55, 0.27]),
+        ]);
+
+        $this->dataset = $generator->generate(self::DATASET_SIZE);
+
+        $this->tree = new VantageTree(30);
+    }
+
+    /**
+     * @Subject
+     * @Iterations(3)
+     * @OutputTimeUnit("seconds", precision=3)
+     */
+    public function grow() : void
+    {
+        $this->tree->grow($this->dataset);
+    }
+}

benchmarks/Persisters/Serializers/GzipNativeBench.php

@@ -13,7 +13,7 @@
  */
 class GzipNativeBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     /**
      * @var \Rubix\ML\Serializers\GzipNative

benchmarks/Persisters/Serializers/NativeBench.php

@@ -13,7 +13,7 @@
  */
 class NativeBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     /**
      * @var \Rubix\ML\Serializers\Native

benchmarks/Persisters/Serializers/RBXBench.php

@@ -13,7 +13,7 @@
  */
 class RBXBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     /**
      * @var \Rubix\ML\Serializers\RBX

benchmarks/Regressors/AdalineBench.php

@@ -11,7 +11,7 @@
  */
 class AdalineBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Regressors/ExtraTreeRegressorBench.php

@@ -11,7 +11,7 @@
  */
 class ExtraTreeRegressorBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Regressors/GradientBoostBench.php

@@ -11,7 +11,7 @@
  */
 class GradientBoostBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;
 

benchmarks/Regressors/KDNeighborsRegressorBench.php

@@ -11,7 +11,7 @@
  */
 class KDNeighborsRegressorBench
 {
-    protected const TRAINING_SIZE = 2500;
+    protected const TRAINING_SIZE = 10000;
 
     protected const TESTING_SIZE = 10000;