Skip to content

Commit 22908af

Browse files
author
Aleksandr
committed
IGNITE-28240 fix ml tests
1 parent 5dabca1 commit 22908af

31 files changed

Lines changed: 99 additions & 95 deletions

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansTrainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import org.apache.ignite.ml.clustering.kmeans.KMeansModel;
2323
import org.apache.ignite.ml.clustering.kmeans.KMeansTrainer;
24-
import org.apache.ignite.ml.common.TrainerTest;
24+
import org.apache.ignite.ml.common.TrainerTestBase;
2525
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2626
import org.apache.ignite.ml.dataset.feature.extractor.impl.DoubleArrayVectorizer;
2727
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
@@ -37,7 +37,7 @@
3737
/**
3838
* Tests for {@link KMeansTrainer}.
3939
*/
40-
public class KMeansTrainerTest extends TrainerTest {
40+
public class KMeansTrainerTest extends TrainerTestBase {
4141
/** Precision in test checks. */
4242
private static final double PRECISION = 1e-2;
4343

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/clustering/gmm/GmmTrainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Arrays;
2121
import java.util.HashMap;
2222
import java.util.Map;
23-
import org.apache.ignite.ml.common.TrainerTest;
23+
import org.apache.ignite.ml.common.TrainerTestBase;
2424
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2525
import org.apache.ignite.ml.dataset.feature.extractor.impl.DoubleArrayVectorizer;
2626
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
@@ -31,7 +31,7 @@
3131
/**
3232
* Tests for GMM trainer.
3333
*/
34-
public class GmmTrainerTest extends TrainerTest {
34+
public class GmmTrainerTest extends TrainerTestBase {
3535
/** Data. */
3636
private static final Map<Integer, double[]> data = new HashMap<>();
3737

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/common/TrainerTest.java renamed to modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/common/TrainerTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Basic fields and methods for the trainer tests.
2929
*/
3030
@RunWith(Parameterized.class)
31-
public class TrainerTest {
31+
public class TrainerTestBase {
3232
/** Number of parts to be tested. */
3333
private static final int[] partsToBeTested = new int[] {1, 2, 3, 4, 13};
3434

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/composition/StackingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.ignite.IgniteCache;
2121
import org.apache.ignite.ml.IgniteModel;
2222
import org.apache.ignite.ml.TestUtils;
23-
import org.apache.ignite.ml.common.TrainerTest;
23+
import org.apache.ignite.ml.common.TrainerTestBase;
2424
import org.apache.ignite.ml.composition.stacking.StackedDatasetTrainer;
2525
import org.apache.ignite.ml.composition.stacking.StackedModel;
2626
import org.apache.ignite.ml.composition.stacking.StackedVectorDatasetTrainer;
@@ -54,7 +54,7 @@
5454
/**
5555
* Tests stacked trainers.
5656
*/
57-
public class StackingTest extends TrainerTest {
57+
public class StackingTest extends TrainerTestBase {
5858
/** Rule to check exceptions. */
5959
@Rule
6060
public ExpectedException thrown = ExpectedException.none();

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/composition/bagging/BaggingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import org.apache.ignite.ml.IgniteModel;
2323
import org.apache.ignite.ml.TestUtils;
24-
import org.apache.ignite.ml.common.TrainerTest;
24+
import org.apache.ignite.ml.common.TrainerTestBase;
2525
import org.apache.ignite.ml.composition.combinators.parallel.ModelsParallelComposition;
2626
import org.apache.ignite.ml.composition.predictionsaggregator.MeanValuePredictionsAggregator;
2727
import org.apache.ignite.ml.composition.predictionsaggregator.OnMajorityPredictionsAggregator;
@@ -48,7 +48,7 @@
4848
/**
4949
* Tests for bagging algorithm.
5050
*/
51-
public class BaggingTest extends TrainerTest {
51+
public class BaggingTest extends TrainerTestBase {
5252
/**
5353
* Dependency of weights of first model in ensemble after training in
5454
* {@link BaggingTest#testNaiveBaggingLogRegression()}. This dependency is tested to ensure that it is

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/composition/boosting/GDBTrainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import java.util.function.BiFunction;
2323
import org.apache.ignite.ml.IgniteModel;
24-
import org.apache.ignite.ml.common.TrainerTest;
24+
import org.apache.ignite.ml.common.TrainerTestBase;
2525
import org.apache.ignite.ml.composition.ModelsComposition;
2626
import org.apache.ignite.ml.composition.boosting.convergence.mean.MeanAbsValueConvergenceCheckerFactory;
2727
import org.apache.ignite.ml.composition.boosting.convergence.simple.ConvergenceCheckerStubFactory;
@@ -41,7 +41,7 @@
4141
import static org.junit.Assert.assertTrue;
4242

4343
/** */
44-
public class GDBTrainerTest extends TrainerTest {
44+
public class GDBTrainerTest extends TrainerTestBase {
4545
/** */
4646
@Test
4747
public void testFitRegression() {

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/knn/ANNClassificationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.HashMap;
2121
import java.util.Map;
2222
import org.apache.ignite.ml.TestUtils;
23-
import org.apache.ignite.ml.common.TrainerTest;
23+
import org.apache.ignite.ml.common.TrainerTestBase;
2424
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2525
import org.apache.ignite.ml.dataset.feature.extractor.impl.DoubleArrayVectorizer;
2626
import org.apache.ignite.ml.knn.ann.ANNClassificationModel;
@@ -33,7 +33,7 @@
3333
import static org.junit.Assert.assertTrue;
3434

3535
/** Tests behaviour of ANNClassificationTest. */
36-
public class ANNClassificationTest extends TrainerTest {
36+
public class ANNClassificationTest extends TrainerTestBase {
3737
/** */
3838
@Test
3939
public void testBinaryClassification() {

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/knn/KNNRegressionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.util.HashMap;
2121
import java.util.Map;
22-
import org.apache.ignite.ml.common.TrainerTest;
22+
import org.apache.ignite.ml.common.TrainerTestBase;
2323
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2424
import org.apache.ignite.ml.dataset.feature.extractor.impl.DoubleArrayVectorizer;
2525
import org.apache.ignite.ml.dataset.impl.local.LocalDatasetBuilder;
@@ -37,7 +37,7 @@
3737
/**
3838
* Tests for {@link KNNRegressionTrainer}.
3939
*/
40-
public class KNNRegressionTest extends TrainerTest {
40+
public class KNNRegressionTest extends TrainerTestBase {
4141
/** */
4242
@Test
4343
public void testSimpleRegressionWithOneNeighbour() {

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/math/isolve/lsqr/LSQROnHeapTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.HashMap;
2121
import java.util.Map;
2222
import org.apache.ignite.ml.TestUtils;
23-
import org.apache.ignite.ml.common.TrainerTest;
23+
import org.apache.ignite.ml.common.TrainerTestBase;
2424
import org.apache.ignite.ml.dataset.DatasetBuilder;
2525
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2626
import org.apache.ignite.ml.dataset.feature.extractor.impl.DummyVectorizer;
@@ -41,7 +41,7 @@
4141
/**
4242
* Tests for {@link LSQROnHeap}.
4343
*/
44-
public class LSQROnHeapTest extends TrainerTest {
44+
public class LSQROnHeapTest extends TrainerTestBase {
4545
/** Tests solving simple linear system. */
4646
@Test
4747
public void testSolveLinearSystem() {

modules/ml-ext/ml/src/test/java/org/apache/ignite/ml/multiclass/OneVsRestTrainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323
import java.util.Map;
2424
import org.apache.ignite.ml.TestUtils;
25-
import org.apache.ignite.ml.common.TrainerTest;
25+
import org.apache.ignite.ml.common.TrainerTestBase;
2626
import org.apache.ignite.ml.dataset.feature.extractor.Vectorizer;
2727
import org.apache.ignite.ml.dataset.feature.extractor.impl.DoubleArrayVectorizer;
2828
import org.apache.ignite.ml.math.primitives.vector.Vector;
@@ -38,7 +38,7 @@
3838
/**
3939
* Tests for {@link OneVsRestTrainer}.
4040
*/
41-
public class OneVsRestTrainerTest extends TrainerTest {
41+
public class OneVsRestTrainerTest extends TrainerTestBase {
4242
/**
4343
* Test trainer on 2 linearly separable sets.
4444
*/

0 commit comments

Comments
 (0)