You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by lr...@apache.org on 2015/11/19 21:47:05 UTC
[23/50] [abbrv] incubator-systemml git commit: [SYSML-353] Update
FullVectorVectorCellwiseCompareOperationTest
[SYSML-353] Update FullVectorVectorCellwiseCompareOperationTest
Removed TARGET_ variables and replaced with references to base class
input/output/expected directory methods.
Moved/Merged loadTestConfiguration before accessing directory methods
to ensure baseDirectory initialized.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/4ee9e108
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/4ee9e108
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/4ee9e108
Branch: refs/heads/master
Commit: 4ee9e1082dfd2c2487b60b45d4a129be76039a81
Parents: dfca928
Author: Glenn Weidner <gw...@us.ibm.com>
Authored: Tue Nov 3 09:59:13 2015 -0300
Committer: Luciano Resende <lr...@apache.org>
Committed: Tue Nov 3 09:59:13 2015 -0300
----------------------------------------------------------------------
...FullVectorVectorCellwiseCompareOperationTest.java | 15 +++++++--------
.../binary/matrix_full_cellwise/ZPackageSuite.java | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ee9e108/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java b/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
index 95033cf..f6b52b7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
+++ b/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
@@ -40,6 +40,7 @@ public class FullVectorVectorCellwiseCompareOperationTest extends AutomatedTestB
private final static String TEST_NAME = "FullVectorVectorCellwiseOperation";
private final static String TEST_DIR = "functions/binary/matrix_full_cellwise/";
+ private final static String TEST_CLASS_DIR = TEST_DIR + FullVectorVectorCellwiseCompareOperationTest.class.getSimpleName() + "/";
private final static double eps = 1e-10;
private final static int rows1 = 1001;
@@ -65,7 +66,7 @@ public class FullVectorVectorCellwiseCompareOperationTest extends AutomatedTestB
@Override
public void setUp()
{
- addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_DIR, TEST_NAME,new String[]{"C"}));
+ addTestConfiguration(TEST_NAME,new TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"C"}));
}
@@ -190,20 +191,18 @@ public class FullVectorVectorCellwiseCompareOperationTest extends AutomatedTestB
case NOT_EQUALS: opcode="!="; opcoder="ne"; break;
}
- TestConfiguration config = getTestConfiguration(TEST_NAME);
+ getAndLoadTestConfiguration(TEST_NAME);
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
programArgs = new String[]{"-stats", "-explain","recompile_runtime","-args",
- HOME + INPUT_DIR + "A",
- HOME + INPUT_DIR + "B",
+ input("A"),
+ input("B"),
opcode,
- HOME + OUTPUT_DIR + "C" };
+ output("C") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
- HOME + INPUT_DIR + " " + opcoder + " " + HOME + EXPECTED_DIR;
-
- loadTestConfiguration(config);
+ inputDir() + " " + opcoder + " " + expectedDir();
//get sparsity
double lsparsity1 = 1.0, lsparsity2 = 1.0;
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4ee9e108/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
----------------------------------------------------------------------
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java b/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
index 4cab7a9..f52be69 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
+++ b/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
@@ -28,6 +28,7 @@ import org.junit.runners.Suite;
FullMatrixVectorColCellwiseOperationTest.class,
FullMatrixVectorRowCellwiseOperationTest.class,
FullVectorVectorCellwiseOperationTest.class,
+ FullVectorVectorCellwiseCompareOperationTest.class,
FullMinus1MultTest.class,
})