Repository: ignite Updated Branches: refs/heads/master 45ea7eb68 -> fa56a584c
http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java index f83ae7c..e11a669 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTIntegrationTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.ml.math.VectorUtils; import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector; import org.apache.ignite.ml.nn.performance.MnistMLPTestUtil; import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer; @@ -83,7 +84,7 @@ public class DecisionTreeMNISTIntegrationTest extends GridCommonAbstractTest { DecisionTreeNode mdl = trainer.fit( ignite, trainingSet, - (k, v) -> v.getPixels(), + (k, v) -> VectorUtils.of(v.getPixels()), (k, v) -> (double) v.getLabel() ); http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java index c9e9fb2..67456ea 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/performance/DecisionTreeMNISTTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.ml.tree.performance; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.ignite.ml.math.VectorUtils; import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector; import org.apache.ignite.ml.nn.performance.MnistMLPTestUtil; import org.apache.ignite.ml.tree.DecisionTreeClassificationTrainer; @@ -52,7 +53,7 @@ public class DecisionTreeMNISTTest { DecisionTreeNode mdl = trainer.fit( trainingSet, 10, - (k, v) -> v.getPixels(), + (k, v) -> VectorUtils.of(v.getPixels()), (k, v) -> (double) v.getLabel() ); http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java index 2b95d10..eab9152 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestClassifierTrainerTest.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.ignite.ml.composition.ModelOnFeaturesSubspace; import org.apache.ignite.ml.composition.ModelsComposition; import org.apache.ignite.ml.composition.predictionsaggregator.OnMajorityPredictionsAggregator; +import org.apache.ignite.ml.math.VectorUtils; import org.apache.ignite.ml.tree.DecisionTreeConditionalNode; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +69,7 @@ public class RandomForestClassifierTrainerTest { } RandomForestClassifierTrainer trainer = new RandomForestClassifierTrainer(4, 3, 5, 0.3, 4, 0.1); - ModelsComposition model = trainer.fit(sample, parts, (k, v) -> k, (k, v) -> v); + ModelsComposition model = trainer.fit(sample, parts, (k, v) -> VectorUtils.of(k), (k, v) -> v); model.getModels().forEach(m -> { assertTrue(m instanceof ModelOnFeaturesSubspace); assertTrue(((ModelOnFeaturesSubspace) m).getMdl() instanceof DecisionTreeConditionalNode); http://git-wip-us.apache.org/repos/asf/ignite/blob/fa56a584/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java ---------------------------------------------------------------------- diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java index e837c65..0e32e42 100644 --- a/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java +++ b/modules/ml/src/test/java/org/apache/ignite/ml/tree/randomforest/RandomForestRegressionTrainerTest.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.ignite.ml.composition.ModelOnFeaturesSubspace; import org.apache.ignite.ml.composition.ModelsComposition; import org.apache.ignite.ml.composition.predictionsaggregator.MeanValuePredictionsAggregator; +import org.apache.ignite.ml.math.VectorUtils; import org.apache.ignite.ml.tree.DecisionTreeConditionalNode; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +69,7 @@ public class RandomForestRegressionTrainerTest { } RandomForestRegressionTrainer trainer = new RandomForestRegressionTrainer(4, 3, 5, 0.3, 4, 0.1); - ModelsComposition model = trainer.fit(sample, parts, (k, v) -> v, (k, v) -> k); + ModelsComposition model = trainer.fit(sample, parts, (k, v) -> VectorUtils.of(v), (k, v) -> k); model.getModels().forEach(m -> { assertTrue(m instanceof ModelOnFeaturesSubspace); assertTrue(((ModelOnFeaturesSubspace) m).getMdl() instanceof DecisionTreeConditionalNode);
