From b6b4ffe6a537b6a27829eb00cd9fb1271434440c Mon Sep 17 00:00:00 2001 From: "J. Neugebauer" Date: Tue, 19 Jul 2022 22:52:23 +0200 Subject: [PATCH] =?UTF-8?q?Weitere=20Tests=20eingef=C3=BCgt=20und=20verbes?= =?UTF-8?q?sert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/schule/ngb/zm/ml/MLMatrixTest.java | 17 +++++++++++++++++ .../schule/ngb/zm/ml/NeuralNetworkTest.java | 9 ++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/test/java/schule/ngb/zm/ml/MLMatrixTest.java b/src/test/java/schule/ngb/zm/ml/MLMatrixTest.java index be311f8..2c153f6 100644 --- a/src/test/java/schule/ngb/zm/ml/MLMatrixTest.java +++ b/src/test/java/schule/ngb/zm/ml/MLMatrixTest.java @@ -16,6 +16,23 @@ class MLMatrixTest { this.info = info; } + @ParameterizedTest + @ValueSource( classes = {DoubleMatrix.class, MatrixFactory.ColtMatrix.class} ) + void get( Class mType ) { + MatrixFactory.matrixType = mType; + + MLMatrix M = MatrixFactory.create(new double[][]{ + {1, 2, 3}, + {4, 5, 6} + }); + + assertEquals(mType, M.getClass()); + + assertEquals(1.0, M.get(0,0)); + assertEquals(4.0, M.get(1,0)); + assertEquals(6.0, M.get(1,2)); + } + @ParameterizedTest @ValueSource( classes = {DoubleMatrix.class, MatrixFactory.ColtMatrix.class} ) void initializeOne( Class mType ) { diff --git a/src/test/java/schule/ngb/zm/ml/NeuralNetworkTest.java b/src/test/java/schule/ngb/zm/ml/NeuralNetworkTest.java index f523899..3dca84e 100644 --- a/src/test/java/schule/ngb/zm/ml/NeuralNetworkTest.java +++ b/src/test/java/schule/ngb/zm/ml/NeuralNetworkTest.java @@ -20,8 +20,8 @@ class NeuralNetworkTest { @BeforeAll static void setupMatrixLibrary() { Constants.setSeed(1001); - MatrixFactory.matrixType = MatrixFactory.ColtMatrix.class; - //MatrixFactory.matrixType = DoubleMatrix.class; + //MatrixFactory.matrixType = MatrixFactory.ColtMatrix.class; + MatrixFactory.matrixType = DoubleMatrix.class; } /*@Test @@ -153,12 +153,11 @@ class NeuralNetworkTest { } private List createTrainingSet( int trainingSetSize, CalcType operation ) { - Random random = new Random(); List tuples = new ArrayList<>(); for( int i = 0; i < trainingSetSize; i++ ) { - double s1 = random.nextDouble() * 0.5; - double s2 = random.nextDouble() * 0.5; + double s1 = Constants.random() * 0.5; + double s2 = Constants.random() * 0.5; switch( operation ) { case ADD: