Repository: systemml Updated Branches: refs/heads/master 7907c0ea5 -> 95bf8cfe6
http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java index 7122f99..92707a0 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java @@ -187,16 +187,11 @@ public class FullDistributionTest extends AutomatedTestBase */ private void runDFTest(TEST_TYPE type, boolean inverse, Double param1, Double param2, ExecType instType) { - //setup multi backend configuration - RUNTIME_PLATFORM platformOld = rtplatform; - switch( instType ){ - case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break; - case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break; - default: rtplatform = RUNTIME_PLATFORM.HYBRID; break; - } boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG; - if( rtplatform == RUNTIME_PLATFORM.SPARK ) - DMLScript.USE_LOCAL_SPARK_CONFIG = true; + RUNTIME_PLATFORM platformOld = setRuntimePlatform(instType); + if(shouldSkipTest()) + return; + try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java index 102656a..67d81e6 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java @@ -51,6 +51,9 @@ public class NotTest extends AutomatedTestBase @Test public void testNot() { + if(shouldSkipTest()) + return; + TestConfiguration config = getTestConfiguration("NotTest"); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java index f73f37f..66e0d40 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java @@ -44,6 +44,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testInt() { + if(shouldSkipTest()) + return; + int value = 0; TestConfiguration config = availableTestConfigurations.get("PrintTest"); @@ -57,6 +60,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testDouble() { + if(shouldSkipTest()) + return; + double value = 1337.3; TestConfiguration config = availableTestConfigurations.get("PrintTest"); @@ -70,6 +76,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testBoolean() { + if(shouldSkipTest()) + return; + String value = "TRUE"; TestConfiguration config = availableTestConfigurations.get("PrintTest"); @@ -83,6 +92,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testString() { + if(shouldSkipTest()) + return; + String value = "\"Hello World!\""; TestConfiguration config = availableTestConfigurations.get("PrintTest"); @@ -96,6 +108,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testStringWithoutMsg() { + if(shouldSkipTest()) + return; + String value = "\"Hello World!\""; TestConfiguration config = availableTestConfigurations.get("PrintTest2"); @@ -109,6 +124,9 @@ public class PrintTest extends AutomatedTestBase @Test public void testPrint() { + if(shouldSkipTest()) + return; + TestConfiguration config = availableTestConfigurations.get("PrintTest3"); loadTestConfiguration(config); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java index 7b1cf10..b642848 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java @@ -43,6 +43,9 @@ public class RoundTest extends AutomatedTestBase @Test public void testRound() { + if(shouldSkipTest()) + return; + getAndLoadTestConfiguration(TEST_NAME); double scalar = 10.7; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java index 76af8a1..ec0f4a7 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java @@ -60,6 +60,9 @@ public class SinTest extends AutomatedTestBase @Test public void testPositive() { + if(shouldSkipTest()) + return; + int intValue = 5; double doubleValue = 5.0; @@ -83,6 +86,9 @@ public class SinTest extends AutomatedTestBase @Test public void testNegative() { + if(shouldSkipTest()) + return; + int intValue = -5; double doubleValue = -5.0; @@ -106,6 +112,9 @@ public class SinTest extends AutomatedTestBase @Test public void testRandom() { + if(shouldSkipTest()) + return; + int intValue = TestUtils.getRandomInt(); double doubleValue = TestUtils.getRandomDouble(); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java index a5a6ae1..fa8b2a3 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java @@ -71,6 +71,9 @@ public class SqrtTest extends AutomatedTestBase @Test public void testPositive() { + if(shouldSkipTest()) + return; + int intValue = 5; double doubleValue = 5.0; @@ -94,6 +97,9 @@ public class SqrtTest extends AutomatedTestBase @Test public void testRandomInt() { + if(shouldSkipTest()) + return; + int intValue = TestUtils.getRandomInt(); TestConfiguration config = availableTestConfigurations.get("RandomIntTest"); @@ -111,6 +117,9 @@ public class SqrtTest extends AutomatedTestBase @Test public void testRandomDouble() { + if(shouldSkipTest()) + return; + double doubleValue = TestUtils.getRandomDouble(); TestConfiguration config = availableTestConfigurations.get("RandomDoubleTest"); @@ -128,6 +137,9 @@ public class SqrtTest extends AutomatedTestBase @Test public void testNegativeInt() { + if(shouldSkipTest()) + return; + int intValue = -5; TestConfiguration config = availableTestConfigurations.get("NegativeIntTest"); @@ -142,6 +154,9 @@ public class SqrtTest extends AutomatedTestBase @Test public void testNegativeDouble() { + if(shouldSkipTest()) + return; + double doubleValue = -5.0; TestConfiguration config = availableTestConfigurations.get("NegativeDoubleTest"); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java index 1232f4a..1c4d27a 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java @@ -56,6 +56,9 @@ public class StopTest extends AutomatedTestBase } public void runStopTest(int test_num, int val) { + if(shouldSkipTest()) + return; + TestConfiguration config = availableTestConfigurations.get("StopTest"); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java index 8ddaab1..c263d79 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java @@ -49,6 +49,8 @@ public class StopTest2 extends AutomatedTestBase } public void runStopTest(int test_num) { + if(shouldSkipTest()) + return; TestConfiguration config = availableTestConfigurations.get("StopTest"); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java index a3eb8a9..b4bef2d 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java @@ -92,8 +92,9 @@ public class StopTestCtrlStr extends AutomatedTestBase private void testLoop(String loop, RUNTIME_PLATFORM rt) { - RUNTIME_PLATFORM oldRT = rtplatform; - rtplatform = rt; + RUNTIME_PLATFORM oldRT = setRuntimePlatform(rt); + if(shouldSkipTest()) + return; getAndLoadTestConfiguration(TEST_NAME); String STOP_HOME = SCRIPT_DIR + TEST_DIR; http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java index 0354762..1cbcba8 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java @@ -60,6 +60,10 @@ public class TanTest extends AutomatedTestBase @Test public void testPositive() { + if(shouldSkipTest()) + return; + + int intValue = 5; double doubleValue = 5.0; @@ -83,6 +87,10 @@ public class TanTest extends AutomatedTestBase @Test public void testNegative() { + if(shouldSkipTest()) + return; + + int intValue = -5; double doubleValue = -5.0; @@ -106,6 +114,9 @@ public class TanTest extends AutomatedTestBase @Test public void testRandom() { + if(shouldSkipTest()) + return; + int intValue = TestUtils.getRandomInt(); double doubleValue = TestUtils.getRandomDouble(); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java index 408ef46..5ea5eee 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/updateinplace/UpdateInPlaceTest.java @@ -226,6 +226,8 @@ public class UpdateInPlaceTest extends AutomatedTestBase private void runUpdateInPlaceTest( String TEST_NAME, int iTestNumber, List<String> listUIPExp, long lTotalUIPVar, long lTotalLixUIP, long lTotalLix) { boolean oldinplace = OptimizerUtils.ALLOW_LOOP_UPDATE_IN_PLACE; + if(shouldSkipTest()) + return; try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java index 63247c6..6f6359e 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java @@ -222,6 +222,9 @@ public class AutoVectorizationTest extends AutomatedTestBase private void runVectorizationTest( String testName ) { String TEST_NAME = testName; + if(shouldSkipTest()) + return; + try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/functions/vect/LeftIndexingChainUpdateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/vect/LeftIndexingChainUpdateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/vect/LeftIndexingChainUpdateTest.java index ceaa3bf..4346eba 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/vect/LeftIndexingChainUpdateTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/vect/LeftIndexingChainUpdateTest.java @@ -74,6 +74,9 @@ public class LeftIndexingChainUpdateTest extends AutomatedTestBase { String TEST_NAME = testName; boolean flag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION; + if(shouldSkipTest()) + return; + try { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextFrameTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextFrameTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextFrameTest.java index abe5de7..f99cde4 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextFrameTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextFrameTest.java @@ -47,7 +47,6 @@ import org.apache.sysml.parser.Expression.ValueType; import org.apache.sysml.runtime.instructions.spark.utils.FrameRDDConverterUtils; import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils; import org.apache.sysml.test.integration.mlcontext.MLContextTest.CommaSeparatedValueStringToDoubleArrayRow; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -289,134 +288,134 @@ public class MLContextFrameTest extends MLContextTestBase { //Validate output schema List<ValueType> lschemaOutA = Arrays.asList(mlResults.getFrameObject("A").getSchema()); List<ValueType> lschemaOutC = Arrays.asList(mlResults.getFrameObject("C").getSchema()); - Assert.assertEquals(ValueType.INT, lschemaOutA.get(0)); - Assert.assertEquals(ValueType.STRING, lschemaOutA.get(1)); - Assert.assertEquals(ValueType.DOUBLE, lschemaOutA.get(2)); - Assert.assertEquals(ValueType.BOOLEAN, lschemaOutA.get(3)); + assertEquals(ValueType.INT, lschemaOutA.get(0)); + assertEquals(ValueType.STRING, lschemaOutA.get(1)); + assertEquals(ValueType.DOUBLE, lschemaOutA.get(2)); + assertEquals(ValueType.BOOLEAN, lschemaOutA.get(3)); - Assert.assertEquals(ValueType.STRING, lschemaOutC.get(0)); - Assert.assertEquals(ValueType.DOUBLE, lschemaOutC.get(1)); + assertEquals(ValueType.STRING, lschemaOutC.get(0)); + assertEquals(ValueType.DOUBLE, lschemaOutC.get(1)); if (outputType == IO_TYPE.JAVA_RDD_STR_CSV) { JavaRDD<String> javaRDDStringCSVA = mlResults.getJavaRDDStringCSV("A"); List<String> linesA = javaRDDStringCSVA.collect(); - Assert.assertEquals("1,Str2,3.0,true", linesA.get(0)); - Assert.assertEquals("4,Str12,13.0,true", linesA.get(1)); - Assert.assertEquals("7,Str25,26.0,false", linesA.get(2)); + assertEquals("1,Str2,3.0,true", linesA.get(0)); + assertEquals("4,Str12,13.0,true", linesA.get(1)); + assertEquals("7,Str25,26.0,false", linesA.get(2)); JavaRDD<String> javaRDDStringCSVC = mlResults.getJavaRDDStringCSV("C"); List<String> linesC = javaRDDStringCSVC.collect(); - Assert.assertEquals("Str12,13.0", linesC.get(0)); - Assert.assertEquals("Str25,26.0", linesC.get(1)); + assertEquals("Str12,13.0", linesC.get(0)); + assertEquals("Str25,26.0", linesC.get(1)); } else if (outputType == IO_TYPE.JAVA_RDD_STR_IJV) { JavaRDD<String> javaRDDStringIJVA = mlResults.getJavaRDDStringIJV("A"); List<String> linesA = javaRDDStringIJVA.collect(); - Assert.assertEquals("1 1 1", linesA.get(0)); - Assert.assertEquals("1 2 Str2", linesA.get(1)); - Assert.assertEquals("1 3 3.0", linesA.get(2)); - Assert.assertEquals("1 4 true", linesA.get(3)); - Assert.assertEquals("2 1 4", linesA.get(4)); - Assert.assertEquals("2 2 Str12", linesA.get(5)); - Assert.assertEquals("2 3 13.0", linesA.get(6)); - Assert.assertEquals("2 4 true", linesA.get(7)); + assertEquals("1 1 1", linesA.get(0)); + assertEquals("1 2 Str2", linesA.get(1)); + assertEquals("1 3 3.0", linesA.get(2)); + assertEquals("1 4 true", linesA.get(3)); + assertEquals("2 1 4", linesA.get(4)); + assertEquals("2 2 Str12", linesA.get(5)); + assertEquals("2 3 13.0", linesA.get(6)); + assertEquals("2 4 true", linesA.get(7)); JavaRDD<String> javaRDDStringIJVC = mlResults.getJavaRDDStringIJV("C"); List<String> linesC = javaRDDStringIJVC.collect(); - Assert.assertEquals("1 1 Str12", linesC.get(0)); - Assert.assertEquals("1 2 13.0", linesC.get(1)); - Assert.assertEquals("2 1 Str25", linesC.get(2)); - Assert.assertEquals("2 2 26.0", linesC.get(3)); + assertEquals("1 1 Str12", linesC.get(0)); + assertEquals("1 2 13.0", linesC.get(1)); + assertEquals("2 1 Str25", linesC.get(2)); + assertEquals("2 2 26.0", linesC.get(3)); } else if (outputType == IO_TYPE.RDD_STR_CSV) { RDD<String> rddStringCSVA = mlResults.getRDDStringCSV("A"); Iterator<String> iteratorA = rddStringCSVA.toLocalIterator(); - Assert.assertEquals("1,Str2,3.0,true", iteratorA.next()); - Assert.assertEquals("4,Str12,13.0,true", iteratorA.next()); - Assert.assertEquals("7,Str25,26.0,false", iteratorA.next()); + assertEquals("1,Str2,3.0,true", iteratorA.next()); + assertEquals("4,Str12,13.0,true", iteratorA.next()); + assertEquals("7,Str25,26.0,false", iteratorA.next()); RDD<String> rddStringCSVC = mlResults.getRDDStringCSV("C"); Iterator<String> iteratorC = rddStringCSVC.toLocalIterator(); - Assert.assertEquals("Str12,13.0", iteratorC.next()); - Assert.assertEquals("Str25,26.0", iteratorC.next()); + assertEquals("Str12,13.0", iteratorC.next()); + assertEquals("Str25,26.0", iteratorC.next()); } else if (outputType == IO_TYPE.RDD_STR_IJV) { RDD<String> rddStringIJVA = mlResults.getRDDStringIJV("A"); Iterator<String> iteratorA = rddStringIJVA.toLocalIterator(); - Assert.assertEquals("1 1 1", iteratorA.next()); - Assert.assertEquals("1 2 Str2", iteratorA.next()); - Assert.assertEquals("1 3 3.0", iteratorA.next()); - Assert.assertEquals("1 4 true", iteratorA.next()); - Assert.assertEquals("2 1 4", iteratorA.next()); - Assert.assertEquals("2 2 Str12", iteratorA.next()); - Assert.assertEquals("2 3 13.0", iteratorA.next()); - Assert.assertEquals("2 4 true", iteratorA.next()); - Assert.assertEquals("3 1 7", iteratorA.next()); - Assert.assertEquals("3 2 Str25", iteratorA.next()); - Assert.assertEquals("3 3 26.0", iteratorA.next()); - Assert.assertEquals("3 4 false", iteratorA.next()); + assertEquals("1 1 1", iteratorA.next()); + assertEquals("1 2 Str2", iteratorA.next()); + assertEquals("1 3 3.0", iteratorA.next()); + assertEquals("1 4 true", iteratorA.next()); + assertEquals("2 1 4", iteratorA.next()); + assertEquals("2 2 Str12", iteratorA.next()); + assertEquals("2 3 13.0", iteratorA.next()); + assertEquals("2 4 true", iteratorA.next()); + assertEquals("3 1 7", iteratorA.next()); + assertEquals("3 2 Str25", iteratorA.next()); + assertEquals("3 3 26.0", iteratorA.next()); + assertEquals("3 4 false", iteratorA.next()); RDD<String> rddStringIJVC = mlResults.getRDDStringIJV("C"); Iterator<String> iteratorC = rddStringIJVC.toLocalIterator(); - Assert.assertEquals("1 1 Str12", iteratorC.next()); - Assert.assertEquals("1 2 13.0", iteratorC.next()); - Assert.assertEquals("2 1 Str25", iteratorC.next()); - Assert.assertEquals("2 2 26.0", iteratorC.next()); + assertEquals("1 1 Str12", iteratorC.next()); + assertEquals("1 2 13.0", iteratorC.next()); + assertEquals("2 1 Str25", iteratorC.next()); + assertEquals("2 2 26.0", iteratorC.next()); } else if (outputType == IO_TYPE.DATAFRAME) { Dataset<Row> dataFrameA = mlResults.getDataFrame("A").drop(RDDConverterUtils.DF_ID_COLUMN); StructType dfschemaA = dataFrameA.schema(); StructField structTypeA = dfschemaA.apply(0); - Assert.assertEquals(DataTypes.LongType, structTypeA.dataType()); + assertEquals(DataTypes.LongType, structTypeA.dataType()); structTypeA = dfschemaA.apply(1); - Assert.assertEquals(DataTypes.StringType, structTypeA.dataType()); + assertEquals(DataTypes.StringType, structTypeA.dataType()); structTypeA = dfschemaA.apply(2); - Assert.assertEquals(DataTypes.DoubleType, structTypeA.dataType()); + assertEquals(DataTypes.DoubleType, structTypeA.dataType()); structTypeA = dfschemaA.apply(3); - Assert.assertEquals(DataTypes.BooleanType, structTypeA.dataType()); + assertEquals(DataTypes.BooleanType, structTypeA.dataType()); List<Row> listAOut = dataFrameA.collectAsList(); Row row1 = listAOut.get(0); - Assert.assertEquals("Mismatch with expected value", Long.valueOf(1), row1.get(0)); - Assert.assertEquals("Mismatch with expected value", "Str2", row1.get(1)); - Assert.assertEquals("Mismatch with expected value", 3.0, row1.get(2)); - Assert.assertEquals("Mismatch with expected value", true, row1.get(3)); + assertEquals("Mismatch with expected value", Long.valueOf(1), row1.get(0)); + assertEquals("Mismatch with expected value", "Str2", row1.get(1)); + assertEquals("Mismatch with expected value", 3.0, row1.get(2)); + assertEquals("Mismatch with expected value", true, row1.get(3)); Row row2 = listAOut.get(1); - Assert.assertEquals("Mismatch with expected value", Long.valueOf(4), row2.get(0)); - Assert.assertEquals("Mismatch with expected value", "Str12", row2.get(1)); - Assert.assertEquals("Mismatch with expected value", 13.0, row2.get(2)); - Assert.assertEquals("Mismatch with expected value", true, row2.get(3)); + assertEquals("Mismatch with expected value", Long.valueOf(4), row2.get(0)); + assertEquals("Mismatch with expected value", "Str12", row2.get(1)); + assertEquals("Mismatch with expected value", 13.0, row2.get(2)); + assertEquals("Mismatch with expected value", true, row2.get(3)); Dataset<Row> dataFrameC = mlResults.getDataFrame("C").drop(RDDConverterUtils.DF_ID_COLUMN); StructType dfschemaC = dataFrameC.schema(); StructField structTypeC = dfschemaC.apply(0); - Assert.assertEquals(DataTypes.StringType, structTypeC.dataType()); + assertEquals(DataTypes.StringType, structTypeC.dataType()); structTypeC = dfschemaC.apply(1); - Assert.assertEquals(DataTypes.DoubleType, structTypeC.dataType()); + assertEquals(DataTypes.DoubleType, structTypeC.dataType()); List<Row> listCOut = dataFrameC.collectAsList(); Row row3 = listCOut.get(0); - Assert.assertEquals("Mismatch with expected value", "Str12", row3.get(0)); - Assert.assertEquals("Mismatch with expected value", 13.0, row3.get(1)); + assertEquals("Mismatch with expected value", "Str12", row3.get(0)); + assertEquals("Mismatch with expected value", 13.0, row3.get(1)); Row row4 = listCOut.get(1); - Assert.assertEquals("Mismatch with expected value", "Str25", row4.get(0)); - Assert.assertEquals("Mismatch with expected value", 26.0, row4.get(1)); + assertEquals("Mismatch with expected value", "Str25", row4.get(0)); + assertEquals("Mismatch with expected value", 26.0, row4.get(1)); } else { String[][] frameA = mlResults.getFrameAs2DStringArray("A"); - Assert.assertEquals("Str2", frameA[0][1]); - Assert.assertEquals("3.0", frameA[0][2]); - Assert.assertEquals("13.0", frameA[1][2]); - Assert.assertEquals("true", frameA[1][3]); - Assert.assertEquals("Str25", frameA[2][1]); + assertEquals("Str2", frameA[0][1]); + assertEquals("3.0", frameA[0][2]); + assertEquals("13.0", frameA[1][2]); + assertEquals("true", frameA[1][3]); + assertEquals("Str25", frameA[2][1]); String[][] frameC = mlResults.getFrameAs2DStringArray("C"); - Assert.assertEquals("Str12", frameC[0][0]); - Assert.assertEquals("Str25", frameC[1][0]); - Assert.assertEquals("13.0", frameC[0][1]); - Assert.assertEquals("26.0", frameC[1][1]); + assertEquals("Str12", frameC[0][0]); + assertEquals("Str25", frameC[1][0]); + assertEquals("13.0", frameC[0][1]); + assertEquals("26.0", frameC[1][1]); } } @@ -428,10 +427,10 @@ public class MLContextFrameTest extends MLContextTestBase { String csvFile = baseDirectory + File.separator + "one-two-three-four.csv"; Script script = dml(s).in("$Min", csvFile).out("M"); String[][] frame = ml.execute(script).getFrameAs2DStringArray("M"); - Assert.assertEquals("one", frame[0][0]); - Assert.assertEquals("two", frame[0][1]); - Assert.assertEquals("three", frame[1][0]); - Assert.assertEquals("four", frame[1][1]); + assertEquals("one", frame[0][0]); + assertEquals("two", frame[0][1]); + assertEquals("three", frame[1][0]); + assertEquals("four", frame[1][1]); } @Test @@ -442,10 +441,10 @@ public class MLContextFrameTest extends MLContextTestBase { String csvFile = baseDirectory + File.separator + "one-two-three-four.csv"; Script script = pydml(s).in("$Min", csvFile).out("M"); String[][] frame = ml.execute(script).getFrameAs2DStringArray("M"); - Assert.assertEquals("one", frame[0][0]); - Assert.assertEquals("two", frame[0][1]); - Assert.assertEquals("three", frame[1][0]); - Assert.assertEquals("four", frame[1][1]); + assertEquals("one", frame[0][0]); + assertEquals("two", frame[0][1]); + assertEquals("three", frame[1][0]); + assertEquals("four", frame[1][1]); } @Test @@ -489,9 +488,9 @@ public class MLContextFrameTest extends MLContextTestBase { .in("s", 2).out("M"); MLResults results = ml.execute(script); double[][] matrix = results.getMatrixAs2DDoubleArray("M"); - Assert.assertEquals(6.0, matrix[0][0], 0.0); - Assert.assertEquals(12.0, matrix[1][0], 0.0); - Assert.assertEquals(18.0, matrix[2][0], 0.0); + assertEquals(6.0, matrix[0][0], 0.0); + assertEquals(12.0, matrix[1][0], 0.0); + assertEquals(18.0, matrix[2][0], 0.0); } @Test @@ -518,9 +517,9 @@ public class MLContextFrameTest extends MLContextTestBase { MLResults results = ml.execute(script); double[][] matrixtA = results.getMatrixAs2DDoubleArray("tA"); - Assert.assertEquals(10.0, matrixtA[0][2], 0.0); - Assert.assertEquals(20.0, matrixtA[1][2], 0.0); - Assert.assertEquals(31.0, matrixtA[2][2], 0.0); + assertEquals(10.0, matrixtA[0][2], 0.0); + assertEquals(20.0, matrixtA[1][2], 0.0); + assertEquals(31.0, matrixtA[2][2], 0.0); Dataset<Row> dataFrame_tA = results.getMatrix("tA").toDF(); System.out.println("Number of matrix tA rows = " + dataFrame_tA.count()); @@ -560,7 +559,7 @@ public class MLContextFrameTest extends MLContextTestBase { MLResults results = ml.execute(script); double[][] matrixtA = results.getMatrixAs2DDoubleArray("tA"); - Assert.assertEquals(1.0, matrixtA[0][2], 0.0); + assertEquals(1.0, matrixtA[0][2], 0.0); Dataset<Row> dataFrame_tA = results.getMatrix("tA").toDF(); System.out.println("Number of matrix tA rows = " + dataFrame_tA.count()); @@ -608,12 +607,12 @@ public class MLContextFrameTest extends MLContextTestBase { // .out("tA", "tAM"); // MLResults results = ml.execute(script); // double[][] matrix = results.getMatrixAs2DDoubleArray("tA"); - // Assert.assertEquals(1.0, matrix[0][0], 0.0); - // Assert.assertEquals(1.0, matrix[0][1], 0.0); - // Assert.assertEquals(2.0, matrix[1][0], 0.0); - // Assert.assertEquals(2.0, matrix[1][1], 0.0); - // Assert.assertEquals(3.0, matrix[2][0], 0.0); - // Assert.assertEquals(3.0, matrix[2][1], 0.0); + // assertEquals(1.0, matrix[0][0], 0.0); + // assertEquals(1.0, matrix[0][1], 0.0); + // assertEquals(2.0, matrix[1][0], 0.0); + // assertEquals(2.0, matrix[1][1], 0.0); + // assertEquals(3.0, matrix[2][0], 0.0); + // assertEquals(3.0, matrix[2][1], 0.0); // // TODO: Add asserts for frame if ordering is as expected // String[][] frame = results.getFrameAs2DStringArray("tAM"); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOptLevelTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOptLevelTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOptLevelTest.java index 87f58a7..a256e30 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOptLevelTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOptLevelTest.java @@ -26,7 +26,6 @@ import org.apache.sysml.api.mlcontext.MLResults; import org.apache.sysml.api.mlcontext.Script; import org.apache.sysml.conf.DMLConfig; import org.apache.sysml.test.utils.TestUtils; -import org.junit.Assert; import org.junit.Test; public class MLContextOptLevelTest extends MLContextTestBase @@ -61,7 +60,7 @@ public class MLContextOptLevelTest extends MLContextTestBase TestUtils.compareScalars(results.getDouble("R"), rows*cols*7, 0.000001); //check correct opt level - Assert.assertTrue(heavyHittersContainsString("+") == (optLevel==1)); + assertTrue(heavyHittersContainsString("+") == (optLevel==1)); } catch(Exception ex) { throw new RuntimeException(ex); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOutputBlocksizeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOutputBlocksizeTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOutputBlocksizeTest.java index af6028c..091d189 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOutputBlocksizeTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextOutputBlocksizeTest.java @@ -33,7 +33,6 @@ import org.apache.sysml.runtime.matrix.MatrixCharacteristics; import org.apache.sysml.runtime.matrix.data.MatrixBlock; import org.apache.sysml.runtime.matrix.data.MatrixIndexes; import org.apache.sysml.runtime.util.DataConverter; -import org.junit.Assert; import org.junit.Test; public class MLContextOutputBlocksizeTest extends MLContextTestBase @@ -90,8 +89,8 @@ public class MLContextOutputBlocksizeTest extends MLContextTestBase //compare output matrix characteristics MatrixCharacteristics mcOut = results.getMatrix("R") .getMatrixMetadata().asMatrixCharacteristics(); - Assert.assertEquals(blksz, mcOut.getRowsPerBlock()); - Assert.assertEquals(blksz, mcOut.getColsPerBlock()); + assertEquals(blksz, mcOut.getRowsPerBlock()); + assertEquals(blksz, mcOut.getColsPerBlock()); } catch(Exception ex) { ex.printStackTrace(); http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java index a9dcb23..345ea7a 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java @@ -29,7 +29,6 @@ import static org.apache.sysml.api.mlcontext.ScriptFactory.pydmlFromFile; import static org.apache.sysml.api.mlcontext.ScriptFactory.pydmlFromInputStream; import static org.apache.sysml.api.mlcontext.ScriptFactory.pydmlFromLocalFile; import static org.apache.sysml.api.mlcontext.ScriptFactory.pydmlFromUrl; -import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileInputStream; @@ -94,7 +93,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - basic builtin constants test"); Script script = dmlFromFile(baseDirectory + File.separator + "builtin-constants-test.dml"); ml.execute(script); - Assert.assertTrue(Statistics.getNoOfExecutedSPInst() == 0); + assertTrue(Statistics.getNoOfExecutedSPInst() == 0); } @Test @@ -110,7 +109,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - eval rewrite test"); Script script = dmlFromFile(baseDirectory + File.separator + "eval2-test.dml"); ml.execute(script); - Assert.assertTrue(Statistics.getNoOfExecutedSPInst() == 0); + assertTrue(Statistics.getNoOfExecutedSPInst() == 0); } @Test @@ -1052,10 +1051,10 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output double array matrix DML"); String s = "M = matrix('1 2 3 4', rows=2, cols=2);"; double[][] matrix = ml.execute(dml(s).out("M")).getMatrixAs2DDoubleArray("M"); - Assert.assertEquals(1.0, matrix[0][0], 0); - Assert.assertEquals(2.0, matrix[0][1], 0); - Assert.assertEquals(3.0, matrix[1][0], 0); - Assert.assertEquals(4.0, matrix[1][1], 0); + assertEquals(1.0, matrix[0][0], 0); + assertEquals(2.0, matrix[0][1], 0); + assertEquals(3.0, matrix[1][0], 0); + assertEquals(4.0, matrix[1][1], 0); } @Test @@ -1063,10 +1062,10 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output double array matrix PYDML"); String s = "M = full('1 2 3 4', rows=2, cols=2)"; double[][] matrix = ml.execute(pydml(s).out("M")).getMatrixAs2DDoubleArray("M"); - Assert.assertEquals(1.0, matrix[0][0], 0); - Assert.assertEquals(2.0, matrix[0][1], 0); - Assert.assertEquals(3.0, matrix[1][0], 0); - Assert.assertEquals(4.0, matrix[1][1], 0); + assertEquals(1.0, matrix[0][0], 0); + assertEquals(2.0, matrix[0][1], 0); + assertEquals(3.0, matrix[1][0], 0); + assertEquals(4.0, matrix[1][1], 0); } @Test @@ -1074,7 +1073,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar long DML"); String s = "m = 5;"; long result = ml.execute(dml(s).out("m")).getLong("m"); - Assert.assertEquals(5, result); + assertEquals(5, result); } @Test @@ -1082,7 +1081,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar long PYDML"); String s = "m = 5"; long result = ml.execute(pydml(s).out("m")).getLong("m"); - Assert.assertEquals(5, result); + assertEquals(5, result); } @Test @@ -1090,7 +1089,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar double DML"); String s = "m = 1.23"; double result = ml.execute(dml(s).out("m")).getDouble("m"); - Assert.assertEquals(1.23, result, 0); + assertEquals(1.23, result, 0); } @Test @@ -1098,7 +1097,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar double PYDML"); String s = "m = 1.23"; double result = ml.execute(pydml(s).out("m")).getDouble("m"); - Assert.assertEquals(1.23, result, 0); + assertEquals(1.23, result, 0); } @Test @@ -1106,7 +1105,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar boolean DML"); String s = "m = FALSE;"; boolean result = ml.execute(dml(s).out("m")).getBoolean("m"); - Assert.assertEquals(false, result); + assertEquals(false, result); } @Test @@ -1114,7 +1113,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar boolean PYDML"); String s = "m = False"; boolean result = ml.execute(pydml(s).out("m")).getBoolean("m"); - Assert.assertEquals(false, result); + assertEquals(false, result); } @Test @@ -1122,7 +1121,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar string DML"); String s = "m = 'hello';"; String result = ml.execute(dml(s).out("m")).getString("m"); - Assert.assertEquals("hello", result); + assertEquals("hello", result); } @Test @@ -1130,7 +1129,7 @@ public class MLContextTest extends MLContextTestBase { System.out.println("MLContextTest - output scalar string PYDML"); String s = "m = 'hello'"; String result = ml.execute(pydml(s).out("m")).getString("m"); - Assert.assertEquals("hello", result); + assertEquals("hello", result); } @Test @@ -1164,10 +1163,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringIJV = results.getJavaRDDStringIJV("M"); List<String> lines = javaRDDStringIJV.collect(); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1179,10 +1178,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringIJV = results.getJavaRDDStringIJV("M"); List<String> lines = javaRDDStringIJV.collect(); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1194,8 +1193,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringCSV = results.getJavaRDDStringCSV("M"); List<String> lines = javaRDDStringCSV.collect(); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1207,8 +1206,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringCSV = results.getJavaRDDStringCSV("M"); List<String> lines = javaRDDStringCSV.collect(); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } /** @@ -1224,8 +1223,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringCSV = results.getJavaRDDStringCSV("M"); List<String> lines = javaRDDStringCSV.collect(); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } /** @@ -1241,8 +1240,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringCSV = results.getJavaRDDStringCSV("M"); List<String> lines = javaRDDStringCSV.collect(); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1254,10 +1253,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringIJV = results.getRDDStringIJV("M"); Iterator<String> iterator = rddStringIJV.toLocalIterator(); - Assert.assertEquals("1 1 1.0", iterator.next()); - Assert.assertEquals("1 2 2.0", iterator.next()); - Assert.assertEquals("2 1 3.0", iterator.next()); - Assert.assertEquals("2 2 4.0", iterator.next()); + assertEquals("1 1 1.0", iterator.next()); + assertEquals("1 2 2.0", iterator.next()); + assertEquals("2 1 3.0", iterator.next()); + assertEquals("2 2 4.0", iterator.next()); } @Test @@ -1269,10 +1268,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringIJV = results.getRDDStringIJV("M"); Iterator<String> iterator = rddStringIJV.toLocalIterator(); - Assert.assertEquals("1 1 1.0", iterator.next()); - Assert.assertEquals("1 2 2.0", iterator.next()); - Assert.assertEquals("2 1 3.0", iterator.next()); - Assert.assertEquals("2 2 4.0", iterator.next()); + assertEquals("1 1 1.0", iterator.next()); + assertEquals("1 2 2.0", iterator.next()); + assertEquals("2 1 3.0", iterator.next()); + assertEquals("2 2 4.0", iterator.next()); } @Test @@ -1284,8 +1283,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringCSV = results.getRDDStringCSV("M"); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1297,8 +1296,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringCSV = results.getRDDStringCSV("M"); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1310,8 +1309,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringCSV = results.getRDDStringCSV("M"); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1323,8 +1322,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); RDD<String> rddStringCSV = results.getRDDStringCSV("M"); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1337,14 +1336,14 @@ public class MLContextTest extends MLContextTestBase { Dataset<Row> dataFrame = results.getDataFrame("M"); List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -1357,14 +1356,14 @@ public class MLContextTest extends MLContextTestBase { Dataset<Row> dataFrame = results.getDataFrame("M"); List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -1378,12 +1377,12 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(1)).toArray(), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(1)).toArray(), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(1)).toArray(), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(1)).toArray(), 0.0); } @Test @@ -1397,12 +1396,12 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(1)).toArray(), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(1)).toArray(), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(1)).toArray(), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(1)).toArray(), 0.0); } @Test @@ -1419,7 +1418,7 @@ public class MLContextTest extends MLContextTestBase { Assert.assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(0)).toArray(), 0.0); Row row2 = list.get(1); - Assert.assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(0)).toArray(), 0.0); + assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(0)).toArray(), 0.0); } @Test @@ -1433,10 +1432,10 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(0)).toArray(), 0.0); + assertArrayEquals(new double[] { 1.0, 2.0 }, ((Vector) row1.get(0)).toArray(), 0.0); Row row2 = list.get(1); - Assert.assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(0)).toArray(), 0.0); + assertArrayEquals(new double[] { 3.0, 4.0 }, ((Vector) row2.get(0)).toArray(), 0.0); } @Test @@ -1450,14 +1449,14 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -1471,14 +1470,14 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -1492,12 +1491,12 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(2.0, row1.getDouble(1), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(2.0, row1.getDouble(1), 0.0); Row row2 = list.get(1); - Assert.assertEquals(3.0, row2.getDouble(0), 0.0); - Assert.assertEquals(4.0, row2.getDouble(1), 0.0); + assertEquals(3.0, row2.getDouble(0), 0.0); + assertEquals(4.0, row2.getDouble(1), 0.0); } @Test @@ -1511,12 +1510,12 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = dataFrame.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(2.0, row1.getDouble(1), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(2.0, row1.getDouble(1), 0.0); Row row2 = list.get(1); - Assert.assertEquals(3.0, row2.getDouble(0), 0.0); - Assert.assertEquals(4.0, row2.getDouble(1), 0.0); + assertEquals(3.0, row2.getDouble(0), 0.0); + assertEquals(4.0, row2.getDouble(1), 0.0); } @Test @@ -1526,12 +1525,12 @@ public class MLContextTest extends MLContextTestBase { double[][] m1 = new double[][] { { 1.0, 2.0 }, { 3.0, 4.0 } }; String s1 = "sum1 = sum(m1);"; double sum1 = ml.execute(dml(s1).in("m1", m1).out("sum1")).getDouble("sum1"); - Assert.assertEquals(10.0, sum1, 0.0); + assertEquals(10.0, sum1, 0.0); double[][] m2 = new double[][] { { 5.0, 6.0 }, { 7.0, 8.0 } }; String s2 = "sum2 = sum(m2);"; double sum2 = ml.execute(dml(s2).in("m2", m2).out("sum2")).getDouble("sum2"); - Assert.assertEquals(26.0, sum2, 0.0); + assertEquals(26.0, sum2, 0.0); } @Test @@ -1541,12 +1540,12 @@ public class MLContextTest extends MLContextTestBase { double[][] m1 = new double[][] { { 1.0, 2.0 }, { 3.0, 4.0 } }; String s1 = "sum1 = sum(m1)"; double sum1 = ml.execute(pydml(s1).in("m1", m1).out("sum1")).getDouble("sum1"); - Assert.assertEquals(10.0, sum1, 0.0); + assertEquals(10.0, sum1, 0.0); double[][] m2 = new double[][] { { 5.0, 6.0 }, { 7.0, 8.0 } }; String s2 = "sum2 = sum(m2)"; double sum2 = ml.execute(pydml(s2).in("m2", m2).out("sum2")).getDouble("sum2"); - Assert.assertEquals(26.0, sum2, 0.0); + assertEquals(26.0, sum2, 0.0); } @Test @@ -1558,14 +1557,14 @@ public class MLContextTest extends MLContextTestBase { double[][] m1 = new double[][] { { 1.0, 2.0 }, { 3.0, 4.0 } }; script.setScriptString("sum1 = sum(m1);").in("m1", m1).out("sum1"); ml.execute(script); - Assert.assertEquals(10.0, script.results().getDouble("sum1"), 0.0); + assertEquals(10.0, script.results().getDouble("sum1"), 0.0); script.clearAll(); double[][] m2 = new double[][] { { 5.0, 6.0 }, { 7.0, 8.0 } }; script.setScriptString("sum2 = sum(m2);").in("m2", m2).out("sum2"); ml.execute(script); - Assert.assertEquals(26.0, script.results().getDouble("sum2"), 0.0); + assertEquals(26.0, script.results().getDouble("sum2"), 0.0); } @Test @@ -1577,14 +1576,14 @@ public class MLContextTest extends MLContextTestBase { double[][] m1 = new double[][] { { 1.0, 2.0 }, { 3.0, 4.0 } }; script.setScriptString("sum1 = sum(m1)").in("m1", m1).out("sum1"); ml.execute(script); - Assert.assertEquals(10.0, script.results().getDouble("sum1"), 0.0); + assertEquals(10.0, script.results().getDouble("sum1"), 0.0); script.clearAll(); double[][] m2 = new double[][] { { 5.0, 6.0 }, { 7.0, 8.0 } }; script.setScriptString("sum2 = sum(m2)").in("m2", m2).out("sum2"); ml.execute(script); - Assert.assertEquals(26.0, script.results().getDouble("sum2"), 0.0); + assertEquals(26.0, script.results().getDouble("sum2"), 0.0); } @Test @@ -1616,11 +1615,11 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(dml(s).out("M", "N")); double[][] matrix = results.getMatrixAs2DDoubleArray("M"); double sum = results.getDouble("N"); - Assert.assertEquals(1.0, matrix[0][0], 0); - Assert.assertEquals(2.0, matrix[0][1], 0); - Assert.assertEquals(3.0, matrix[1][0], 0); - Assert.assertEquals(4.0, matrix[1][1], 0); - Assert.assertEquals(10.0, sum, 0); + assertEquals(1.0, matrix[0][0], 0); + assertEquals(2.0, matrix[0][1], 0); + assertEquals(3.0, matrix[1][0], 0); + assertEquals(4.0, matrix[1][1], 0); + assertEquals(10.0, sum, 0); } @Test @@ -1632,11 +1631,11 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(pydml(s).out("M", "N")); double[][] matrix = results.getMatrixAs2DDoubleArray("M"); double sum = results.getDouble("N"); - Assert.assertEquals(1.0, matrix[0][0], 0); - Assert.assertEquals(2.0, matrix[0][1], 0); - Assert.assertEquals(3.0, matrix[1][0], 0); - Assert.assertEquals(4.0, matrix[1][1], 0); - Assert.assertEquals(10.0, sum, 0); + assertEquals(1.0, matrix[0][0], 0); + assertEquals(2.0, matrix[0][1], 0); + assertEquals(3.0, matrix[1][0], 0); + assertEquals(4.0, matrix[1][1], 0); + assertEquals(10.0, sum, 0); } @Test @@ -1646,8 +1645,8 @@ public class MLContextTest extends MLContextTestBase { MatrixObject mo = ml.execute(dml(s).out("M")).getMatrixObject("M"); RDD<String> rddStringCSV = MLContextConversionUtil.matrixObjectToRDDStringCSV(mo); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1657,8 +1656,8 @@ public class MLContextTest extends MLContextTestBase { MatrixObject mo = ml.execute(pydml(s).out("M")).getMatrixObject("M"); RDD<String> rddStringCSV = MLContextConversionUtil.matrixObjectToRDDStringCSV(mo); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0", iterator.next()); - Assert.assertEquals("3.0,4.0", iterator.next()); + assertEquals("1.0,2.0", iterator.next()); + assertEquals("3.0,4.0", iterator.next()); } @Test @@ -1683,7 +1682,7 @@ public class MLContextTest extends MLContextTestBase { MatrixBlock matrixBlock = m.toMatrixBlock(); Script script = dml("avg = avg(M);").in("M", matrixBlock).out("avg"); double avg = ml.execute(script).getDouble("avg"); - Assert.assertEquals(50.0, avg, 0.0); + assertEquals(50.0, avg, 0.0); } @Test @@ -1708,7 +1707,7 @@ public class MLContextTest extends MLContextTestBase { MatrixBlock matrixBlock = m.toMatrixBlock(); Script script = pydml("avg = avg(M)").in("M", matrixBlock).out("avg"); double avg = ml.execute(script).getDouble("avg"); - Assert.assertEquals(50.0, avg, 0.0); + assertEquals(50.0, avg, 0.0); } @Test @@ -1723,10 +1722,10 @@ public class MLContextTest extends MLContextTestBase { JavaRDD<String> javaRDDStringIJV = RDDConverterUtils.binaryBlockToTextCell(binaryBlocks, mc); List<String> lines = javaRDDStringIJV.collect(); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1741,10 +1740,10 @@ public class MLContextTest extends MLContextTestBase { JavaRDD<String> javaRDDStringIJV = RDDConverterUtils.binaryBlockToTextCell(binaryBlocks, mc); List<String> lines = javaRDDStringIJV.collect(); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1756,8 +1755,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringCSV(mo); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1769,8 +1768,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringCSV(mo); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1782,8 +1781,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringCSV(mo); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1795,8 +1794,8 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringCSV(mo); - Assert.assertEquals("1.0,2.0", lines.get(0)); - Assert.assertEquals("3.0,4.0", lines.get(1)); + assertEquals("1.0,2.0", lines.get(0)); + assertEquals("3.0,4.0", lines.get(1)); } @Test @@ -1808,10 +1807,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringIJV(mo); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1823,10 +1822,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringIJV(mo); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1838,10 +1837,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringIJV(mo); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -1853,10 +1852,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); MatrixObject mo = results.getMatrixObject("M"); List<String> lines = MLContextConversionUtil.matrixObjectToListStringIJV(mo); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -2744,8 +2743,8 @@ public class MLContextTest extends MLContextTestBase { List<String> outputs = Arrays.asList("x", "y"); Script script = dml("a=1;x=a+1;y=x+1").out(outputs); MLResults results = ml.execute(script); - Assert.assertEquals(2, results.getLong("x")); - Assert.assertEquals(3, results.getLong("y")); + assertEquals(2, results.getLong("x")); + assertEquals(3, results.getLong("y")); } @Test @@ -2755,8 +2754,8 @@ public class MLContextTest extends MLContextTestBase { List<String> outputs = Arrays.asList("x", "y"); Script script = pydml("a=1\nx=a+1\ny=x+1").out(outputs); MLResults results = ml.execute(script); - Assert.assertEquals(2, results.getLong("x")); - Assert.assertEquals(3, results.getLong("y")); + assertEquals(2, results.getLong("x")); + assertEquals(3, results.getLong("y")); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -2768,8 +2767,8 @@ public class MLContextTest extends MLContextTestBase { Seq seq = JavaConversions.asScalaBuffer(outputs).toSeq(); Script script = dml("a=1;x=a+1;y=x+1").out(seq); MLResults results = ml.execute(script); - Assert.assertEquals(2, results.getLong("x")); - Assert.assertEquals(3, results.getLong("y")); + assertEquals(2, results.getLong("x")); + assertEquals(3, results.getLong("y")); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -2781,8 +2780,8 @@ public class MLContextTest extends MLContextTestBase { Seq seq = JavaConversions.asScalaBuffer(outputs).toSeq(); Script script = pydml("a=1\nx=a+1\ny=x+1").out(seq); MLResults results = ml.execute(script); - Assert.assertEquals(2, results.getLong("x")); - Assert.assertEquals(3, results.getLong("y")); + assertEquals(2, results.getLong("x")); + assertEquals(3, results.getLong("y")); } @Test @@ -2800,22 +2799,22 @@ public class MLContextTest extends MLContextTestBase { StructField[] fields = schema.fields(); StructField idColumn = fields[0]; StructField vectorColumn = fields[1]; - Assert.assertTrue(idColumn.dataType() instanceof DoubleType); - Assert.assertTrue(vectorColumn.dataType() instanceof VectorUDT); + assertTrue(idColumn.dataType() instanceof DoubleType); + assertTrue(vectorColumn.dataType() instanceof VectorUDT); List<Row> list = sortedDF.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); Vector v1 = (DenseVector) row1.get(1); double[] arr1 = v1.toArray(); - Assert.assertArrayEquals(new double[] { 1.0, 2.0 }, arr1, 0.0); + assertArrayEquals(new double[] { 1.0, 2.0 }, arr1, 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); Vector v2 = (DenseVector) row2.get(1); double[] arr2 = v2.toArray(); - Assert.assertArrayEquals(new double[] { 3.0, 4.0 }, arr2, 0.0); + assertArrayEquals(new double[] { 3.0, 4.0 }, arr2, 0.0); } @Test @@ -2824,10 +2823,10 @@ public class MLContextTest extends MLContextTestBase { String s = "M = matrix('1 2 3 4', rows=2, cols=2);"; double[][] matrix = ml.execute(dml(s).out("M")).getMatrix("M").to2DDoubleArray(); - Assert.assertEquals(1.0, matrix[0][0], 0); - Assert.assertEquals(2.0, matrix[0][1], 0); - Assert.assertEquals(3.0, matrix[1][0], 0); - Assert.assertEquals(4.0, matrix[1][1], 0); + assertEquals(1.0, matrix[0][0], 0); + assertEquals(2.0, matrix[0][1], 0); + assertEquals(3.0, matrix[1][0], 0); + assertEquals(4.0, matrix[1][1], 0); } @Test @@ -2840,14 +2839,14 @@ public class MLContextTest extends MLContextTestBase { Dataset<Row> sortedDF = df.sort(RDDConverterUtils.DF_ID_COLUMN); List<Row> list = sortedDF.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -2860,10 +2859,10 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = df.collectAsList(); Row row = list.get(0); - Assert.assertEquals(1.0, row.getDouble(0), 0.0); - Assert.assertEquals(2.0, row.getDouble(1), 0.0); - Assert.assertEquals(3.0, row.getDouble(2), 0.0); - Assert.assertEquals(4.0, row.getDouble(3), 0.0); + assertEquals(1.0, row.getDouble(0), 0.0); + assertEquals(2.0, row.getDouble(1), 0.0); + assertEquals(3.0, row.getDouble(2), 0.0); + assertEquals(4.0, row.getDouble(3), 0.0); } @Test @@ -2877,14 +2876,14 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = sortedDF.collectAsList(); Row row1 = list.get(0); - Assert.assertEquals(1.0, row1.getDouble(0), 0.0); - Assert.assertEquals(1.0, row1.getDouble(1), 0.0); - Assert.assertEquals(2.0, row1.getDouble(2), 0.0); + assertEquals(1.0, row1.getDouble(0), 0.0); + assertEquals(1.0, row1.getDouble(1), 0.0); + assertEquals(2.0, row1.getDouble(2), 0.0); Row row2 = list.get(1); - Assert.assertEquals(2.0, row2.getDouble(0), 0.0); - Assert.assertEquals(3.0, row2.getDouble(1), 0.0); - Assert.assertEquals(4.0, row2.getDouble(2), 0.0); + assertEquals(2.0, row2.getDouble(0), 0.0); + assertEquals(3.0, row2.getDouble(1), 0.0); + assertEquals(4.0, row2.getDouble(2), 0.0); } @Test @@ -2897,7 +2896,7 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = df.collectAsList(); Row row = list.get(0); - Assert.assertArrayEquals(new double[] { 1.0, 2.0, 3.0, 4.0 }, ((Vector) row.get(0)).toArray(), 0.0); + assertArrayEquals(new double[] { 1.0, 2.0, 3.0, 4.0 }, ((Vector) row.get(0)).toArray(), 0.0); } @Test @@ -2910,8 +2909,8 @@ public class MLContextTest extends MLContextTestBase { List<Row> list = df.collectAsList(); Row row = list.get(0); - Assert.assertEquals(1.0, row.getDouble(0), 0.0); - Assert.assertArrayEquals(new double[] { 1.0, 2.0, 3.0, 4.0 }, ((Vector) row.get(1)).toArray(), 0.0); + assertEquals(1.0, row.getDouble(0), 0.0); + assertArrayEquals(new double[] { 1.0, 2.0, 3.0, 4.0 }, ((Vector) row.get(1)).toArray(), 0.0); } @Test @@ -2922,7 +2921,7 @@ public class MLContextTest extends MLContextTestBase { Script script = dml(s).out("M"); JavaRDD<String> javaRDDStringCSV = ml.execute(script).getMatrix("M").toJavaRDDStringCSV(); List<String> lines = javaRDDStringCSV.collect(); - Assert.assertEquals("1.0,2.0,3.0,4.0", lines.get(0)); + assertEquals("1.0,2.0,3.0,4.0", lines.get(0)); } @Test @@ -2934,10 +2933,10 @@ public class MLContextTest extends MLContextTestBase { MLResults results = ml.execute(script); JavaRDD<String> javaRDDStringIJV = results.getJavaRDDStringIJV("M"); List<String> lines = javaRDDStringIJV.sortBy(row -> row, true, 1).collect(); - Assert.assertEquals("1 1 1.0", lines.get(0)); - Assert.assertEquals("1 2 2.0", lines.get(1)); - Assert.assertEquals("2 1 3.0", lines.get(2)); - Assert.assertEquals("2 2 4.0", lines.get(3)); + assertEquals("1 1 1.0", lines.get(0)); + assertEquals("1 2 2.0", lines.get(1)); + assertEquals("2 1 3.0", lines.get(2)); + assertEquals("2 2 4.0", lines.get(3)); } @Test @@ -2948,7 +2947,7 @@ public class MLContextTest extends MLContextTestBase { Script script = dml(s).out("M"); RDD<String> rddStringCSV = ml.execute(script).getMatrix("M").toRDDStringCSV(); Iterator<String> iterator = rddStringCSV.toLocalIterator(); - Assert.assertEquals("1.0,2.0,3.0,4.0", iterator.next()); + assertEquals("1.0,2.0,3.0,4.0", iterator.next()); } @Test @@ -2960,10 +2959,10 @@ public class MLContextTest extends MLContextTestBase { RDD<String> rddStringIJV = ml.execute(script).getMatrix("M").toRDDStringIJV(); String[] rows = (String[]) rddStringIJV.collect(); Arrays.sort(rows); - Assert.assertEquals("1 1 1.0", rows[0]); - Assert.assertEquals("1 2 2.0", rows[1]); - Assert.assertEquals("2 1 3.0", rows[2]); - Assert.assertEquals("2 2 4.0", rows[3]); + assertEquals("1 1 1.0", rows[0]); + assertEquals("1 2 2.0", rows[1]); + assertEquals("2 1 3.0", rows[2]); + assertEquals("2 2 4.0", rows[3]); } @Test @@ -2972,7 +2971,7 @@ public class MLContextTest extends MLContextTestBase { String version = ml.version(); // not available until jar built - Assert.assertEquals(MLContextUtil.VERSION_NOT_AVAILABLE, version); + assertEquals(MLContextUtil.VERSION_NOT_AVAILABLE, version); } @Test @@ -2981,7 +2980,7 @@ public class MLContextTest extends MLContextTestBase { String buildTime = ml.buildTime(); // not available until jar built - Assert.assertEquals(MLContextUtil.BUILD_TIME_NOT_AVAILABLE, buildTime); + assertEquals(MLContextUtil.BUILD_TIME_NOT_AVAILABLE, buildTime); } @Test @@ -3014,9 +3013,9 @@ public class MLContextTest extends MLContextTestBase { Tuple2<MatrixIndexes, MatrixBlock> first = binaryBlocks.first(); MatrixBlock mb = first._2(); double[][] matrix = DataConverter.convertToDoubleMatrix(mb); - Assert.assertArrayEquals(new double[] { 1.0, 2.0, 3.0 }, matrix[0], 0.0); - Assert.assertArrayEquals(new double[] { 4.0, 5.0, 6.0 }, matrix[1], 0.0); - Assert.assertArrayEquals(new double[] { 7.0, 8.0, 9.0 }, matrix[2], 0.0); + assertArrayEquals(new double[] { 1.0, 2.0, 3.0 }, matrix[0], 0.0); + assertArrayEquals(new double[] { 4.0, 5.0, 6.0 }, matrix[1], 0.0); + assertArrayEquals(new double[] { 7.0, 8.0, 9.0 }, matrix[2], 0.0); } @Test @@ -3035,15 +3034,15 @@ public class MLContextTest extends MLContextTestBase { Script script = dml("N=M*2").in("M", df).out("N"); Tuple1<Matrix> tuple = ml.execute(script).getTuple("N"); double[][] n = tuple._1().to2DDoubleArray(); - Assert.assertEquals(2.0, n[0][0], 0); - Assert.assertEquals(4.0, n[0][1], 0); - Assert.assertEquals(6.0, n[0][2], 0); - Assert.assertEquals(8.0, n[1][0], 0); - Assert.assertEquals(10.0, n[1][1], 0); - Assert.assertEquals(12.0, n[1][2], 0); - Assert.assertEquals(14.0, n[2][0], 0); - Assert.assertEquals(16.0, n[2][1], 0); - Assert.assertEquals(18.0, n[2][2], 0); + assertEquals(2.0, n[0][0], 0); + assertEquals(4.0, n[0][1], 0); + assertEquals(6.0, n[0][2], 0); + assertEquals(8.0, n[1][0], 0); + assertEquals(10.0, n[1][1], 0); + assertEquals(12.0, n[1][2], 0); + assertEquals(14.0, n[2][0], 0); + assertEquals(16.0, n[2][1], 0); + assertEquals(18.0, n[2][2], 0); } @Test @@ -3056,9 +3055,9 @@ public class MLContextTest extends MLContextTestBase { Tuple2<Matrix, Double> tuple = ml.execute(script).getTuple("N", "s"); double[][] n = tuple._1().to2DDoubleArray(); double s = tuple._2(); - Assert.assertArrayEquals(new double[] { 2, 4 }, n[0], 0.0); - Assert.assertArrayEquals(new double[] { 6, 8 }, n[1], 0.0); - Assert.assertEquals(20.0, s, 0.0); + assertArrayEquals(new double[] { 2, 4 }, n[0], 0.0); + assertArrayEquals(new double[] { 6, 8 }, n[1], 0.0); + assertEquals(20.0, s, 0.0); } @Test @@ -3070,9 +3069,9 @@ public class MLContextTest extends MLContextTestBase { long a = tuple._1(); double b = tuple._2(); boolean c = tuple._3(); - Assert.assertEquals(3, a); - Assert.assertEquals(3.5, b, 0.0); - Assert.assertEquals(true, c); + assertEquals(3, a); + assertEquals(3.5, b, 0.0); + assertEquals(true, c); } @Test @@ -3085,10 +3084,10 @@ public class MLContextTest extends MLContextTestBase { double b = tuple._2(); boolean c = tuple._3(); String d = tuple._4(); - Assert.assertEquals(3, a); - Assert.assertEquals(3.5, b, 0.0); - Assert.assertEquals(true, c); - Assert.assertEquals("yes it's TRUE", d); + assertEquals(3, a); + assertEquals(3.5, b, 0.0); + assertEquals(true, c); + assertEquals("yes it's TRUE", d); } } http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/integration/mlcontext/algorithms/MLContextUnivariateStatisticsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/algorithms/MLContextUnivariateStatisticsTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/algorithms/MLContextUnivariateStatisticsTest.java index 09b1677..528786c 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/algorithms/MLContextUnivariateStatisticsTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/algorithms/MLContextUnivariateStatisticsTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.log4j.Logger; import org.apache.sysml.api.mlcontext.Script; import org.apache.sysml.test.integration.mlcontext.MLContextTestBase; -import org.junit.Assert; import org.junit.Test; public class MLContextUnivariateStatisticsTest extends MLContextTestBase { @@ -63,10 +62,10 @@ public class MLContextUnivariateStatisticsTest extends MLContextTestBase { univarStats.in("A", matrix).in("K", types).out("baseStats"); double[][] stats = ml.execute(univarStats).getMatrix("baseStats").to2DDoubleArray(); log.debug("Stats for scale column:\n" + getMatrixAsString(stats)); - Assert.assertEquals(1.0, stats[0][0], 0); // minimum - Assert.assertEquals(4.0, stats[1][0], 0); // maximum - Assert.assertEquals(2.4, stats[3][0], 0); // average - Assert.assertEquals(2.0, stats[12][0], 0); // mean + assertEquals(1.0, stats[0][0], 0); // minimum + assertEquals(4.0, stats[1][0], 0); // maximum + assertEquals(2.4, stats[3][0], 0); // average + assertEquals(2.0, stats[12][0], 0); // mean } @Test @@ -77,9 +76,9 @@ public class MLContextUnivariateStatisticsTest extends MLContextTestBase { univarStats.in("A", matrix).in("K", types).out("baseStats"); double[][] stats = ml.execute(univarStats).getMatrix("baseStats").to2DDoubleArray(); log.debug("Stats for categorical column:\n" + getMatrixAsString(stats)); - Assert.assertEquals(4.0, stats[14][0], 0); // number of categories - Assert.assertEquals(2.0, stats[15][0], 0); // mode - Assert.assertEquals(1.0, stats[16][0], 0); // number of modes + assertEquals(4.0, stats[14][0], 0); // number of categories + assertEquals(2.0, stats[15][0], 0); // mode + assertEquals(1.0, stats[16][0], 0); // number of modes } private static void replaceColumnWithRandomInts(double[][] matrix, int whichColumn, int lowValue, int highValue) { http://git-wip-us.apache.org/repos/asf/systemml/blob/95bf8cfe/src/test/java/org/apache/sysml/test/utils/TestUtils.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/utils/TestUtils.java b/src/test/java/org/apache/sysml/test/utils/TestUtils.java index 29745c5..16786ea 100644 --- a/src/test/java/org/apache/sysml/test/utils/TestUtils.java +++ b/src/test/java/org/apache/sysml/test/utils/TestUtils.java @@ -125,7 +125,7 @@ public class TestUtils * @param epsilon */ public static void compareDMLMatrixWithJavaMatrixRowsOutOfOrder(String expectedFile, String actualDir, double epsilon) - { + { try { HashMap<CellIndex, Double> expectedValues = new HashMap<CellIndex, Double>(); @@ -364,7 +364,7 @@ public class TestUtils * @return */ public static HashMap<CellIndex, Double> readDMLMatrixFromHDFS(String filePath) - { + { HashMap<CellIndex, Double> expectedValues = new HashMap<CellIndex, Double>(); try @@ -404,7 +404,7 @@ public class TestUtils * @return */ public static HashMap<CellIndex, Double> readRMatrixFromFS(String filePath) - { + { HashMap<CellIndex, Double> expectedValues = new HashMap<CellIndex, Double>(); BufferedReader reader = null; @@ -485,8 +485,7 @@ public class TestUtils return Double.NaN; } - public static boolean readDMLBoolean(String filePath) { - try { + public static boolean readDMLBoolean(String filePath) {try { Boolean b = null; Path outDirectory = new Path(filePath); FileSystem fs = IOUtilFunctions.getFileSystem(outDirectory, conf); @@ -694,7 +693,7 @@ public class TestUtils } public static void compareScalars(String expected, String actual) { - assertEquals(expected, actual); + assertEquals(expected, actual); } public static boolean compareMatrices(HashMap<CellIndex, Double> m1, HashMap<CellIndex, Double> m2, @@ -854,6 +853,7 @@ public class TestUtils * @return */ public static HashMap<CellIndex, Double> convert2DDoubleArrayToHashMap(double[][] matrix) { + HashMap<CellIndex, Double> hmMatrix = new HashMap<CellIndex, Double>(); for (int i = 0; i < matrix.length; i++) { for (int j = 0; j < matrix[i].length; j++) {
