You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2017/10/13 03:46:31 UTC
[2/8] systemml git commit: [MINOR] Cleanup various issues raised by
static code analysis, part 3
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
index ae37819..5533022 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
@@ -489,22 +489,12 @@ public class FullReblockTest extends AutomatedTestBase
rtplatform = platformOld;
DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
- if( !success )
+ if( !success )
LOG.error("FullReblockTest failed with seed="+seed1+", seed2="+seed2);
}
}
- /**
- *
- * @param ii
- * @param rows
- * @param cols
- * @param brows
- * @param bcols
- * @return
- * @throws IOException
- */
- private double[][] readMatrix( String fname, InputInfo ii, long rows, long cols, int brows, int bcols )
+ private static double[][] readMatrix( String fname, InputInfo ii, long rows, long cols, int brows, int bcols )
throws IOException
{
MatrixBlock mb = DataConverter.readMatrixFromHDFS(fname, ii, rows, cols, brows, bcols);
@@ -512,19 +502,7 @@ public class FullReblockTest extends AutomatedTestBase
return C;
}
- /**
- *
- * @param A
- * @param dir
- * @param oi
- * @param rows
- * @param cols
- * @param brows
- * @param bcols
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols )
+ private static void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols )
throws DMLRuntimeException, IOException
{
MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, brows, bcols);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java b/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
index 283e095..8b434c7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
@@ -99,11 +99,11 @@ public class DynProjectTest extends AutomatedTestBase
rCmd = getRCmd(inputDir(), expectedDir());
long seed = System.nanoTime();
- double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, seed);
- double[][] c = round(getRandomMatrix(1, size, 1-0.49, rows+0.49, 1, seed));
-
- writeInputMatrix("X", X, true);
- writeInputMatrix("c", c, true);
+ double[][] X = getRandomMatrix(rows, cols, 0, 1, sparsity, seed);
+ double[][] c = TestUtils.round(getRandomMatrix(1, size, 1-0.49, rows+0.49, 1, seed));
+
+ writeInputMatrix("X", X, true);
+ writeInputMatrix("c", c, true);
runTest(true, false, null, -1);
runRScript(true);
@@ -113,17 +113,4 @@ public class DynProjectTest extends AutomatedTestBase
HashMap<CellIndex, Double> rfile = readRMatrixFromFS("Y.mtx");
TestUtils.compareMatrices(dmlfile, rfile, eps, "DML", "R");
}
-
- /**
- *
- * @param data
- * @return
- */
- private double[][] round(double[][] data)
- {
- for(int i=0; i<data.length; i++)
- for(int j=0; j<data[i].length; j++)
- data[i][j]=Math.round(data[i][j]);
- return data;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameAppendDistTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameAppendDistTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameAppendDistTest.java
index ccb91f4..2294b1f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameAppendDistTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameAppendDistTest.java
@@ -211,7 +211,7 @@ public class FrameAppendDistTest extends AutomatedTestBase
return schemaMixedLarge;
}
- private void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
+ private static void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
for ( int i=0; i<frame1.getNumRows(); i++ )
for( int j=0; j<frame1.getNumColumns(); j++ ) {
Object val1 = UtilFunctions.stringToObject(schema[j], UtilFunctions.objectToString(frame1.get(i, j)));
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java
index ad309aa..3cd14c7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameConverterTest.java
@@ -386,13 +386,7 @@ public class FrameConverterTest extends AutomatedTestBase
}
}
- /**
- *
- * @param frame
- * @param data
- * @param lschema
- */
- private void initFrameData(FrameBlock frame, double[][] data, ValueType[] lschema) {
+ private static void initFrameData(FrameBlock frame, double[][] data, ValueType[] lschema) {
Object[] row1 = new Object[lschema.length];
for( int i=0; i<rows; i++ ) {
for( int j=0; j<lschema.length; j++ )
@@ -401,30 +395,19 @@ public class FrameConverterTest extends AutomatedTestBase
frame.appendRow(row1);
}
}
-
- /**
- *
- * @param frame1
- * @param frame2
- */
- private void verifyFrameData(FrameBlock frame1, FrameBlock frame2) {
+
+ private static void verifyFrameData(FrameBlock frame1, FrameBlock frame2) {
for ( int i=0; i<frame1.getNumRows(); i++ )
for( int j=0; j<frame1.getNumColumns(); j++ ) {
String val1 = UtilFunctions.objectToString(frame1.get(i, j));
- String val2 = UtilFunctions.objectToString(frame2.get(i, j));
+ String val2 = UtilFunctions.objectToString(frame2.get(i, j));
if( UtilFunctions.compareTo(ValueType.STRING, val1, val2) != 0)
Assert.fail("The original data for cell ("+ i + "," + j + ") is " + val1 +
", not same as the converted value " + val2);
}
}
-
-
- /**
- *
- * @param frame1
- * @param frame2
- */
- private void verifyFrameMatrixData(FrameBlock frame, MatrixBlock matrix) {
+
+ private static void verifyFrameMatrixData(FrameBlock frame, MatrixBlock matrix) {
for ( int i=0; i<frame.getNumRows(); i++ )
for( int j=0; j<frame.getNumColumns(); j++ ) {
Object val1 = UtilFunctions.doubleToObject(frame.getSchema()[j],
@@ -448,11 +431,11 @@ public class FrameConverterTest extends AutomatedTestBase
*/
@SuppressWarnings("unchecked")
- private void runConverter(ConvType type, MatrixCharacteristics mc, MatrixCharacteristics mcMatrix,
+ private static void runConverter(ConvType type, MatrixCharacteristics mc, MatrixCharacteristics mcMatrix,
List<ValueType> schema, String fnameIn, String fnameOut)
throws DMLRuntimeException, IOException
{
- SparkExecutionContext sec = (SparkExecutionContext) ExecutionContextFactory.createContext();
+ SparkExecutionContext sec = (SparkExecutionContext) ExecutionContextFactory.createContext();
JavaSparkContext sc = sec.getSparkContext();
ValueType[] lschema = schema.toArray(new ValueType[0]);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingDistTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingDistTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingDistTest.java
index 1d435c4..fc37042 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingDistTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingDistTest.java
@@ -265,7 +265,7 @@ public class FrameIndexingDistTest extends AutomatedTestBase
}
}
- private void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
+ private static void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
for ( int i=0; i<frame1.getNumRows(); i++ )
for( int j=0; j<frame1.getNumColumns(); j++ ) {
Object val1 = UtilFunctions.stringToObject(schema[j], UtilFunctions.objectToString(frame1.get(i, j)));
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixCastingTest.java
index fba037d..05f9136 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixCastingTest.java
@@ -184,18 +184,7 @@ public class FrameMatrixCastingTest extends AutomatedTestBase
}
}
- /**
- *
- * @param fname
- * @param A
- * @param rows
- * @param cols
- * @param dt
- * @param vt
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private void writeMatrixOrFrameInput(String fname, double[][] A, int rows, int cols, DataType dt, ValueType vt)
+ private static void writeMatrixOrFrameInput(String fname, double[][] A, int rows, int cols, DataType dt, ValueType vt)
throws DMLRuntimeException, IOException
{
int blksize = ConfigurationManager.getBlocksize();
@@ -218,17 +207,7 @@ public class FrameMatrixCastingTest extends AutomatedTestBase
}
- /**
- *
- * @param fname
- * @param rows
- * @param cols
- * @param dt
- * @return
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private double[][] readMatrixOrFrameInput(String fname, int rows, int cols, DataType dt)
+ private static double[][] readMatrixOrFrameInput(String fname, int rows, int cols, DataType dt)
throws DMLRuntimeException, IOException
{
MatrixBlock ret = null;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
index c629eee..e11aeb9 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixReblockTest.java
@@ -179,13 +179,6 @@ public class FrameMatrixReblockTest extends AutomatedTestBase
runFrameReblockTest(TEST_NAME1, true, true, "csv", ExecType.SPARK);
}
- /**
- *
- * @param testname
- * @param multColBlks
- * @param ofmt
- * @param et
- */
private void runFrameReblockTest( String testname, boolean multColBlks, boolean sparse, String ofmt, ExecType et)
{
//rtplatform for MR
@@ -233,17 +226,7 @@ public class FrameMatrixReblockTest extends AutomatedTestBase
}
}
- /**
- *
- * @param fname
- * @param ofmt
- * @param frame
- * @param rows
- * @param cols
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private void writeFrameInput(String fname, String ofmt, double[][] frame, int rows, int cols)
+ private static void writeFrameInput(String fname, String ofmt, double[][] frame, int rows, int cols)
throws DMLRuntimeException, IOException
{
MatrixBlock mb = DataConverter.convertToMatrixBlock(frame);
@@ -255,17 +238,7 @@ public class FrameMatrixReblockTest extends AutomatedTestBase
writer.writeFrameToHDFS(fb, fname, rows, cols);
}
- /**
- *
- * @param fname
- * @param rows
- * @param cols
- * @param ofmt
- * @return
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private double[][] readMatrixOutput(String fname, String ofmt, int rows, int cols)
+ private static double[][] readMatrixOutput(String fname, String ofmt, int rows, int cols)
throws DMLRuntimeException, IOException
{
MatrixReader reader = MatrixReaderFactory.createMatrixReader(InputInfo.stringExternalToInputInfo(ofmt));
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
index 7e28640..aaac262 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameMatrixWriteTest.java
@@ -170,17 +170,7 @@ public class FrameMatrixWriteTest extends AutomatedTestBase
}
}
- /**
- *
- * @param fname
- * @param ofmt
- * @param rows
- * @param cols
- * @return
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private double[][] readFrameInput(String fname, String ofmt, int rows, int cols)
+ private static double[][] readFrameInput(String fname, String ofmt, int rows, int cols)
throws DMLRuntimeException, IOException
{
//read input data
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
index 1bf215a..bd9f138 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameSchemaReadTest.java
@@ -155,13 +155,7 @@ public class FrameSchemaReadTest extends AutomatedTestBase
}
}
- /**
- *
- * @param frame
- * @param data
- * @param lschema
- */
- private void initFrameData(FrameBlock frame, double[][] data, ValueType[] lschema) {
+ private static void initFrameData(FrameBlock frame, double[][] data, ValueType[] lschema) {
Object[] row1 = new Object[lschema.length];
for( int i=0; i<rows; i++ ) {
for( int j=0; j<lschema.length; j++ )
@@ -171,13 +165,7 @@ public class FrameSchemaReadTest extends AutomatedTestBase
}
}
- /**
- *
- * @param lschema
- * @param wildcard
- * @return
- */
- private String getSchemaString( ValueType[] lschema, boolean wildcard ) {
+ private static String getSchemaString( ValueType[] lschema, boolean wildcard ) {
if( wildcard )
return "*";
StringBuilder ret = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
index d26779c..c6dc9b8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
@@ -254,24 +254,10 @@ public class SeqParReadTest extends AutomatedTestBase {
}
}
-
- /**
- *
- * @param A
- * @param dir
- * @param oi
- * @param rows
- * @param cols
- * @param brows
- * @param bcols
- * @throws DMLRuntimeException
- * @throws IOException
- */
- private void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols, long nnz )
+ private static void writeMatrix( double[][] A, String fname, OutputInfo oi, long rows, long cols, int brows, int bcols, long nnz )
throws DMLRuntimeException, IOException
{
MapReduceTool.deleteFileWithMTDIfExistOnHDFS(fname);
-
MatrixCharacteristics mc = new MatrixCharacteristics(rows, cols, brows, bcols, nnz);
MatrixBlock mb = DataConverter.convertToMatrixBlock(A);
DataConverter.writeMatrixToHDFS(mb, fname, oi, mc);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
index 1209f70..418769c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameCastingTest.java
@@ -97,7 +97,7 @@ public class FrameCastingTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", new Double(data[i][j]), new Double(cF1[i][j]));
}
- private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
+ private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -106,7 +106,7 @@ public class FrameCastingTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
index 59ac69d..ea0c8d5 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameDecodeTest.java
@@ -97,7 +97,7 @@ public class FrameDecodeTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
+ private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -106,7 +106,7 @@ public class FrameDecodeTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
index 7309763..b2c8bb7 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameEncodeTest.java
@@ -96,7 +96,7 @@ public class FrameEncodeTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
+ private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -105,7 +105,7 @@ public class FrameEncodeTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
index 1e62af9..19afe29 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameIndexingAppendTest.java
@@ -97,7 +97,7 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
+ private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -106,7 +106,7 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
index 5b07e09..ca4b60c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameLeftIndexingTest.java
@@ -97,7 +97,7 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
+ private static ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -106,7 +106,7 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
index 89c4053..7fb6bfd 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameTransformTest.java
@@ -98,7 +98,7 @@ public class FrameTransformTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[0][0]+".", new Double(8), new Double(data[0][0]));
}
- private ArrayList<double[][]> execDMLScriptviaJMLC( String testname, String[][] X, String[][] M, boolean modelReuse)
+ private static ArrayList<double[][]> execDMLScriptviaJMLC( String testname, String[][] X, String[][] M, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -107,7 +107,7 @@ public class FrameTransformTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
//prepare input arguments
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
index b8ad575..5304688 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/MulticlassSVMScoreTest.java
@@ -117,7 +117,7 @@ public class MulticlassSVMScoreTest extends AutomatedTestBase
}
}
- private ArrayList<double[][]> execDMLScriptviaJMLC( ArrayList<double[][]> X)
+ private static ArrayList<double[][]> execDMLScriptviaJMLC( ArrayList<double[][]> X)
throws IOException
{
Timing time = new Timing(true);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
index 1a1d572..2ed066d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/ReuseModelVariablesTest.java
@@ -113,7 +113,7 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
Assert.assertEquals(Xset.size(), Yset.size());
}
- private ArrayList<double[][]> execDMLScriptviaJMLC( String testname, ArrayList<double[][]> X, boolean modelReuse)
+ private static ArrayList<double[][]> execDMLScriptviaJMLC( String testname, ArrayList<double[][]> X, boolean modelReuse)
throws IOException
{
Timing time = new Timing(true);
@@ -122,7 +122,7 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
//establish connection to SystemML
Connection conn = new Connection();
-
+
try
{
// For now, JMLC pipeline only allows dml
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
index 989c4bd..29bc8a3 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
@@ -291,7 +291,7 @@ public class DataFrameVectorFrameConversionTest extends AutomatedTestBase
}
@SuppressWarnings("resource")
- private Dataset<Row> createDataFrame(SparkSession sparkSession, MatrixBlock mb, boolean containsID, ValueType[] schema)
+ private static Dataset<Row> createDataFrame(SparkSession sparkSession, MatrixBlock mb, boolean containsID, ValueType[] schema)
throws DMLRuntimeException
{
//create in-memory list of rows
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
index 55b8371..c17e0e2 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
@@ -280,7 +280,7 @@ public class DataFrameVectorScriptTest extends MLContextTestBase
}
@SuppressWarnings("resource")
- private Dataset<Row> createDataFrame(SparkSession sparkSession, MatrixBlock mb, boolean containsID, ValueType[] schema)
+ private static Dataset<Row> createDataFrame(SparkSession sparkSession, MatrixBlock mb, boolean containsID, ValueType[] schema)
throws DMLRuntimeException
{
//create in-memory list of rows
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
index 382f433..60a285a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/FrameTest.java
@@ -345,7 +345,7 @@ public class FrameTest extends MLContextTestBase
}
}
- private void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
+ private static void verifyFrameData(FrameBlock frame1, FrameBlock frame2, ValueType[] schema) {
for ( int i=0; i<frame1.getNumRows(); i++ )
for( int j=0; j<frame1.getNumColumns(); j++ ) {
Object val1 = UtilFunctions.stringToObject(schema[j], UtilFunctions.objectToString(frame1.get(i, j)));
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
index b469649..8d8c815 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
@@ -118,7 +118,7 @@ public class ParForNaNResultMergeTest extends AutomatedTestBase
*
* @param ret
*/
- private HashMap<CellIndex, Double> replaceNaNValues(HashMap<CellIndex, Double> in)
+ private static HashMap<CellIndex, Double> replaceNaNValues(HashMap<CellIndex, Double> in)
{
HashMap<CellIndex, Double> out = new HashMap<CellIndex, Double>();
double NaN = 0d/0d;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
index 343d846..194bcc8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
@@ -313,15 +313,15 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
{
Dkind[i]=(i%3)+1;//kind 1,2,3
if( Dkind[i]!=1 )
- round(D,i); //for ordinal and categorical vars
+ TestUtils.floor(D,i); //for ordinal and categorical vars
}
writeInputMatrix("D", D, true);
//generate attribute sets
- double[][] S1 = getRandomMatrix(1, cols, 1, cols+1-eps, 1, 1112);
- double[][] S2 = getRandomMatrix(1, cols, 1, cols+1-eps, 1, 1113);
- round(S1);
- round(S2);
+ double[][] S1 = getRandomMatrix(1, cols, 1, cols+1-eps, 1, 1112);
+ double[][] S2 = getRandomMatrix(1, cols, 1, cols+1-eps, 1, 1113);
+ TestUtils.floor(S1);
+ TestUtils.floor(S2);
writeInputMatrix("S1", S1, true);
writeInputMatrix("S2", S2, true);
@@ -350,16 +350,4 @@ public class ParForRulebasedOptimizerTest extends AutomatedTestBase
TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R");
}
}
-
- private void round(double[][] data) {
- for(int i=0; i<data.length; i++)
- for(int j=0; j<data[i].length; j++)
- data[i][j]=Math.floor(data[i][j]);
- }
-
- private void round(double[][] data, int col) {
- for(int i=0; i<data.length; i++)
- data[i][col]=Math.floor(data[i][col]);
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
index 3ac563d..1f20197 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
@@ -87,7 +87,7 @@ public class RandJobRecompileTest extends AutomatedTestBase
OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = estSizeEval;
- double[][] V = round( getRandomMatrix(rows, cols, min, max, 1.0d, 7) );
+ double[][] V = TestUtils.round( getRandomMatrix(rows, cols, min, max, 1.0d, 7) );
writeInputMatrix("X", V, true);
runTest(true, false, null, -1);
@@ -110,17 +110,4 @@ public class RandJobRecompileTest extends AutomatedTestBase
OptimizerUtils.ALLOW_WORSTCASE_SIZE_EXPRESSION_EVALUATION = oldFlagSizeEval;
}
}
-
- /**
- *
- * @param data
- * @return
- */
- private double[][] round( double[][] data )
- {
- for( int i=0; i<data.length; i++ )
- for( int j=0; j<data[i].length; j++ )
- data[i][j] = Math.round(data[i][j]);
- return data;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockGetFirstIndex.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockGetFirstIndex.java b/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockGetFirstIndex.java
index e2800eb..a105adc 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockGetFirstIndex.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockGetFirstIndex.java
@@ -250,15 +250,7 @@ public class SparseBlockGetFirstIndex extends AutomatedTestBase
}
}
- /**
- *
- * @param A
- * @param rix
- * @param cix
- * @param type
- * @return
- */
- private int getFirstIx( double[][] A, int rix, int cix, IndexType type ) {
+ private static int getFirstIx( double[][] A, int rix, int cix, IndexType type ) {
if( type==IndexType.GT ) {
for( int j=cix+1; j<cols; j++ )
if( A[rix][j] != 0 )
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockMemEstimate.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockMemEstimate.java b/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockMemEstimate.java
index 8d2fbd0..c68fb83 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockMemEstimate.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/sparse/SparseBlockMemEstimate.java
@@ -53,13 +53,8 @@ public class SparseBlockMemEstimate extends AutomatedTestBase
public void testSparseBlockUltraSparse() {
runSparseBlockMemoryTest(sparsity2);
}
-
- /**
- *
- * @param btype
- * @param sparsity
- */
- private void runSparseBlockMemoryTest( double sparsity)
+
+ private static void runSparseBlockMemoryTest( double sparsity)
{
double memMCSR = SparseBlockFactory.estimateSizeSparseInMemory(SparseBlock.Type.MCSR, rows, cols, sparsity);
double memCSR = SparseBlockFactory.estimateSizeSparseInMemory(SparseBlock.Type.CSR, rows, cols, sparsity);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
index 97859ac..a147a8f 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
@@ -257,7 +257,7 @@ public class CTableSequenceTest extends AutomatedTestBase
rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset (always dense because values <=0 invalid)
- double[][] A = floor(getRandomMatrix(rows, 1, 1, maxVal, 1.0, 7), rows, 1);
+ double[][] A = TestUtils.floor(getRandomMatrix(rows, 1, 1, maxVal, 1.0, 7));
writeInputMatrix("A", A, true);
runTest(true, false, null, -1);
@@ -274,28 +274,11 @@ public class CTableSequenceTest extends AutomatedTestBase
int expectedNumCompiled = ((et==ExecType.CP) ? 2 :(rewrite ? 4 : 6))+(withAgg ? 1 : 0);
checkNumCompiledMRJobs(expectedNumCompiled);
}
-
}
- finally
- {
+ finally {
rtplatform = platformOld;
DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
TernaryOp.ALLOW_CTABLE_SEQUENCE_REWRITES = rewriteOld;
}
}
-
- /**
- *
- * @param X
- * @param rows
- * @param cols
- * @return
- */
- private double[][] floor( double[][] X, int rows, int cols )
- {
- for( int i=0; i<rows; i++ )
- for( int j=0; j<cols; j++ )
- X[i][j] = Math.floor(X[i][j]);
- return X;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
index 4dbe6b6..2c51ad8 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
@@ -30,6 +30,7 @@ import org.apache.sysml.lops.LopProperties.ExecType;
import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
public class TableOutputTest extends AutomatedTestBase
{
@@ -145,9 +146,9 @@ public class TableOutputTest extends AutomatedTestBase
rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
//generate actual dataset (always dense because values <=0 invalid)
- double[][] A = floor(getRandomMatrix(rows, 1, 1, maxVal1, 1.0, -1), rows, 1);
+ double[][] A = TestUtils.floor(getRandomMatrix(rows, 1, 1, maxVal1, 1.0, -1));
writeInputMatrixWithMTD("A", A, true);
- double[][] B = floor(getRandomMatrix(rows, 1, 1, maxVal2, 1.0, -1), rows, 1);
+ double[][] B = TestUtils.floor(getRandomMatrix(rows, 1, 1, maxVal2, 1.0, -1));
writeInputMatrixWithMTD("B", B, true);
runTest(true, false, null, -1);
@@ -200,19 +201,4 @@ public class TableOutputTest extends AutomatedTestBase
DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
}
}
-
- /**
- *
- * @param X
- * @param rows
- * @param cols
- * @return
- */
- private double[][] floor( double[][] X, int rows, int cols )
- {
- for( int i=0; i<rows; i++ )
- for( int j=0; j<cols; j++ )
- X[i][j] = Math.floor(X[i][j]);
- return X;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformEncodeDecodeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformEncodeDecodeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformEncodeDecodeTest.java
index 9146183..c50e760 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformEncodeDecodeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformEncodeDecodeTest.java
@@ -149,13 +149,7 @@ public class TransformEncodeDecodeTest extends AutomatedTestBase
}
}
- /**
- *
- * @param input
- * @param groupBy
- * @return
- */
- private HashMap<String, Long> getCounts(FrameBlock input, int groupBy) {
+ private static HashMap<String, Long> getCounts(FrameBlock input, int groupBy) {
HashMap<String, Long> ret = new HashMap<String, Long>();
for( int i=0; i<input.getNumRows(); i++ ) {
String key = input.get(i, groupBy).toString();
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
index 7861a8b..4dca2b0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
@@ -352,11 +352,9 @@ public class ReplaceTest extends AutomatedTestBase
}
}
- private void replaceRandom( double[][] A, int rows, int cols, double replacement, int len )
- {
+ private static void replaceRandom( double[][] A, int rows, int cols, double replacement, int len ) {
Random rand = new Random();
for( int i=0; i<len; i++ )
A[rand.nextInt(rows-1)][rand.nextInt(cols-1)] = replacement;
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 3502ef2..a3eb8a9 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
@@ -119,7 +119,7 @@ public class StopTestCtrlStr extends AutomatedTestBase
rtplatform = oldRT;
}
- private int findIndexAtCutoff(double[][] vector, double cutoff) {
+ private static int findIndexAtCutoff(double[][] vector, double cutoff) {
int i=1;
while(i<=vector.length) {
if(vector[i-1][0] > cutoff)
@@ -128,5 +128,4 @@ public class StopTestCtrlStr extends AutomatedTestBase
}
return i;
}
-
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextMultipleScriptsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextMultipleScriptsTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextMultipleScriptsTest.java
index 9b58322..bdc33bf 100644
--- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextMultipleScriptsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextMultipleScriptsTest.java
@@ -80,7 +80,7 @@ public class MLContextMultipleScriptsTest extends AutomatedTestBase
runMLContextTestMultipleScript(RUNTIME_PLATFORM.SPARK, true);
}
- private void runMLContextTestMultipleScript(RUNTIME_PLATFORM platform, boolean wRead)
+ private static void runMLContextTestMultipleScript(RUNTIME_PLATFORM platform, boolean wRead)
{
RUNTIME_PLATFORM oldplatform = DMLScript.rtplatform;
DMLScript.rtplatform = platform;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextScratchCleanupTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextScratchCleanupTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextScratchCleanupTest.java
index e5e575b..de3ab3c 100644
--- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextScratchCleanupTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextScratchCleanupTest.java
@@ -80,7 +80,7 @@ public class MLContextScratchCleanupTest extends AutomatedTestBase
runMLContextTestMultipleScript(RUNTIME_PLATFORM.SPARK, true);
}
- private void runMLContextTestMultipleScript(RUNTIME_PLATFORM platform, boolean wRead)
+ private static void runMLContextTestMultipleScript(RUNTIME_PLATFORM platform, boolean wRead)
{
RUNTIME_PLATFORM oldplatform = DMLScript.rtplatform;
DMLScript.rtplatform = platform;
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 c18c20f..09b1677 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
@@ -82,7 +82,7 @@ public class MLContextUnivariateStatisticsTest extends MLContextTestBase {
Assert.assertEquals(1.0, stats[16][0], 0); // number of modes
}
- private void replaceColumnWithRandomInts(double[][] matrix, int whichColumn, int lowValue, int highValue) {
+ private static void replaceColumnWithRandomInts(double[][] matrix, int whichColumn, int lowValue, int highValue) {
for (int i = 0; i < matrix.length; i++) {
double[] row = matrix[i];
row[whichColumn] = ThreadLocalRandom.current().nextInt(lowValue, highValue + 1);
http://git-wip-us.apache.org/repos/asf/systemml/blob/e106966a/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 2ea3760..0ea4489 100644
--- a/src/test/java/org/apache/sysml/test/utils/TestUtils.java
+++ b/src/test/java/org/apache/sysml/test/utils/TestUtils.java
@@ -35,7 +35,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -2011,7 +2010,7 @@ public class TestUtils
* @return string representation
*/
public static String getStringRepresentationForDouble(double value) {
- NumberFormat nf = DecimalFormat.getInstance(new Locale("EN"));
+ NumberFormat nf = NumberFormat.getInstance(new Locale("EN"));
nf.setGroupingUsed(false);
nf.setMinimumFractionDigits(1);
nf.setMaximumFractionDigits(20);
@@ -2051,27 +2050,32 @@ public class TestUtils
return matrix;
}
- /**
- *
- * @param data
- * @return
- */
- public static double[][] round(double[][] data)
- {
+ public static double[][] round(double[][] data) {
for(int i=0; i<data.length; i++)
for(int j=0; j<data[i].length; j++)
data[i][j]=Math.round(data[i][j]);
-
return data;
}
- /**
- *
- * @param data
- * @param rows
- * @param cols
- * @return
- */
+ public static double[][] round(double[][] data, int col) {
+ for(int i=0; i<data.length; i++)
+ data[i][col]=Math.round(data[i][col]);
+ return data;
+ }
+
+ public static double[][] floor(double[][] data) {
+ for(int i=0; i<data.length; i++)
+ for(int j=0; j<data[i].length; j++)
+ data[i][j]=Math.floor(data[i][j]);
+ return data;
+ }
+
+ public static double[][] floor(double[][] data, int col) {
+ for(int i=0; i<data.length; i++)
+ data[i][col]=Math.floor(data[i][col]);
+ return data;
+ }
+
public static double sum(double[][] data, int rows, int cols)
{
double sum = 0;