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/11 05:53:12 UTC
[2/7] systemml git commit: [MINOR] Cleanup various issues raised by
static code analysis, part 1
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
index e4477e2..344e4f5 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
@@ -40,10 +40,9 @@ import org.apache.sysml.runtime.matrix.data.Pair;
import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
@SuppressWarnings("rawtypes")
-public class ValueSortMapper<KIN extends WritableComparable, VIN extends Writable, KOUT extends WritableComparable, VOUT extends Writable> extends MapReduceBase
- implements Mapper<KIN, VIN, KOUT, VOUT>
+public class ValueSortMapper<KIN extends WritableComparable, VIN extends Writable, KOUT extends WritableComparable, VOUT extends Writable>
+ extends MapReduceBase implements Mapper<KIN, VIN, KOUT, VOUT>
{
-
private int brlen;
private int bclen;
private CombineUnaryInstruction combineInstruction=null;
@@ -78,16 +77,14 @@ public class ValueSortMapper<KIN extends WritableComparable, VIN extends Writabl
}
@Override
- @SuppressWarnings("unchecked")
public void configure(JobConf job)
{
- try
- {
+ try {
brlen = MRJobConfiguration.getNumRowsPerBlock(job, (byte) 0);
bclen = MRJobConfiguration.getNumColumnsPerBlock(job, (byte) 0);
String str=job.get(SortMR.COMBINE_INSTRUCTION, null);
if(str!=null && !str.isEmpty() && !"null".equals(str))
- combineInstruction=(CombineUnaryInstruction) CombineUnaryInstruction.parseInstruction(str);
+ combineInstruction=(CombineUnaryInstruction) CombineUnaryInstruction.parseInstruction(str);
inputConverter = MRJobConfiguration.getInputConverter(job, (byte) 0);
inputConverter.setBlockSize(brlen, bclen);
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java
index 2e3dc16..dcacd6d 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/decode/DecoderFactory.java
@@ -36,8 +36,6 @@ import org.apache.wink.json4j.JSONObject;
public class DecoderFactory
{
-
- @SuppressWarnings("unchecked")
public static Decoder createDecoder(String spec, String[] colnames, ValueType[] schema, FrameBlock meta)
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java
index 8cc22a8..b8180f3 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderFactory.java
@@ -44,8 +44,7 @@ public class EncoderFactory
ValueType[] lschema = (schema==null) ? UtilFunctions.nCopies(clen, ValueType.STRING) : schema;
return createEncoder(spec, colnames, lschema, meta);
}
-
- @SuppressWarnings("unchecked")
+
public static Encoder createEncoder(String spec, String[] colnames, ValueType[] schema, FrameBlock meta)
throws DMLRuntimeException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderMVImpute.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderMVImpute.java b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderMVImpute.java
index ae9b809..ad155e9 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderMVImpute.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderMVImpute.java
@@ -43,7 +43,7 @@ public class EncoderMVImpute extends Encoder
{
private static final long serialVersionUID = 9057868620144662194L;
- public enum MVMethod { INVALID, GLOBAL_MEAN, GLOBAL_MODE, CONSTANT };
+ public enum MVMethod { INVALID, GLOBAL_MEAN, GLOBAL_MODE, CONSTANT }
private MVMethod[] _mvMethodList = null;
private MVMethod[] _mvscMethodList = null; // scaling methods for attributes that are imputed and also scaled
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java
index abaad26..14a12b8 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/meta/TfMetaUtils.java
@@ -337,7 +337,6 @@ public class TfMetaUtils
* @return list of column ids
* @throws IOException if IOException occurs
*/
- @SuppressWarnings("unchecked")
private static List<Integer> parseRecodeColIDs(String spec, String[] colnames)
throws IOException
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/DataConverter.java b/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
index a758b4d..5a91564 100644
--- a/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
@@ -341,7 +341,7 @@ public class DataConverter
int rows = mb.getNumRows();
int cols = mb.getNumColumns();
long nnz = mb.getNonZeros();
- ArrayList<Double> ret = new ArrayList<Double>();
+ ArrayList<Double> ret = new ArrayList<>();
if( mb.isInSparseFormat() )
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java b/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
index 891dbc9..5644ac6 100644
--- a/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
+++ b/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
@@ -330,7 +330,7 @@ public class UtilFunctions
* @return list of integers
*/
public static List<Integer> getSeqList(int low, int up, int incr) {
- ArrayList<Integer> ret = new ArrayList<Integer>();
+ ArrayList<Integer> ret = new ArrayList<>();
for( int i=low; i<=up; i+=incr )
ret.add(i);
return ret;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/udf/Matrix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/Matrix.java b/src/main/java/org/apache/sysml/udf/Matrix.java
index 212678f..1e6dfbd 100644
--- a/src/main/java/org/apache/sysml/udf/Matrix.java
+++ b/src/main/java/org/apache/sysml/udf/Matrix.java
@@ -55,7 +55,7 @@ public class Matrix extends FunctionParameter
public enum ValueType {
Double,
Integer
- };
+ }
/**
* This constructor invokes Matrix(String path, long rows, long cols, ValueType vType)
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/udf/PackageFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/PackageFunction.java b/src/main/java/org/apache/sysml/udf/PackageFunction.java
index 9b5fbd5..cf9afe3 100644
--- a/src/main/java/org/apache/sysml/udf/PackageFunction.java
+++ b/src/main/java/org/apache/sysml/udf/PackageFunction.java
@@ -40,7 +40,7 @@ public abstract class PackageFunction implements Serializable
private IDSequence _seq = null;
public PackageFunction() {
- _function_inputs = new ArrayList<FunctionParameter>();
+ _function_inputs = new ArrayList<>();
_seq = new IDSequence();
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/udf/Scalar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/Scalar.java b/src/main/java/org/apache/sysml/udf/Scalar.java
index a738da5..572d6d6 100644
--- a/src/main/java/org/apache/sysml/udf/Scalar.java
+++ b/src/main/java/org/apache/sysml/udf/Scalar.java
@@ -27,13 +27,11 @@ package org.apache.sysml.udf;
*/
public class Scalar extends FunctionParameter
{
-
-
private static final long serialVersionUID = 55239661026793046L;
public enum ScalarValueType {
Integer, Double, Boolean, Text
- };
+ }
protected String _value;
protected ScalarValueType _sType;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
index 195a9e0..41df844 100644
--- a/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
+++ b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
@@ -71,7 +71,7 @@ public class RemoveEmptyRows extends PackageFunction
Matrix mat = (Matrix) this.getFunctionInput(0);
String fnameOld = mat.getFilePath();
- HashMap<Long,Long> keyMap = new HashMap<Long,Long>(); //old,new rowID
+ HashMap<Long,Long> keyMap = new HashMap<>(); //old,new rowID
try
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/udf/lib/RowClassMeet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/udf/lib/RowClassMeet.java b/src/main/java/org/apache/sysml/udf/lib/RowClassMeet.java
index d24d0e8..5764d1e 100644
--- a/src/main/java/org/apache/sysml/udf/lib/RowClassMeet.java
+++ b/src/main/java/org/apache/sysml/udf/lib/RowClassMeet.java
@@ -163,7 +163,7 @@ public class RowClassMeet extends PackageFunction {
getRow(B, bRow, i);
// Create class labels
- TreeMap<ClassLabels, ArrayList<Integer>> classLabelMapping = new TreeMap<ClassLabels, ArrayList<Integer>>(new ClassLabelComparator());
+ TreeMap<ClassLabels, ArrayList<Integer>> classLabelMapping = new TreeMap<>(new ClassLabelComparator());
if(A.isInSparseFormat()) {
Iterator<IJV> iter = A.getSparseBlockIterator(i, i+1);
while(iter.hasNext()) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/Explain.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/Explain.java b/src/main/java/org/apache/sysml/utils/Explain.java
index 01b59f7..6a9d696 100644
--- a/src/main/java/org/apache/sysml/utils/Explain.java
+++ b/src/main/java/org/apache/sysml/utils/Explain.java
@@ -100,7 +100,7 @@ public class Explain
public boolean isRuntimeType(boolean recompile) {
return (this==RECOMPILE_RUNTIME || (!recompile && this==RUNTIME));
}
- };
+ }
public static class ExplainCounts {
public int numCPInst = 0;
@@ -484,12 +484,10 @@ public class Explain
throws DMLRuntimeException
{
StringBuilder sb = new StringBuilder();
-
- HashSet<Long> memo = new HashSet<Long>();
+ HashSet<Long> memo = new HashSet<>();
for( GDFNode gnode : gdfnodes )
sb.append(explainGDFNode(gnode, level, memo));
-
- return sb.toString();
+ return sb.toString();
}
/**
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/GPUStatistics.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/GPUStatistics.java b/src/main/java/org/apache/sysml/utils/GPUStatistics.java
index e6ea4a7..2668ad9 100644
--- a/src/main/java/org/apache/sysml/utils/GPUStatistics.java
+++ b/src/main/java/org/apache/sysml/utils/GPUStatistics.java
@@ -64,8 +64,8 @@ public class GPUStatistics {
// Per instruction miscellaneous timers.
// Used to record events in a CP Heavy Hitter instruction and
// provide a breakdown of how time was spent in that instruction
- private static HashMap<String, HashMap<String, Long>> _cpInstMiscTime = new HashMap<String, HashMap<String, Long>> ();
- private static HashMap<String, HashMap<String, Long>> _cpInstMiscCount = new HashMap<String, HashMap<String, Long>> ();
+ private static HashMap<String, HashMap<String, Long>> _cpInstMiscTime = new HashMap<> ();
+ private static HashMap<String, HashMap<String, Long>> _cpInstMiscCount = new HashMap<> ();
/**
* Resets the miscellaneous timers & counters
@@ -122,7 +122,7 @@ public class GPUStatistics {
HashMap<String, Long> miscTimesMap = _cpInstMiscTime.get(instructionName);
if (miscTimesMap == null) {
- miscTimesMap = new HashMap<String, Long>();
+ miscTimesMap = new HashMap<>();
_cpInstMiscTime.put(instructionName, miscTimesMap);
}
Long oldVal = miscTimesMap.get(miscTimer);
@@ -131,7 +131,7 @@ public class GPUStatistics {
HashMap<String, Long> miscCountMap = _cpInstMiscCount.get(instructionName);
if (miscCountMap == null){
- miscCountMap = new HashMap<String, Long>();
+ miscCountMap = new HashMap<>();
_cpInstMiscCount.put(instructionName, miscCountMap);
}
Long oldCnt = miscCountMap.get(miscTimer);
@@ -158,7 +158,7 @@ public class GPUStatistics {
StringBuffer sb = new StringBuffer();
HashMap<String, Long> miscTimerMap = _cpInstMiscTime.get(instructionName);
if (miscTimerMap != null) {
- List<Map.Entry<String, Long>> sortedList = new ArrayList<Map.Entry<String, Long>>(miscTimerMap.entrySet());
+ List<Map.Entry<String, Long>> sortedList = new ArrayList<>(miscTimerMap.entrySet());
// Sort the times to display by the most expensive first
Collections.sort(sortedList, new Comparator<Map.Entry<String, Long>>() {
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/GenerateClassesForMLContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/GenerateClassesForMLContext.java b/src/main/java/org/apache/sysml/utils/GenerateClassesForMLContext.java
index 2c6b05c..b297bdd 100644
--- a/src/main/java/org/apache/sysml/utils/GenerateClassesForMLContext.java
+++ b/src/main/java/org/apache/sysml/utils/GenerateClassesForMLContext.java
@@ -562,7 +562,7 @@ public class GenerateClassesForMLContext {
}
Map<String, FunctionStatementBlock> defaultNsFsbsMap = dmlProgram
.getFunctionStatementBlocks(DMLProgram.DEFAULT_NAMESPACE);
- List<FunctionStatementBlock> fsbs = new ArrayList<FunctionStatementBlock>();
+ List<FunctionStatementBlock> fsbs = new ArrayList<>();
fsbs.addAll(defaultNsFsbsMap.values());
for (FunctionStatementBlock fsb : fsbs) {
ArrayList<Statement> sts = fsb.getStatements();
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/NativeHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/NativeHelper.java b/src/main/java/org/apache/sysml/utils/NativeHelper.java
index 4b25d60..63eea16 100644
--- a/src/main/java/org/apache/sysml/utils/NativeHelper.java
+++ b/src/main/java/org/apache/sysml/utils/NativeHelper.java
@@ -44,7 +44,7 @@ import org.apache.sysml.hops.OptimizerUtils;
public class NativeHelper {
private static boolean isSystemMLLoaded = false;
private static final Log LOG = LogFactory.getLog(NativeHelper.class.getName());
- private static HashMap<String, String> supportedArchitectures = new HashMap<String, String>();
+ private static HashMap<String, String> supportedArchitectures = new HashMap<>();
public static String blasType;
private static int maxNumThreads = -1;
private static boolean setMaxNumThreads = false;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/Statistics.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/Statistics.java b/src/main/java/org/apache/sysml/utils/Statistics.java
index 109eec2..555493c 100644
--- a/src/main/java/org/apache/sysml/utils/Statistics.java
+++ b/src/main/java/org/apache/sysml/utils/Statistics.java
@@ -105,8 +105,8 @@ public class Statistics
private static long parforMergeTime = 0; //in milli sec
//heavy hitter counts and times
- private static HashMap<String,Long> _cpInstTime = new HashMap<String, Long>();
- private static HashMap<String,Long> _cpInstCounts = new HashMap<String, Long>();
+ private static HashMap<String,Long> _cpInstTime = new HashMap<>();
+ private static HashMap<String,Long> _cpInstCounts = new HashMap<>();
private static final LongAdder lTotalUIPVar = new LongAdder();
private static final LongAdder lTotalLix = new LongAdder();
@@ -558,7 +558,6 @@ public class Statistics
* @return string representing the heavy hitter instructions in tabular
* format
*/
- @SuppressWarnings("unchecked")
public static String getHeavyHitters(int num) {
int len = _cpInstTime.size();
if (num <= 0 || len <= 0)
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/lite/BuildLite.java b/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
index 9b7af29..9048ce6 100644
--- a/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
+++ b/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
@@ -84,7 +84,7 @@ public class BuildLite {
* include resources such as service files and shutdown hooks that aren't
* detected by query to the classloader.
*/
- public static List<String> additionalResources = new ArrayList<String>();
+ public static List<String> additionalResources = new ArrayList<>();
static {
// avoid "No FileSystem for scheme: file" error in JMLC
additionalResources.add("META-INF/services/org.apache.hadoop.fs.FileSystem");
@@ -92,15 +92,15 @@ public class BuildLite {
additionalResources.add("org/apache/hadoop/util/ShutdownHookManager$2.class");
additionalResources.add("org/apache/hadoop/log/metrics/EventCounter.class");
- };
+ }
/**
* Map jars to the additional resources files in order to build the
* dependency sets required by lite.xml.
*/
- public static SortedMap<String, SortedSet<String>> additionalJarToFileMappingsForDependencySets = new TreeMap<String, SortedSet<String>>();
+ public static SortedMap<String, SortedSet<String>> additionalJarToFileMappingsForDependencySets = new TreeMap<>();
static {
- SortedSet<String> hadoopCommonResources = new TreeSet<String>();
+ SortedSet<String> hadoopCommonResources = new TreeSet<>();
hadoopCommonResources.add("META-INF/services/org.apache.hadoop.fs.FileSystem");
hadoopCommonResources.add("org/apache/hadoop/util/ShutdownHookManager$2.class");
hadoopCommonResources.add("org/apache/hadoop/log/metrics/EventCounter.class");
@@ -111,7 +111,7 @@ public class BuildLite {
* Scan project *.java files for these packages/classes that should
* definitely be included in the lite jar.
*/
- public static List<String> additionalPackages = new ArrayList<String>();
+ public static List<String> additionalPackages = new ArrayList<>();
static {
// math3, lang3, io, etc.
additionalPackages.add("org.apache.commons");
@@ -120,7 +120,7 @@ public class BuildLite {
/**
* Exclude classes of the following packages from the lite jar.
*/
- public static List<String> packagesToExclude = new ArrayList<String>();
+ public static List<String> packagesToExclude = new ArrayList<>();
static {
packagesToExclude.add("com.sun.proxy");
// these can be added if test suite code is run
@@ -140,12 +140,12 @@ public class BuildLite {
* a sorted map and sorted sets of the class names are the values in the
* sorted map.
*/
- public static SortedMap<String, SortedSet<String>> jarsAndClasses = new TreeMap<String, SortedSet<String>>();
+ public static SortedMap<String, SortedSet<String>> jarsAndClasses = new TreeMap<>();
/**
* The jar dependencies and their sizes for comparison purposes.
*/
- public static SortedMap<String, Long> jarSizes = new TreeMap<String, Long>();
+ public static SortedMap<String, Long> jarSizes = new TreeMap<>();
/**
* Dummy logger to fill in log4j info for things such as the jar sizes.
@@ -274,7 +274,7 @@ public class BuildLite {
private static Set<String> consolidateClassPathNames(List<Class<?>> loadedClasses, List<String> log4jClassPathNames,
List<String> commonsMath3ClassPathNames) {
- SortedSet<String> allClassPathNames = new TreeSet<String>(log4jClassPathNames);
+ SortedSet<String> allClassPathNames = new TreeSet<>(log4jClassPathNames);
if (includeAllCommonsMath3) {
System.out.println("\nConsolidating loaded class names, log4j class names, and commons-math3 class names");
allClassPathNames.addAll(commonsMath3ClassPathNames);
@@ -424,7 +424,7 @@ public class BuildLite {
* if a ClassNotFoundException occurs
*/
private static List<String> getAllClassesInJar(Class<?> classInJarFile) throws IOException, ClassNotFoundException {
- List<String> classPathNames = new ArrayList<String>();
+ List<String> classPathNames = new ArrayList<>();
String jarLocation = classInJarFile.getProtectionDomain().getCodeSource().getLocation().getPath();
File f = new File(jarLocation);
try (FileInputStream fis = new FileInputStream(f);
@@ -519,7 +519,7 @@ public class BuildLite {
f.setAccessible(true);
@SuppressWarnings("unchecked")
Vector<Class<?>> classes = (Vector<Class<?>>) f.get(cl);
- List<Class<?>> list = new ArrayList<Class<?>>(classes);
+ List<Class<?>> list = new ArrayList<>(classes);
return list;
}
@@ -569,7 +569,7 @@ public class BuildLite {
SortedSet<String> classNames = jarsAndClasses.get(jarName);
classNames.add(className);
} else {
- SortedSet<String> classNames = new TreeSet<String>();
+ SortedSet<String> classNames = new TreeSet<>();
classNames.add(className);
jarsAndClasses.put(jarName, classNames);
}
@@ -649,7 +649,7 @@ public class BuildLite {
private static void scanJavaFilesForClassesToLoad() throws IOException, ClassNotFoundException {
System.out.println("\nScanning java files for additional classes to load");
int totalMatches = 0;
- SortedSet<String> uniqueMatches = new TreeSet<String>();
+ SortedSet<String> uniqueMatches = new TreeSet<>();
File base = new File(BASE_SRC_DIR);
List<File> javaFiles = (List<File>) FileUtils.listFiles(base, new String[] { "java" }, true);
for (File javaFile : javaFiles) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/utils/lite/BuildLiteExecution.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/lite/BuildLiteExecution.java b/src/main/java/org/apache/sysml/utils/lite/BuildLiteExecution.java
index 1c858ef..b2b2574 100644
--- a/src/main/java/org/apache/sysml/utils/lite/BuildLiteExecution.java
+++ b/src/main/java/org/apache/sysml/utils/lite/BuildLiteExecution.java
@@ -128,7 +128,7 @@ public class BuildLiteExecution {
Connection conn = getConfiguredConnection();
String dml = conn.readScript("scripts/algorithms/Univar-Stats.dml");
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = new HashMap<>();
m.put("$CONSOLE_OUTPUT", "TRUE");
PreparedScript script = conn.prepareScript(dml, m, new String[] { "A", "K" }, new String[] { "baseStats" },
@@ -325,7 +325,7 @@ public class BuildLiteExecution {
log.debug(debugString);
String s = conn.readScript("scripts/algorithms/l2-svm-predict.dml");
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = new HashMap<>();
m.put("$Y", "temp/1.csv");
m.put("$confusion", "temp/2.csv");
m.put("$scores", "temp/3.csv");
@@ -443,7 +443,7 @@ public class BuildLiteExecution {
String dataGen = conn.readScript("scripts/datagen/genRandData4ALS.dml");
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = new HashMap<>();
m.put("$rows", "1000");
m.put("$cols", "1000");
m.put("$rank", "100");
@@ -456,7 +456,7 @@ public class BuildLiteExecution {
double[][] x = dataGenResults.getMatrix("X");
log.debug(displayMatrix(x));
- Map<String, String> m2 = new HashMap<String, String>();
+ Map<String, String> m2 = new HashMap<>();
m2.put("$rank", "100");
String alsCg = conn.readScript("scripts/algorithms/ALS-CG.dml");
PreparedScript alsCgScript = conn.prepareScript(alsCg, m2, new String[] { "X" }, new String[] { "U", "V" },
@@ -488,8 +488,7 @@ public class BuildLiteExecution {
public static void jmlcKmeans() throws Exception {
Connection conn = getConfiguredConnection();
-
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = new HashMap<>();
m.put("$k", "5");
m.put("$isY", "TRUE");
m.put("$verb", "TRUE");
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
index 590dc00..bd4a9a4 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
@@ -45,7 +45,6 @@ import org.apache.sysml.yarn.ropt.YarnClusterConfig;
public class DMLAppMasterUtils
{
-
private static ResourceConfig _rc = null;
private static HashMap<ProgramBlock, Long> _rcMap = null;
@@ -91,7 +90,7 @@ public class DMLAppMasterUtils
//see GMR and parfor EMR and DPEMR for runtime configuration
long mem = ((long)conf.getIntValue(DMLConfig.YARN_MAPREDUCEMEM)) * 1024 * 1024;
InfrastructureAnalyzer.setRemoteMaxMemoryMap(mem);
- InfrastructureAnalyzer.setRemoteMaxMemoryReduce(mem);
+ InfrastructureAnalyzer.setRemoteMaxMemoryReduce(mem);
}
}
}
@@ -105,7 +104,7 @@ public class DMLAppMasterUtils
ArrayList<ProgramBlock> pbProg = getRuntimeProgramBlocks( prog );
ArrayList<ProgramBlock> B = ResourceOptimizer.compileProgram( pbProg, _rc );
- _rcMap = new HashMap<ProgramBlock, Long>();
+ _rcMap = new HashMap<>();
for( int i=0; i<B.size(); i++ ){
_rcMap.put(B.get(i), _rc.getMRResources(i));
}
@@ -120,7 +119,7 @@ public class DMLAppMasterUtils
//set max map and reduce memory (to be used by the compiler)
long mem = _rcMap.get(pb);
InfrastructureAnalyzer.setRemoteMaxMemoryMap(mem);
- InfrastructureAnalyzer.setRemoteMaxMemoryReduce(mem);
+ InfrastructureAnalyzer.setRemoteMaxMemoryReduce(mem);
OptimizerUtils.resetDefaultSize();
}
}
@@ -161,9 +160,9 @@ public class DMLAppMasterUtils
protected static ArrayList<ProgramBlock> getRuntimeProgramBlocks(Program prog)
throws DMLRuntimeException
- {
+ {
//construct single list of all program blocks including functions
- ArrayList<ProgramBlock> ret = new ArrayList<ProgramBlock>();
+ ArrayList<ProgramBlock> ret = new ArrayList<>();
ret.addAll(prog.getProgramBlocks());
ret.addAll(prog.getFunctionProgramBlocks().values());
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
index eb7a492..2547285 100644
--- a/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
@@ -448,7 +448,7 @@ public class DMLYarnClient
private Map<String, LocalResource> constructLocalResourceMap(YarnConfiguration yconf)
throws IOException
{
- Map<String, LocalResource> rMap = new HashMap<String, LocalResource>();
+ Map<String, LocalResource> rMap = new HashMap<>();
Path path = new Path(_hdfsJarFile);
LocalResource resource = Records.newRecord(LocalResource.class);
@@ -467,7 +467,7 @@ public class DMLYarnClient
private Map<String, String> constructEnvionmentMap(YarnConfiguration yconf)
throws IOException
{
- Map<String, String> eMap = new HashMap<String, String>();
+ Map<String, String> eMap = new HashMap<>();
//setup default app master environment
StringBuilder classpath = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
index 083f9ce..7e7a09a 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
@@ -35,19 +35,17 @@ public class GridEnumerationEqui extends GridEnumeration
throws DMLRuntimeException
{
super(prog, min, max);
-
_nsteps = DEFAULT_NSTEPS;
}
- public void setNumSteps( int steps )
- {
+ public void setNumSteps( int steps ) {
_nsteps = steps;
}
@Override
public ArrayList<Long> enumerateGridPoints()
{
- ArrayList<Long> ret = new ArrayList<Long>();
+ ArrayList<Long> ret = new ArrayList<>();
long gap = (_max - _min) / (_nsteps-1);
long v = _min;
for (int i = 0; i < _nsteps; i++) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
index 06a0d2c..922c60b 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
@@ -35,19 +35,17 @@ public class GridEnumerationExp extends GridEnumeration
throws DMLRuntimeException
{
super(prog, min, max);
-
_factor = DEFAULT_FACTOR;
}
- public void setFactor( double factor )
- {
+ public void setFactor( double factor ) {
_factor = factor;
}
@Override
public ArrayList<Long> enumerateGridPoints()
{
- ArrayList<Long> ret = new ArrayList<Long>();
+ ArrayList<Long> ret = new ArrayList<>();
long v = _min;
while( v < _max ) {
ret.add( v );
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
index 98e51c5..beabc4e 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
@@ -33,7 +33,6 @@ import org.apache.sysml.runtime.controlprogram.ProgramBlock;
*/
public class GridEnumerationHybrid extends GridEnumeration
{
-
public GridEnumerationHybrid( ArrayList<ProgramBlock> prog, long min, long max )
throws DMLRuntimeException
{
@@ -48,12 +47,12 @@ public class GridEnumerationHybrid extends GridEnumeration
GridEnumeration ge2 = new GridEnumerationExp(_prog, _min, _max);
//ensure distinct points
- HashSet<Long> hs = new HashSet<Long>();
+ HashSet<Long> hs = new HashSet<>();
hs.addAll( ge1.enumerateGridPoints() );
hs.addAll( ge2.enumerateGridPoints() );
//create sorted output list
- ArrayList<Long> ret = new ArrayList<Long>();
+ ArrayList<Long> ret = new ArrayList<>();
for( Long val : hs )
ret.add(val);
Collections.sort(ret); //asc
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
index 78402d4..b3e4ae7 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
@@ -46,12 +46,10 @@ public class GridEnumerationMemory extends GridEnumeration
throws DMLRuntimeException
{
super(prog, min, max);
-
_nsteps = DEFAULT_NSTEPS;
}
- public void setNumSteps( int steps )
- {
+ public void setNumSteps( int steps ) {
_nsteps = steps;
}
@@ -59,15 +57,15 @@ public class GridEnumerationMemory extends GridEnumeration
public ArrayList<Long> enumerateGridPoints()
throws DMLRuntimeException, HopsException
{
- ArrayList<Long> ret = new ArrayList<Long>();
+ ArrayList<Long> ret = new ArrayList<>();
long gap = (long)(_max - _min) / (_nsteps-1);
//get memory estimates
- ArrayList<Long> mem = new ArrayList<Long>();
+ ArrayList<Long> mem = new ArrayList<>();
getMemoryEstimates( _prog, mem );
//binning memory estimates to equi grid
- HashSet<Long> preRet = new HashSet<Long>();
+ HashSet<Long> preRet = new HashSet<>();
for( Long val : mem )
{
if( val < _min )
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
index bdbf053..b2d20d1 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
@@ -52,7 +52,7 @@ public class ResourceConfig
_cpres = init;
//init mr memory
- _mrres = new ArrayList<Long>();
+ _mrres = new ArrayList<>();
addProgramBlocks(prog, init);
}
@@ -132,7 +132,7 @@ public class ResourceConfig
long cp = YarnOptimizerUtils.toB(Long.valueOf(parts[0]));
//deserialize mr
- ArrayList<Long> mr = new ArrayList<Long>();
+ ArrayList<Long> mr = new ArrayList<>();
for (int i=1; i<parts.length; i++)
{
long val = YarnOptimizerUtils.toB(Long.parseLong(parts[i]));
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
index 8b6003f..0378924 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
@@ -178,13 +178,11 @@ public class ResourceOptimizer
private static ArrayList<ProgramBlock> compileProgram( ArrayList<ProgramBlock> prog, ArrayList<ProgramBlock> B, double cp, double mr )
throws DMLRuntimeException, HopsException, LopsException, IOException
{
- if( B == null ) //init
- {
- B = new ArrayList<ProgramBlock>();
-
+ if( B == null ) { //init
+ B = new ArrayList<>();
InfrastructureAnalyzer.setLocalMaxMemory( (long)cp );
InfrastructureAnalyzer.setRemoteMaxMemoryMap( (long)mr );
- InfrastructureAnalyzer.setRemoteMaxMemoryReduce( (long)mr );
+ InfrastructureAnalyzer.setRemoteMaxMemoryReduce( (long)mr );
OptimizerUtils.resetDefaultSize(); //dependent on cp, mr
}
@@ -455,7 +453,7 @@ public class ResourceOptimizer
{
//prune all program blocks w/o mr instructions (mr budget does not matter)
if( PRUNING_SMALL ){
- ArrayList<ProgramBlock> Bp = new ArrayList<ProgramBlock>();
+ ArrayList<ProgramBlock> Bp = new ArrayList<>();
for( ProgramBlock pb : B )
if( OptTreeConverter.containsMRJobInstruction(pb.getInstructions(), false, true) )
Bp.add( pb );
@@ -464,7 +462,7 @@ public class ResourceOptimizer
//prune all program blocks, where all mr hops are due to unknowns
if( PRUNING_UNKNOWN ){
- ArrayList<ProgramBlock> Bp = new ArrayList<ProgramBlock>();
+ ArrayList<ProgramBlock> Bp = new ArrayList<>();
for( ProgramBlock pb : B )
if( !pruneHasOnlyUnknownMR(pb) )
Bp.add( pb );
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
index e05f40b..ce83f85 100644
--- a/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
@@ -46,7 +46,6 @@ import org.apache.sysml.runtime.matrix.mapred.MRConfigurationNames;
*/
public class YarnClusterAnalyzer
{
-
public static final long DEFAULT_JVM_SIZE = 512 * 1024 * 1024;
public static final int CPU_HYPER_FACTOR = 1;
@@ -65,8 +64,8 @@ public class YarnClusterAnalyzer
// Map from StatementBlock.ID to remoteJVMMaxMem (in bytes)
// Encodes MR job memory settings in the execution plan, if not found here, use the default MR setting in _remoteJVMMaxMem
- public static HashMap<Long, Long> remoteJVMMaxMemPlan = new HashMap<Long, Long>();
- public static HashSet<Long> probedSb = new HashSet<Long>();
+ public static HashMap<Long, Long> remoteJVMMaxMemPlan = new HashMap<>();
+ public static HashSet<Long> probedSb = new HashSet<>();
public static List<Long> nodesMaxPhySorted = null; // Original maximum physical memory per node in Byte, sorted
public static List<Double> nodesMaxBudgetSorted = null; // Converted to maximum budget per node in Byte, sorted
@@ -368,7 +367,7 @@ public class YarnClusterAnalyzer
}
public static void printProbedSet(String message) {
- ArrayList<Long> probed = new ArrayList<Long> (probedSb);
+ ArrayList<Long> probed = new ArrayList<> (probedSb);
Collections.sort(probed);
System.out.print(message);
for (Long id : probed)
@@ -614,7 +613,7 @@ public class YarnClusterAnalyzer
if( nodesReport.isEmpty() )
throw new YarnException("There are zero available nodes in the yarn cluster");
- nodesMaxPhySorted = new ArrayList<Long> (nodesReport.size());
+ nodesMaxPhySorted = new ArrayList<> (nodesReport.size());
clusterTotalMem = 0;
clusterTotalCores = 0;
clusterTotalNodes = 0;
@@ -644,7 +643,7 @@ public class YarnClusterAnalyzer
}
Collections.sort(nodesMaxPhySorted, Collections.reverseOrder());
- nodesMaxBudgetSorted = new ArrayList<Double> (nodesMaxPhySorted.size());
+ nodesMaxBudgetSorted = new ArrayList<> (nodesMaxPhySorted.size());
for (int i = 0; i < nodesMaxPhySorted.size(); i++)
nodesMaxBudgetSorted.add(ResourceOptimizer.phyToBudget(nodesMaxPhySorted.get(i)));
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
index 5ca800b..2258d13 100644
--- a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
@@ -89,7 +89,7 @@ public abstract class AutomatedTestBase
public String lowerCase() {
return super.toString().toLowerCase();
}
- };
+ }
public static final boolean EXCEPTION_EXPECTED = true;
public static final boolean EXCEPTION_NOT_EXPECTED = false;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
index 385fa2d..5f2b6aa 100644
--- a/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
@@ -66,7 +66,7 @@ public abstract class UnivariateStatsBase extends AutomatedTestBase {
SIZE(int s) {
size = s;
}
- };
+ }
/** Ranges of values passed to aggregates in different tests. */
protected enum RANGE {
@@ -77,7 +77,7 @@ public abstract class UnivariateStatsBase extends AutomatedTestBase {
min = mn;
max = mx;
}
- };
+ }
/**
* Actual sparsity values used in the "dense" and "sparse" variants of the
@@ -90,7 +90,7 @@ public abstract class UnivariateStatsBase extends AutomatedTestBase {
SPARSITY(double sp) {
sparsity = sp;
}
- };
+ }
/** Shared setup code for test harness configurations */
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
index a871be6..bc8a383 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
@@ -45,7 +45,7 @@ public class SampleTest extends AutomatedTestBase
private final static String TEST_NAME = "Sample";
private final static String TEST_CLASS_DIR = TEST_DIR + SampleTest.class.getSimpleName() + "/";
- private enum TEST_TYPE { FOUR_INPUTS, THREE_INPUTS1, THREE_INPUTS2, TWO_INPUTS, ERROR };
+ private enum TEST_TYPE { FOUR_INPUTS, THREE_INPUTS1, THREE_INPUTS2, TWO_INPUTS, ERROR }
private TEST_TYPE test_type;
private final static long RANGE=5000, SIZE=100, SIZE2=RANGE+10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
index c703f4a..51a897c 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
@@ -47,7 +47,7 @@ public class SequenceTest extends AutomatedTestBase
private final static String TEST_NAME = "Sequence";
private final static String TEST_CLASS_DIR = TEST_DIR + SequenceTest.class.getSimpleName() + "/";
- private enum TEST_TYPE { THREE_INPUTS, TWO_INPUTS, ERROR };
+ private enum TEST_TYPE { THREE_INPUTS, TWO_INPUTS, ERROR }
private final static double eps = 1e-10;
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/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 7bb659d..ad309aa 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
@@ -87,13 +87,11 @@ public class FrameConverterTest extends AutomatedTestBase
private final static List<ValueType> schemaMixedLargeListInt = Collections.nCopies(200, ValueType.INT);
private final static List<ValueType> schemaMixedLargeListBool = Collections.nCopies(200, ValueType.BOOLEAN);
- @SuppressWarnings("unchecked")
private static final List<ValueType> schemaMixedLargeList = new ArrayList<ValueType>(CollectionUtils.union(
CollectionUtils.union(schemaMixedLargeListStr, schemaMixedLargeListDble),
CollectionUtils.union(schemaMixedLargeListInt, schemaMixedLargeListBool)));
private static final ValueType[] schemaMixedLarge = schemaMixedLargeList.toArray(new ValueType[0]);
- @SuppressWarnings("unchecked")
private static final List<ValueType> schemaMixedLargeListDFrame = new ArrayList<ValueType>(CollectionUtils.union(
CollectionUtils.union(schemaMixedLargeListStr.subList(0, 100), schemaMixedLargeListDble.subList(0, 100)),
CollectionUtils.union(schemaMixedLargeListInt.subList(0, 100), schemaMixedLargeListBool.subList(0, 100))));
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
index 5d931c2..161e158 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
@@ -37,7 +37,7 @@ public class IQMTest extends AutomatedTestBase
TEST_TYPE(String name) {
this.scriptName = name;
}
- };
+ }
private final static String TEST_DIR = "functions/unary/matrix/";
private static final String TEST_CLASS_DIR = TEST_DIR + IQMTest.class.getSimpleName() + "/";
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
index 6f140c8..249048e 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
@@ -38,7 +38,7 @@ public class RoundTest extends AutomatedTestBase
TEST_TYPE(String name) {
this.scriptName = name;
}
- };
+ }
private final static String TEST_DIR = "functions/unary/matrix/";
private static final String TEST_CLASS_DIR = TEST_DIR + RoundTest.class.getSimpleName() + "/";
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/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 a49deee..7122f99 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
@@ -45,7 +45,7 @@ public class FullDistributionTest extends AutomatedTestBase
private enum TEST_TYPE {
NORMAL, NORMAL_NOPARAMS, NORMAL_MEAN,
NORMAL_SD, F, T, CHISQ, EXP, EXP_NOPARAMS
- };
+ }
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/40dd894e/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 a7d12a5..abe5de7 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
@@ -57,11 +57,11 @@ public class MLContextFrameTest extends MLContextTestBase {
public static enum SCRIPT_TYPE {
DML, PYDML
- };
+ }
public static enum IO_TYPE {
ANY, FILE, JAVA_RDD_STR_CSV, JAVA_RDD_STR_IJV, RDD_STR_CSV, RDD_STR_IJV, DATAFRAME
- };
+ }
private static String CSV_DELIM = ",";