408 fix issues in tests

CHANGELOG.md

@@ -6,9 +6,10 @@
     - Exportable Extractors now append by default with option to overwrite
     - Added validation interval parameter to MLPs and GBM Learners
     - Removed output layer L2 Penalty parameter from MLP Learners
-    - Remove Network interface
     - RBX Serializer only tracks major library version number
-
+    - Convert NeuralNet classes to use NDArray instead of Matrix
+    - Converted back Network interface
+
 - 2.5.0
     - Added Vantage Point Spatial tree
     - Blob Generator can now `simulate()` a Dataset object

README.md

@@ -64,3 +64,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 
 ## License
 The code is licensed [MIT](LICENSE) and the documentation is licensed [CC BY-NC 4.0](https://creativecommons.org/licenses/by-nc/4.0/).
+

phpstan-baseline.neon

@@ -18,24 +18,6 @@ parameters:
 			count: 1
 			path: src/Classifiers/AdaBoost.php
 
-		-
-			message: '#^Method Rubix\\ML\\Classifiers\\AdaBoost\:\:predict\(\) should return list\<string\> but returns list\<int\|string\>\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Classifiers/AdaBoost.php
-
-		-
-			message: '#^Method Rubix\\ML\\Classifiers\\AdaBoost\:\:score\(\) should return list\<array\<float\>\> but returns array\<int\<0, max\>, array\<int\|string, float\>\>\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Classifiers/AdaBoost.php
-
-		-
-			message: '#^Method Rubix\\ML\\Classifiers\\AdaBoost\:\:steps\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Classifiers/AdaBoost.php
-
 		-
 			message: '#^PHPDoc tag @return contains unresolvable type\.$#'
 			identifier: return.unresolvableType
@@ -108,36 +90,12 @@ parameters:
 			count: 1
 			path: src/Classifiers/NaiveBayes.php
 
-		-
-			message: '#^Property Rubix\\ML\\Classifiers\\NaiveBayes\:\:\$counts \(array\<string, list\<array\<int\<0, max\>\>\>\>\) does not accept non\-empty\-array\<array\<array\<int\<0, max\>\>\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Classifiers/NaiveBayes.php
-
-		-
-			message: '#^Property Rubix\\ML\\Classifiers\\NaiveBayes\:\:\$probs \(array\<string, list\<array\<float\>\>\>\) does not accept non\-empty\-array\<array\<array\<float\>\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Classifiers/NaiveBayes.php
-
-		-
-			message: '#^Method Rubix\\ML\\Classifiers\\RandomForest\:\:proba\(\) should return list\<array\<string, float\>\> but returns array\<int, non\-empty\-array\<float\>\>\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Classifiers/RandomForest.php
-
 		-
 			message: '#^PHPDoc tag @var with type array\<string, int\> is not subtype of native type array\<int\<1, max\>\>\.$#'
 			identifier: varTag.nativeType
 			count: 1
 			path: src/Classifiers/RandomForest.php
 
-		-
-			message: '#^Parameter \#1 \.\.\.\$arg1 of function min expects non\-empty\-array, array\<int\<1, max\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Classifiers/RandomForest.php
-
 		-
 			message: '#^Property Rubix\\ML\\Classifiers\\RandomForest\:\:\$trees \(list\<Rubix\\ML\\Classifiers\\ClassificationTree\|Rubix\\ML\\Classifiers\\ExtraTreeClassifier\>\|null\) does not accept array\<mixed\>\.$#'
 			identifier: assign.propertyType
@@ -162,60 +120,12 @@ parameters:
 			count: 1
 			path: src/Clusterers/FuzzyCMeans.php
 
-		-
-			message: '#^Parameter \#1 \$sample of method Rubix\\ML\\Clusterers\\GaussianMixture\:\:jointLogLikelihood\(\) expects list\<float\|int\>, array\<float\|int\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Clusterers/GaussianMixture.php
-
-		-
-			message: '#^Property Rubix\\ML\\Clusterers\\GaussianMixture\:\:\$means \(list\<list\<float\>\>\) does not accept non\-empty\-array\<int\<\-1, max\>, list\<float\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Clusterers/GaussianMixture.php
-
-		-
-			message: '#^Property Rubix\\ML\\Clusterers\\GaussianMixture\:\:\$means \(list\<list\<float\>\>\) does not accept non\-empty\-array\<int\<0, max\>, list\<float\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Clusterers/GaussianMixture.php
-
-		-
-			message: '#^Property Rubix\\ML\\Clusterers\\GaussianMixture\:\:\$variances \(list\<list\<float\>\>\) does not accept non\-empty\-array\<int\<\-1, max\>, list\<float\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Clusterers/GaussianMixture.php
-
-		-
-			message: '#^Property Rubix\\ML\\Clusterers\\GaussianMixture\:\:\$variances \(list\<list\<float\>\>\) does not accept non\-empty\-array\<int\<0, max\>, list\<float\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/Clusterers/GaussianMixture.php
-
 		-
 			message: '#^Parameter \#2 \$labels of method Rubix\\ML\\Clusterers\\KMeans\:\:inertia\(\) expects list\<int\>, array given\.$#'
 			identifier: argument.type
 			count: 1
 			path: src/Clusterers/KMeans.php
 
-		-
-			message: '#^Parameter \#1 \$current of method Rubix\\ML\\Clusterers\\MeanShift\:\:shift\(\) expects list\<array\<float\|int\>\>, array\<int\<0, max\>, list\<float\|int\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Clusterers/MeanShift.php
-
-		-
-			message: '#^Parameter \#2 \$b of method Rubix\\ML\\Kernels\\Distance\\Distance\:\:compute\(\) expects list\<float\|int\|string\>, array\<float\|int\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: src/Clusterers/MeanShift.php
-
-		-
-			message: '#^Parameter \#2 \$previous of method Rubix\\ML\\Clusterers\\MeanShift\:\:shift\(\) expects list\<array\<float\|int\>\>, array\<int\<0, max\>, list\<float\|int\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Clusterers/MeanShift.php
-
 		-
 			message: '#^Property Rubix\\ML\\Clusterers\\Seeders\\Preset\:\:\$centroids \(list\<list\<float\|int\|string\>\>\) does not accept non\-empty\-list\<array\<float\|int\|string\>\>\.$#'
 			identifier: assign.propertyType
@@ -366,12 +276,6 @@ parameters:
 			count: 1
 			path: src/Datasets/Dataset.php
 
-		-
-			message: '#^Offset 0 on non\-empty\-list\<list\<mixed\>\> on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.offset
-			count: 1
-			path: src/Datasets/Dataset.php
-
 		-
 			message: '#^Property Rubix\\ML\\Datasets\\Dataset\:\:\$samples \(list\<list\<mixed\>\>\) does not accept array\<mixed\>\.$#'
 			identifier: assign.propertyType
@@ -384,30 +288,12 @@ parameters:
 			count: 1
 			path: src/Datasets/Generators/Agglomerate.php
 
-		-
-			message: '#^Ternary operator condition is always true\.$#'
-			identifier: ternary.alwaysTrue
-			count: 1
-			path: src/Datasets/Generators/Agglomerate.php
-
 		-
 			message: '#^Instanceof between Rubix\\ML\\Datasets\\Labeled and Rubix\\ML\\Datasets\\Labeled will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
 			count: 1
 			path: src/Datasets/Labeled.php
 
-		-
-			message: '#^PHPDoc tag @var with type array\<Rubix\\ML\\Datasets\\Labeled\> is not subtype of native type array\<non\-empty\-list\>\.$#'
-			identifier: varTag.nativeType
-			count: 1
-			path: src/Datasets/Labeled.php
-
-		-
-			message: '#^PHPDoc tag @var with type list\<Rubix\\ML\\Datasets\\Labeled\> is not subtype of native type array\<non\-empty\-list\>\.$#'
-			identifier: varTag.nativeType
-			count: 1
-			path: src/Datasets/Labeled.php
-
 		-
 			message: '#^Parameter \#2 \$b of method Rubix\\ML\\Kernels\\Distance\\Distance\:\:compute\(\) expects list\<float\|int\|string\>, array\<float\|int\|string\> given\.$#'
 			identifier: argument.type
@@ -540,12 +426,6 @@ parameters:
 			count: 1
 			path: src/Kernels/Distance/Diagonal.php
 
-		-
-			message: '#^Parameter \#1 \$labels of method Rubix\\ML\\NeuralNet\\Network\:\:backpropagate\(\) expects list\<float\|int\|string\>, array\<mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/NeuralNet/Network.php
-
 		-
 			message: '#^Instanceof between Rubix\\ML\\Transformers\\Transformer and Rubix\\ML\\Transformers\\Transformer will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
@@ -624,18 +504,6 @@ parameters:
 			count: 1
 			path: src/Transformers/ImageResizer.php
 
-		-
-			message: '#^Ternary operator condition is always true\.$#'
-			identifier: ternary.alwaysTrue
-			count: 2
-			path: src/Transformers/ImageResizer.php
-
-		-
-			message: '#^Ternary operator condition is always true\.$#'
-			identifier: ternary.alwaysTrue
-			count: 2
-			path: src/Transformers/ImageVectorizer.php
-
 		-
 			message: '#^Parameter \#1 \.\.\.\$arg1 of function max expects non\-empty\-array, array\<mixed\> given\.$#'
 			identifier: argument.type
@@ -1578,3 +1446,159 @@ parameters:
 			count: 1
 			path: tests/Helpers/ParamsTest.php
 
+		-
+			message: '#^Possibly invalid array key type float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: src/AnomalyDetectors/LocalOutlierFactor.php
+
+		-
+			message: '#^Possibly invalid array key type float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: src/Classifiers/AdaBoost.php
+
+		-
+			message: '#^Possibly invalid array key type float\|int\|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 3
+			path: src/Classifiers/KNearestNeighbors.php
+
+		-
+			message: '#^Invalid array key type float\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: src/Classifiers/SVC.php
+
+		-
+			message: '#^Empty array passed to foreach\.$#'
+			identifier: foreach.emptyArray
+			count: 1
+			path: src/Classifiers/NaiveBayes.php
+
+		-
+			message: '#^Property Rubix\\ML\\Graph\\Nodes\\Ball\:\:\$subsets in isset\(\) is not nullable nor uninitialized\.$#'
+			identifier: isset.initializedProperty
+			count: 1
+			path: src/Graph/Nodes/Ball.php
+
+		-
+			message: '#^Property Rubix\\ML\\Graph\\Nodes\\Split\:\:\$subsets in isset\(\) is not nullable nor uninitialized\.$#'
+			identifier: isset.initializedProperty
+			count: 1
+			path: src/Graph/Nodes/Split.php
+
+		-
+			message: '#^Property Rubix\\ML\\Graph\\Nodes\\Box\:\:\$subsets in isset\(\) is not nullable nor uninitialized\.$#'
+			identifier: isset.initializedProperty
+			count: 1
+			path: src/Graph/Nodes/Box.php
+
+		-
+			message: '#^Property Rubix\\ML\\Datasets\\Dataset\:\:\$samples on left side of \?\? is not nullable nor uninitialized\.$#'
+			identifier: nullCoalesce.initializedProperty
+			count: 1
+			path: src/Datasets/Dataset.php
+
+		-
+			message: '#^Property Rubix\\ML\\Graph\\Nodes\\Isolator\:\:\$subsets in isset\(\) is not nullable nor uninitialized\.$#'
+			identifier: isset.initializedProperty
+			count: 1
+			path: src/Graph/Nodes/Isolator.php
+
+		-
+			message: '#^Parameter \#1 \$sample of method Rubix\\ML\\Graph\\Trees\\Spatial::nearest\(\) expects list<float|int|string>, non-empty-array<int<0, max>, mixed> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Transformers/KNNImputer.php
+
+		-
+			message: '#^Parameter \#1 \$sample of method Rubix\\ML\\Graph\\Trees\\Spatial::nearest\(\) expects list<float|int|string>, non-empty-array<int<0, max>, mixed> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Transformers/HotDeckImputer.php
+
+		-
+			message: '#^Parameter \#1 \$labels of method Rubix\\ML\\NeuralNet\\FeedForward::backpropagate\(\) expects list<float|int|string>, array<mixed> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/NeuralNet/FeedForward.php
+
+		-
+			message: '#^Parameter \#1 \$labels of method Rubix\\ML\\NeuralNet\\Networks\\FeedForward\\FeedForward::backpropagate\(\) expects list<float|int|string>, array<mixed> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/NeuralNet/Networks/FeedForward/FeedForward.php
+
+		-
+			message: '#^Parameter \#1 \$sample of method Rubix\\ML\\Graph\\Trees\\Spatial::range\(\) expects list<float|int|string>, array<int<0, max>, float|int> given\.$#'
+			identifier: argument.type
+			count: 6
+			path: src/Clusterers/MeanShift.php
+
+		-
+			message: '#^Parameter \#1 \$b of method Tensor\\Matrix::matmul\(\) expects Tensor\\Matrix, Tensor\\Matrix|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/AnomalyDetectors/Loda.php
+
+		-
+			message: '#^Parameter \#1 \$sample of method Rubix\\ML\\Clusterers\\GaussianMixture::jointLogLikelihood\(\) expects list<float|int>, array<float|int> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Clusterers/GaussianMixture.php
+
+		-
+			message: '#^Cannot call method toArray\(\) on NumPower\|null\.$#'
+			identifier: method.nonObject
+			count: 1
+			path: src/Regressors/Ridge.php
+
+		-
+			message: '#^Call to an undefined method Rubix\\ML\\NeuralNet\\ActivationFunctions\\Base\\Contracts\\ActivationFunction::differentiate\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: src/NeuralNet/Layers/Activation/Activation.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Nodes\\VantagePoint::\$subsets because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Nodes/VantagePoint.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Nodes\\Split::\$subsets because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Nodes/Split.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Nodes\\Isolator::\$subsets because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Nodes/Isolator.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Nodes\\Box::\$subsets because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Nodes/Box.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Nodes\\Ball::\$subsets because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Nodes/Ball.php
+
+		-
+			message: '#^Cannot unset property Rubix\\ML\\Graph\\Trees\\VantageTree::\$root because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: src/Graph/Trees/VantageTree.php
+
+		-
+			message: '#^Possibly invalid array key type float|int|string\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: src/Datasets/Labeled.php
+

phpunit.xml

@@ -12,7 +12,7 @@
   processIsolation="true"
   stopOnFailure="false"
   testdox="true"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
 >
   <source>
     <include>