You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2017/06/23 20:22:45 UTC
systemml git commit: [MINOR] Remove blank/incorrect javadocs from
JMLC tests
Repository: systemml
Updated Branches:
refs/heads/master 618644344 -> 202f658c2
[MINOR] Remove blank/incorrect javadocs from JMLC tests
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/202f658c
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/202f658c
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/202f658c
Branch: refs/heads/master
Commit: 202f658c28e60dc41d25e88d6835f0b4d3275398
Parents: 6186443
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Fri Jun 23 13:21:20 2017 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Fri Jun 23 13:21:20 2017 -0700
----------------------------------------------------------------------
.../functions/jmlc/FrameCastingTest.java | 31 ++----------------
.../functions/jmlc/FrameDecodeTest.java | 18 -----------
.../functions/jmlc/FrameEncodeTest.java | 23 ++------------
.../functions/jmlc/FrameIndexingAppendTest.java | 18 -----------
.../functions/jmlc/FrameLeftIndexingTest.java | 23 ++------------
.../functions/jmlc/FrameReadMetaTest.java | 26 +--------------
.../functions/jmlc/FrameTransformTest.java | 30 ++----------------
.../functions/jmlc/ReuseModelVariablesTest.java | 33 ++------------------
8 files changed, 14 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 22e96f3..f97ea1a 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
@@ -23,9 +23,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.api.jmlc.ResultVariables;
@@ -34,11 +31,9 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
-/**
- *
- *
- */
public class FrameCastingTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform6";
@@ -79,13 +74,6 @@ public class FrameCastingTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -109,13 +97,6 @@ public class FrameCastingTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", new Double(data[i][j]), new Double(cF1[i][j]));
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
throws IOException
{
@@ -167,13 +148,7 @@ public class FrameCastingTest extends AutomatedTestBase
return ret;
}
-
- /**
- *
- * @param data
- * @param val
- * @return
- */
+
private double[][] add(double[][] data, double val) {
for( int i=0; i<data.length; i++ )
for( int j=0; j<data[i].length; j++ )
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 c9c973e..07da75f 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
@@ -35,10 +35,6 @@ import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-/**
- *
- *
- */
public class FrameDecodeTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform2";
@@ -79,13 +75,6 @@ public class FrameDecodeTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -109,13 +98,6 @@ public class FrameDecodeTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 a615771..7309763 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
@@ -23,9 +23,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.api.jmlc.ResultVariables;
@@ -34,11 +31,9 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
-/**
- *
- *
- */
public class FrameEncodeTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform7";
@@ -79,13 +74,6 @@ public class FrameEncodeTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -108,13 +96,6 @@ public class FrameEncodeTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, boolean modelReuse)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 f8a9ef1..441f447 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
@@ -35,10 +35,6 @@ import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
-/**
- *
- *
- */
public class FrameIndexingAppendTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform4";
@@ -79,13 +75,6 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -109,13 +98,6 @@ public class FrameIndexingAppendTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 1b55a0a..5b07e09 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
@@ -23,9 +23,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.api.jmlc.ResultVariables;
@@ -34,11 +31,9 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
-/**
- *
- *
- */
public class FrameLeftIndexingTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform5";
@@ -79,13 +74,6 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -109,13 +97,6 @@ public class FrameLeftIndexingTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[i][j]+".", data[i][j], F1s[i][j]);
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<String[][]> execDMLScriptviaJMLC( String testname, String[][] F1, String[][] M, boolean modelReuse)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
index 0de152c..86e5715 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/FrameReadMetaTest.java
@@ -42,10 +42,6 @@ import org.apache.sysml.runtime.util.MapReduceTool;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
-/**
- *
- *
- */
public class FrameReadMetaTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform3";
@@ -90,13 +86,6 @@ public class FrameReadMetaTest extends AutomatedTestBase
runJMLCReadMetaTest(TEST_NAME1, true, true, false);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReadMetaTest( String testname, boolean modelReuse, boolean readFrame, boolean useSpec )
throws IOException
{
@@ -167,12 +156,6 @@ public class FrameReadMetaTest extends AutomatedTestBase
}
}
- /**
- *
- * @param M
- * @return
- * @throws DMLRuntimeException
- */
@SuppressWarnings("unchecked")
private HashMap<String,Long>[] getRecodeMaps(String spec, FrameBlock M)
throws DMLRuntimeException
@@ -195,14 +178,7 @@ public class FrameReadMetaTest extends AutomatedTestBase
return ret;
}
-
- /**
- *
- * @param rows
- * @param cols
- * @param RC
- * @return
- */
+
private double[][] generateData(int rows, int cols, HashMap<String,Long>[] RC) {
double[][] ret = new double[rows][cols];
for( int i=0; i<rows; i++ )
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 d1662e4..89c4053 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
@@ -24,9 +24,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map.Entry;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.api.jmlc.ResultVariables;
@@ -36,11 +33,9 @@ import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
import org.apache.sysml.test.utils.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
-/**
- *
- *
- */
public class FrameTransformTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "transform";
@@ -81,13 +76,6 @@ public class FrameTransformTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME1, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -110,13 +98,6 @@ public class FrameTransformTest extends AutomatedTestBase
Assert.assertEquals("Wrong result: "+data[0][0]+".", new Double(8), new Double(data[0][0]));
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<double[][]> execDMLScriptviaJMLC( String testname, String[][] X, String[][] M, boolean modelReuse)
throws IOException
{
@@ -173,12 +154,7 @@ public class FrameTransformTest extends AutomatedTestBase
protected static String[][] createFrameData(double[][] data) {
return createFrameData(data, "V");
}
-
- /**
- *
- * @param data
- * @return
- */
+
protected static String[][] createFrameData(double[][] data, String prefix) {
String[][] ret = new String[data.length][];
for( int i=0; i<data.length; i++ ) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/202f658c/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 6892767..1a1d572 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
@@ -22,9 +22,6 @@ package org.apache.sysml.test.integration.functions.jmlc;
import java.io.IOException;
import java.util.ArrayList;
-import org.junit.Assert;
-import org.junit.Test;
-import org.apache.sysml.api.DMLException;
import org.apache.sysml.api.jmlc.Connection;
import org.apache.sysml.api.jmlc.PreparedScript;
import org.apache.sysml.api.jmlc.ResultVariables;
@@ -32,11 +29,9 @@ import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
import org.apache.sysml.runtime.io.IOUtilFunctions;
import org.apache.sysml.test.integration.AutomatedTestBase;
import org.apache.sysml.test.integration.TestConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
-/**
- *
- *
- */
public class ReuseModelVariablesTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "reuse-glm-predict";
@@ -100,13 +95,6 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
runJMLCReuseTest(TEST_NAME2, true, true);
}
- /**
- *
- * @param sparseM1
- * @param sparseM2
- * @param instType
- * @throws IOException
- */
private void runJMLCReuseTest( String testname, boolean sparse, boolean modelReuse )
throws IOException
{
@@ -125,13 +113,6 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
Assert.assertEquals(Xset.size(), Yset.size());
}
- /**
- *
- * @param X
- * @return
- * @throws DMLException
- * @throws IOException
- */
private ArrayList<double[][]> execDMLScriptviaJMLC( String testname, ArrayList<double[][]> X, boolean modelReuse)
throws IOException
{
@@ -187,15 +168,7 @@ public class ReuseModelVariablesTest extends AutomatedTestBase
return ret;
}
-
- /**
- *
- * @param num
- * @param rows
- * @param cols
- * @param sparsity
- * @return
- */
+
private ArrayList<double[][]> generateInputs( int num, int rows, int cols, double sparsity )
{
ArrayList<double[][]> ret = new ArrayList<double[][]>();