Wrapper interface (#314)

* Add Wrapper interface for models wrappers

* Add WrapperAware trait

* Fix PhpDoc

* Revert "Add WrapperAware trait"

This reverts commit 241abc4.

* Rename Wrapper interface to EstimatorWrapper

* PHP CS fix

src/AnomalyDetectors/LocalOutlierFactor.php

@@ -67,7 +67,7 @@ class LocalOutlierFactor implements Estimator, Learner, Scoring, Persistable
      *
      * @var Spatial
      */
-    protected \Rubix\ML\Graph\Trees\Spatial $tree;
+    protected Spatial $tree;
 
     /**
      * The precomputed k distances between each training sample and its k'th nearest neighbor.

src/AnomalyDetectors/Loda.php

@@ -100,7 +100,7 @@ class Loda implements Estimator, Learner, Online, Scoring, Persistable
      *
      * @var \Tensor\Matrix|null
      */
-    protected ?\Tensor\Matrix $r = null;
+    protected ?Matrix $r = null;
 
     /**
      * The edges and bin counts of each histogram.

src/AnomalyDetectors/OneClassSVM.php

@@ -44,7 +44,7 @@ class OneClassSVM implements Estimator, Learner
      *
      * @var svm
      */
-    protected \svm $svm;
+    protected svm $svm;
 
     /**
      * The hyper-parameters of the model.
@@ -58,7 +58,7 @@ class OneClassSVM implements Estimator, Learner
      *
      * @var \svmmodel|null
      */
-    protected ?\svmmodel $model = null;
+    protected ?svmmodel $model = null;
 
     /**
      * @param float $nu

src/BootstrapAggregator.php

@@ -64,7 +64,7 @@ class BootstrapAggregator implements Estimator, Learner, Parallel, Persistable
      *
      * @var Learner
      */
-    protected \Rubix\ML\Learner $base;
+    protected Learner $base;
 
     /**
      * The number of base learners to train in the ensemble.

src/Classifiers/AdaBoost.php

@@ -72,7 +72,7 @@ class AdaBoost implements Estimator, Learner, Probabilistic, Verbose, Persistabl
      *
      * @var Learner
      */
-    protected \Rubix\ML\Learner $base;
+    protected Learner $base;
 
     /**
      * The learning rate of the ensemble i.e. the *shrinkage* applied to each step.

src/Classifiers/KDNeighbors.php

@@ -60,7 +60,7 @@ class KDNeighbors implements Estimator, Learner, Probabilistic, Persistable
      *
      * @var Spatial
      */
-    protected \Rubix\ML\Graph\Trees\Spatial $tree;
+    protected Spatial $tree;
 
     /**
      * The zero vector for the possible class outcomes.

src/Classifiers/KNearestNeighbors.php

@@ -62,7 +62,7 @@ class KNearestNeighbors implements Estimator, Learner, Online, Probabilistic, Pe
      *
      * @var Distance
      */
-    protected \Rubix\ML\Kernels\Distance\Distance $kernel;
+    protected Distance $kernel;
 
     /**
      * The zero vector for the possible class outcomes.

src/Classifiers/LogisticRegression.php

@@ -67,7 +67,7 @@ class LogisticRegression implements Estimator, Learner, Online, Probabilistic, R
      *
      * @var Optimizer
      */
-    protected \Rubix\ML\NeuralNet\Optimizers\Optimizer $optimizer;
+    protected Optimizer $optimizer;
 
     /**
      * The amount of L2 regularization applied to the weights of the output layer.
@@ -103,14 +103,14 @@ class LogisticRegression implements Estimator, Learner, Online, Probabilistic, R
      *
      * @var ClassificationLoss
      */
-    protected \Rubix\ML\NeuralNet\CostFunctions\ClassificationLoss $costFn;
+    protected ClassificationLoss $costFn;
 
     /**
      * The underlying neural network instance.
      *
      * @var \Rubix\ML\NeuralNet\FeedForward|null
      */
-    protected ?\Rubix\ML\NeuralNet\FeedForward $network = null;
+    protected ?FeedForward $network = null;
 
     /**
      * The unique class labels.

src/Classifiers/LogitBoost.php

@@ -89,7 +89,7 @@ class LogitBoost implements Estimator, Learner, Probabilistic, RanksFeatures, Ve
      *
      * @var Learner
      */
-    protected \Rubix\ML\Learner $booster;
+    protected Learner $booster;
 
     /**
      * The learning rate of the ensemble i.e. the *shrinkage* applied to each step.
@@ -138,7 +138,7 @@ class LogitBoost implements Estimator, Learner, Probabilistic, RanksFeatures, Ve
      *
      * @var Metric
      */
-    protected \Rubix\ML\CrossValidation\Metrics\Metric $metric;
+    protected Metric $metric;
 
     /**
      * The ensemble of boosters.

src/Classifiers/MultilayerPerceptron.php

@@ -85,7 +85,7 @@ class MultilayerPerceptron implements Estimator, Learner, Online, Probabilistic,
      *
      * @var Optimizer
      */
-    protected \Rubix\ML\NeuralNet\Optimizers\Optimizer $optimizer;
+    protected Optimizer $optimizer;
 
     /**
      * The amount of L2 regularization applied to the weights of the output layer.
@@ -127,21 +127,21 @@ class MultilayerPerceptron implements Estimator, Learner, Online, Probabilistic,
      *
      * @var ClassificationLoss
      */
-    protected \Rubix\ML\NeuralNet\CostFunctions\ClassificationLoss $costFn;
+    protected ClassificationLoss $costFn;
 
     /**
      * The validation metric used to score the generalization performance of the model during training.
      *
      * @var Metric
      */
-    protected \Rubix\ML\CrossValidation\Metrics\Metric $metric;
+    protected Metric $metric;
 
     /**
      * The underlying neural network instance.
      *
      * @var \Rubix\ML\NeuralNet\FeedForward|null
      */
-    protected ?\Rubix\ML\NeuralNet\FeedForward $network = null;
+    protected ?FeedForward $network = null;
 
     /**
      * The unique class labels.

src/Classifiers/OneVsRest.php

@@ -51,7 +51,7 @@ class OneVsRest implements Estimator, Learner, Probabilistic, Parallel, Persista
      *
      * @var Learner
      */
-    protected \Rubix\ML\Learner $base;
+    protected Learner $base;
 
     /**
      * A map of each class to its binary classifier.

src/Classifiers/RadiusNeighbors.php

@@ -60,7 +60,7 @@ class RadiusNeighbors implements Estimator, Learner, Probabilistic, Persistable
      *
      * @var Spatial
      */
-    protected \Rubix\ML\Graph\Trees\Spatial $tree;
+    protected Spatial $tree;
 
     /**
      * The class label for any samples that have 0 neighbors within the specified radius.

src/Classifiers/RandomForest.php

@@ -73,7 +73,7 @@ class RandomForest implements Estimator, Learner, Probabilistic, Parallel, Ranks
      *
      * @var Learner
      */
-    protected \Rubix\ML\Learner $base;
+    protected Learner $base;
 
     /**
      * The number of learners to train in the ensemble.

src/Classifiers/SoftmaxClassifier.php

@@ -64,7 +64,7 @@ class SoftmaxClassifier implements Estimator, Learner, Online, Probabilistic, Ve
      *
      * @var Optimizer
      */
-    protected \Rubix\ML\NeuralNet\Optimizers\Optimizer $optimizer;
+    protected Optimizer $optimizer;
 
     /**
      * The amount of L2 regularization applied to the weights of the output layer.
@@ -99,14 +99,14 @@ class SoftmaxClassifier implements Estimator, Learner, Online, Probabilistic, Ve
      *
      * @var ClassificationLoss
      */
-    protected \Rubix\ML\NeuralNet\CostFunctions\ClassificationLoss $costFn;
+    protected ClassificationLoss $costFn;
 
     /**
      * The underlying neural network instance.
      *
      * @var \Rubix\ML\NeuralNet\FeedForward|null
      */
-    protected ?\Rubix\ML\NeuralNet\FeedForward $network = null;
+    protected ?FeedForward $network = null;
 
     /**
      * The unique class labels.

src/Clusterers/DBSCAN.php

@@ -73,7 +73,7 @@ class DBSCAN implements Estimator
      *
      * @var Spatial
      */
-    protected \Rubix\ML\Graph\Trees\Spatial $tree;
+    protected Spatial $tree;
 
     /**
      * @param float $radius

src/Clusterers/FuzzyCMeans.php

@@ -92,14 +92,14 @@ class FuzzyCMeans implements Estimator, Learner, Probabilistic, Verbose, Persist
      *
      * @var Distance
      */
-    protected \Rubix\ML\Kernels\Distance\Distance $kernel;
+    protected Distance $kernel;
 
     /**
      * The cluster centroid seeder.
      *
      * @var Seeder
      */
-    protected \Rubix\ML\Clusterers\Seeders\Seeder $seeder;
+    protected Seeder $seeder;
 
     /**
      * The computed centroid vectors of the training data.

src/Clusterers/GaussianMixture.php

@@ -97,7 +97,7 @@ class GaussianMixture implements Estimator, Learner, Probabilistic, Verbose, Per
      *
      * @var Seeder
      */
-    protected \Rubix\ML\Clusterers\Seeders\Seeder $seeder;
+    protected Seeder $seeder;
 
     /**
      * The precomputed log prior probabilities of each cluster.

src/Clusterers/KMeans.php

@@ -96,14 +96,14 @@ class KMeans implements Estimator, Learner, Online, Probabilistic, Verbose, Pers
      *
      * @var Distance
      */
-    protected \Rubix\ML\Kernels\Distance\Distance $kernel;
+    protected Distance $kernel;
 
     /**
      * The cluster centroid seeder.
      *
      * @var Seeder
      */
-    protected \Rubix\ML\Clusterers\Seeders\Seeder $seeder;
+    protected Seeder $seeder;
 
     /**
      * The computed centroid vectors of the training data.

src/Clusterers/MeanShift.php

@@ -104,14 +104,14 @@ class MeanShift implements Estimator, Learner, Probabilistic, Verbose, Persistab
      *
      * @var Spatial
      */
-    protected \Rubix\ML\Graph\Trees\Spatial $tree;
+    protected Spatial $tree;
 
     /**
      * The cluster centroid seeder.
      *
      * @var Seeder
      */
-    protected \Rubix\ML\Clusterers\Seeders\Seeder $seeder;
+    protected Seeder $seeder;
 
     /**
      * The computed centroid vectors of the training data.

src/Clusterers/Seeders/KMC2.php

@@ -39,7 +39,7 @@ class KMC2 implements Seeder
      *
      * @var Distance
      */
-    protected \Rubix\ML\Kernels\Distance\Distance $kernel;
+    protected Distance $kernel;
 
     /**
      * @param int $m

src/Clusterers/Seeders/PlusPlus.php

@@ -32,7 +32,7 @@ class PlusPlus implements Seeder
      *
      * @var Distance
      */
-    protected \Rubix\ML\Kernels\Distance\Distance $kernel;
+    protected Distance $kernel;
 
     /**
      * @param \Rubix\ML\Kernels\Distance\Distance|null $kernel

src/Datasets/Generators/Blob.php

@@ -32,7 +32,7 @@ class Blob implements Generator
      *
      * @var Vector
      */
-    protected \Tensor\Vector $center;
+    protected Vector $center;
 
     /**
      * The standard deviation of the blob.

src/Datasets/Generators/Circle.php

@@ -27,7 +27,7 @@ class Circle implements Generator
      *
      * @var Vector
      */
-    protected \Tensor\Vector $center;
+    protected Vector $center;
 
     /**
      * The scaling factor of the circle.

src/Datasets/Generators/HalfMoon.php

@@ -26,7 +26,7 @@ class HalfMoon implements Generator
      *
      * @var Vector
      */
-    protected \Tensor\Vector $center;
+    protected Vector $center;
 
     /**
      * The scaling factor of the half moon.

src/Datasets/Generators/Hyperplane.php

@@ -27,7 +27,7 @@ class Hyperplane implements Generator
      *
      * @var Vector
      */
-    protected \Tensor\Vector $coefficients;
+    protected Vector $coefficients;
 
     /**
      * The y intercept term.

src/Datasets/Generators/SwissRoll.php

@@ -33,7 +33,7 @@ class SwissRoll implements Generator
      *
      * @var Vector
      */
-    protected \Tensor\Vector $center;
+    protected Vector $center;
 
     /**
      * The scaling factor of the swiss roll.

src/EstimatorWrapper.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rubix\ML;
+
+/**
+ * Wrapper
+ *
+ * @category    Machine Learning
+ * @package     Rubix/ML
+ * @author      Ronan Giron
+ */
+interface EstimatorWrapper extends Estimator
+{
+    /**
+     * Return the base estimator instance.
+     *
+     * @return Estimator
+     */
+    public function base() : Estimator;
+}

src/Extractors/SQLTable.php

@@ -30,7 +30,7 @@ class SQLTable implements Extractor
      *
      * @var PDO
      */
-    protected \PDO $connection;
+    protected PDO $connection;
 
     /**
      * The name of the table to select from.

src/Graph/Nodes/Clique.php

@@ -26,7 +26,7 @@ class Clique implements Hypersphere, BinaryNode
      *
      * @var Labeled
      */
-    protected \Rubix\ML\Datasets\Labeled $dataset;
+    protected Labeled $dataset;
 
     /**
      * The centroid or multivariate mean of the cluster.

src/Graph/Nodes/Neighborhood.php

@@ -24,7 +24,7 @@ class Neighborhood implements Hypercube, BinaryNode
      *
      * @var Labeled
      */
-    protected \Rubix\ML\Datasets\Labeled $dataset;
+    protected Labeled $dataset;
 
     /**
      * The multivariate minimum of the bounding box.

src/Graph/Nodes/Traits/HasBinaryChildrenTrait.php

@@ -23,14 +23,14 @@ trait HasBinaryChildrenTrait
      *
      * @var \Rubix\ML\Graph\Nodes\BinaryNode|null
      */
-    protected ?\Rubix\ML\Graph\Nodes\BinaryNode $left = null;
+    protected ?BinaryNode $left = null;
 
     /**
      * The right child node.
      *
      * @var \Rubix\ML\Graph\Nodes\BinaryNode|null
      */
-    protected ?\Rubix\ML\Graph\Nodes\BinaryNode $right = null;
+    protected ?BinaryNode $right = null;
 
     /**
      * Return the children of this node in a generator.