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 2016/03/07 21:24:08 UTC

[4/7] incubator-systemml git commit: Fix code style string comparisons, boolean parsing, empty checks

Fix code style string comparisons, boolean parsing, empty checks

Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/8cea30cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/8cea30cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/8cea30cd

Branch: refs/heads/master
Commit: 8cea30cdcaa7e918105c658a2723d1d4cc1195b1
Parents: ef7179b
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Sat Mar 5 18:37:50 2016 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Mon Mar 7 12:23:07 2016 -0800

----------------------------------------------------------------------
 .../java/org/apache/sysml/api/MLContext.java    | 14 +++++++-------
 .../java/org/apache/sysml/api/MLMatrix.java     |  4 ++--
 .../java/org/apache/sysml/api/MLOutput.java     |  5 +----
 .../org/apache/sysml/debug/DMLDebugger.java     | 20 ++++++++++----------
 .../sysml/debug/DMLDebuggerFunctions.java       | 10 +++++-----
 .../java/org/apache/sysml/lops/compile/Dag.java |  6 +++---
 .../ExternalFunctionProgramBlock.java           |  6 ++----
 .../ParameterizedBuiltinSPInstruction.java      |  2 +-
 .../spark/ReblockSPInstruction.java             |  2 +-
 .../instructions/spark/ReorgSPInstruction.java  |  2 +-
 .../spark/utils/RDDConverterUtilsExt.java       |  7 ++-----
 .../matrix/mapred/MRJobConfiguration.java       |  2 +-
 .../sysml/runtime/transform/DataTransform.java  |  4 ++--
 13 files changed, 38 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/api/MLContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLContext.java b/src/main/java/org/apache/sysml/api/MLContext.java
index cbce1b7..11d3327 100644
--- a/src/main/java/org/apache/sysml/api/MLContext.java
+++ b/src/main/java/org/apache/sysml/api/MLContext.java
@@ -486,18 +486,18 @@ public class MLContext {
 			_inVarnames = new ArrayList<String>();
 		
 		MatrixObject mo = null;
-		if(format.compareTo("csv") == 0) {
+		if( format.equals("csv") ) {
 			MatrixCharacteristics mc = new MatrixCharacteristics(rlen, clen, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, nnz);
 			mo = new MatrixObject(ValueType.DOUBLE, null, new MatrixFormatMetaData(mc, OutputInfo.CSVOutputInfo, InputInfo.CSVInputInfo));
 		}
-		else if(format.compareTo("text") == 0) {
+		else if( format.equals("text") ) {
 			if(rlen == -1 || clen == -1) {
 				throw new DMLRuntimeException("The metadata is required in registerInput for format:" + format);
 			}
 			MatrixCharacteristics mc = new MatrixCharacteristics(rlen, clen, DMLTranslator.DMLBlockSize, DMLTranslator.DMLBlockSize, nnz);
 			mo = new MatrixObject(ValueType.DOUBLE, null, new MatrixFormatMetaData(mc, OutputInfo.TextCellOutputInfo, InputInfo.TextCellInputInfo));
 		}
-		else if(format.compareTo("mm") == 0) {
+		else if( format.equals("mm") ) {
 			// TODO: Handle matrix market
 			throw new DMLRuntimeException("Matrixmarket format is not yet implemented in registerInput: " + format);
 		}
@@ -631,7 +631,7 @@ public class MLContext {
 		String [] args = new String[namedArgs.size()];
 		int i = 0;
 		for(Entry<String, String> entry : namedArgs.entrySet()) {
-			if(entry.getValue().trim().compareTo("") == 0)
+			if(entry.getValue().trim().isEmpty())
 				args[i] = entry.getKey() + "=\"" + entry.getValue() + "\"";
 			else
 				args[i] = entry.getKey() + "=" + entry.getValue();
@@ -653,7 +653,7 @@ public class MLContext {
 		String [] args = new String[namedArgs.size()];
 		int i = 0;
 		for(Entry<String, String> entry : namedArgs.entrySet()) {
-			if(entry.getValue().trim().compareTo("") == 0)
+			if(entry.getValue().trim().isEmpty())
 				args[i] = entry.getKey() + "=\"" + entry.getValue() + "\"";
 			else
 				args[i] = entry.getKey() + "=" + entry.getValue();
@@ -1066,7 +1066,7 @@ public class MLContext {
 	private boolean isRegisteredAsInput(String varName) {
 		if(_inVarnames != null) {
 			for(String v : _inVarnames) {
-				if(v.compareTo(varName) == 0) {
+				if(v.equals(varName)) {
 					return true;
 				}
 			}
@@ -1175,7 +1175,7 @@ public class MLContext {
 		String [] args = new String[namedArgs.size()];
 		int i = 0;
 		for(Entry<String, String> entry : namedArgs.entrySet()) {
-			if(entry.getValue().trim().compareTo("") == 0)
+			if(entry.getValue().trim().isEmpty())
 				args[i] = entry.getKey() + "=\"" + entry.getValue() + "\"";
 			else
 				args[i] = entry.getKey() + "=" + entry.getValue();

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/api/MLMatrix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLMatrix.java b/src/main/java/org/apache/sysml/api/MLMatrix.java
index ac8be72..84e15fa 100644
--- a/src/main/java/org/apache/sysml/api/MLMatrix.java
+++ b/src/main/java/org/apache/sysml/api/MLMatrix.java
@@ -122,7 +122,7 @@ public class MLMatrix extends DataFrame {
 	}
 	
 	private double getScalarBuiltinFunctionResult(String fn) throws IOException, DMLException, ParseException {
-		if(fn.compareTo("nrow") == 0 || fn.compareTo("ncol") == 0) {
+		if(fn.equals("nrow") || fn.equals("ncol")) {
 			ml.reset();
 			ml.registerInput("left", getRDDLazily(this), mc.getRows(), mc.getCols(), mc.getRowsPerBlock(), mc.getColsPerBlock(), mc.getNonZeros());
 			ml.registerOutput("output");
@@ -212,7 +212,7 @@ public class MLMatrix extends DataFrame {
 			throw new DMLRuntimeException("Incompatible block sizes: brlen:" + mc.getRowsPerBlock() + "!=" +  that.mc.getRowsPerBlock() + " || bclen:" + mc.getColsPerBlock() + "!=" + that.mc.getColsPerBlock());
 		}
 		
-		if(op.compareTo("%*%") == 0) {
+		if(op.equals("%*%")) {
 			if(mc.getCols() != that.mc.getRows()) {
 				throw new DMLRuntimeException("Dimensions mismatch:" + mc.getCols() + "!=" +  that.mc.getRows());
 			}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/api/MLOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLOutput.java b/src/main/java/org/apache/sysml/api/MLOutput.java
index 6ba04eb..1abf29b 100644
--- a/src/main/java/org/apache/sysml/api/MLOutput.java
+++ b/src/main/java/org/apache/sysml/api/MLOutput.java
@@ -179,14 +179,11 @@ public class MLOutput {
 	}
 	
 	public JavaRDD<String> getStringRDD(String varName, String format) throws DMLRuntimeException {
-		if(format.compareTo("text") == 0) {
+		if(format.equals("text")) {
 			JavaPairRDD<MatrixIndexes, MatrixBlock> binaryRDD = getBinaryBlockedRDD(varName);
 			MatrixCharacteristics mcIn = getMatrixCharacteristics(varName); 
 			return RDDConverterUtilsExt.binaryBlockToStringRDD(binaryRDD, mcIn, format);
 		}
-//		else if(format.compareTo("csv") == 0) {
-//			
-//		}
 		else {
 			throw new DMLRuntimeException("The output format:" + format + " is not implemented yet.");
 		}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/debug/DMLDebugger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLDebugger.java b/src/main/java/org/apache/sysml/debug/DMLDebugger.java
index af43485..716503b 100644
--- a/src/main/java/org/apache/sysml/debug/DMLDebugger.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebugger.java
@@ -280,10 +280,10 @@ public class DMLDebugger
     	    			if(infoOptions == null || infoOptions.length == 0) {
     	    				System.err.println("The command \"info\" requires option. Try \"info break\" or \"info frame\".");
     	    			}
-    	    			else if(infoOptions[0].trim().compareTo("break") == 0) {
+    	    			else if(infoOptions[0].trim().equals("break")) {
     	    				dbFunctions.listBreakpoints(DMLBreakpointManager.getBreakpoints());
     	    			}
-    	    			else if(infoOptions[0].trim().compareTo("frame") == 0) {
+    	    			else if(infoOptions[0].trim().equals("frame")) {
     	    				if (!runtime.isAlive())
         	    				System.err.println("Runtime has not been started. Try \"r\" or \"s\" to start DML runtime execution.");
         	    			else 
@@ -324,10 +324,10 @@ public class DMLDebugger
     	    							}
     	    							int rowIndex = -1;
     	    							int colIndex = -1;
-    	    							if(rowIndexStr.compareTo("") != 0) {
+    	    							if(!rowIndexStr.isEmpty()) {
     	    								rowIndex = Integer.parseInt(rowIndexStr);
     	    							}
-    	    							if(colIndexStr.compareTo("") != 0) {
+    	    							if(!colIndexStr.isEmpty()) {
     	    								colIndex = Integer.parseInt(colIndexStr);
     	    							}
     	    							//System.out.println("" + rowIndex + " " + colIndex);
@@ -396,11 +396,11 @@ public class DMLDebugger
     	    				// Print first 10 lines
     	    				range = new IntRange(currentPC, Math.min(lines.length, currentPC+10));
     	    			}
-    	    			else if(pOptions.length == 1 && pOptions[0].trim().toLowerCase().compareTo("all") == 0) {
+    	    			else if(pOptions.length == 1 && pOptions[0].trim().toLowerCase().equals("all")) {
     	    				// Print entire program
     	    				range = new IntRange(1, lines.length);
     	    			}
-    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().compareTo("next") == 0) {
+    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().equals("next")) {
     	    				int numLines = 10;
     	    				try {
     	    					numLines = Integer.parseInt(pOptions[1]);
@@ -412,7 +412,7 @@ public class DMLDebugger
     	    				range = dbFunctions.getRange(argsForRange, lines.length);
     	    				
     	    			}
-    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().compareTo("prev") == 0) {
+    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().equals("prev")) {
     	    				int numLines = 10;
     	    				try {
     	    					numLines = Integer.parseInt(pOptions[1]);
@@ -460,11 +460,11 @@ public class DMLDebugger
     	    				// Print first 10 lines
     	    				range = new IntRange(currentPC, Math.min(lines.length, currentPC+10));
     	    			}
-    	    			else if(pOptions.length == 1 && pOptions[0].trim().toLowerCase().compareTo("all") == 0) {
+    	    			else if(pOptions.length == 1 && pOptions[0].trim().toLowerCase().equals("all")) {
     	    				// Print entire program
     	    				range = new IntRange(1, lines.length);
     	    			}
-    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().compareTo("next") == 0) {
+    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().equals("next")) {
     	    				int numLines = 10;
     	    				try {
     	    					numLines = Integer.parseInt(pOptions[1]);
@@ -476,7 +476,7 @@ public class DMLDebugger
     	    				range = dbFunctions.getRange(argsForRange, lines.length);
     	    				
     	    			}
-    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().compareTo("prev") == 0) {
+    	    			else if(pOptions.length == 2 && pOptions[0].trim().toLowerCase().equals("prev")) {
     	    				int numLines = 10;
     	    				try {
     	    					numLines = Integer.parseInt(pOptions[1]);

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
index 7a45dbb..431188b 100644
--- a/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
@@ -334,7 +334,7 @@ public class DMLDebuggerFunctions {
 							return;
 						}
 						
-						if(displayFunction.compareTo("value") == 0) {
+						if(displayFunction.equals("value")) {
 							MatrixBlock mb = null;
 							try {
 								// Only read the MatrixBlock when asked to print, but not for whatis
@@ -347,14 +347,14 @@ public class DMLDebuggerFunctions {
 								return;
 							}
 						}
-						else if(displayFunction.compareTo("metadata") == 0) {
+						else if(displayFunction.equals("metadata")) {
 							System.out.println("Metadata of " + varname + ": matrix"+variables.get(varname).getMetaData().toString());
 						}
 						
 												
 					} catch (Exception e) {
 						String command = "";
-						if(displayFunction.compareTo("value") == 0) {
+						if(displayFunction.equals("value")) {
 							command = "print";
 						}
 						else {
@@ -365,10 +365,10 @@ public class DMLDebuggerFunctions {
 					}
 				}
 				else if (variables.get(varname).getDataType() == DataType.SCALAR) {
-					if(displayFunction.compareTo("value") == 0) {
+					if(displayFunction.equals("value")) {
 						System.out.println(varname + " = " + variables.get(varname).toString());
 					}
-					else if(displayFunction.compareTo("metadata") == 0) {
+					else if(displayFunction.equals("metadata")) {
 						System.out.println("Metadata of " + varname + ": DataType.SCALAR");
 					}
 				}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/lops/compile/Dag.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/lops/compile/Dag.java b/src/main/java/org/apache/sysml/lops/compile/Dag.java
index 6296d92..2944444 100644
--- a/src/main/java/org/apache/sysml/lops/compile/Dag.java
+++ b/src/main/java/org/apache/sysml/lops/compile/Dag.java
@@ -1013,7 +1013,7 @@ public class Dag<N extends Lop>
 						if ( dnode.isTransient() 
 								&& input.getExecLocation() == ExecLocation.Data 
 								&& ((Data)input).isTransient() 
-								&& dnode.getOutputParameters().getLabel().compareTo(input.getOutputParameters().getLabel()) == 0 ) {
+								&& dnode.getOutputParameters().getLabel().equals(input.getOutputParameters().getLabel()) ) {
 							// do nothing, <code>node</code> must not processed any further.
 							;
 						}
@@ -2867,8 +2867,8 @@ public class Dag<N extends Lop>
 					// no computation, just a copy
 					if (rnode.getInputs().get(0).getExecLocation() == ExecLocation.Data
 							&& ((Data) rnode.getInputs().get(0)).isTransient()
-							&& rnode.getOutputParameters().getLabel().compareTo(
-								rnode.getInputs().get(0).getOutputParameters().getLabel()) == 0) 
+							&& rnode.getOutputParameters().getLabel().equals(
+								rnode.getInputs().get(0).getOutputParameters().getLabel())) 
 					{
 						markedNodes.add(rnode);
 					}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
index 03a5d44..0ea80d8 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
@@ -683,10 +683,8 @@ public class ExternalFunctionProgramBlock extends FunctionProgramBlock
 			if (returnFunc.getFunctionOutput(i).getType() == FunctionParameterType.Matrix) {
 				Matrix m = (Matrix) returnFunc.getFunctionOutput(i);
 
-				if (!(tokens.get(0)
-						.compareTo(getFunctionParameterDataTypeString(FunctionParameterType.Matrix)) == 0)
-						|| !(tokens.get(2).compareTo(
-								getMatrixValueTypeString(m.getValueType())) == 0)) {
+				if (!(tokens.get(0).equals(getFunctionParameterDataTypeString(FunctionParameterType.Matrix)))
+						|| !(tokens.get(2).equals(getMatrixValueTypeString(m.getValueType())))) {
 					throw new PackageRuntimeException(
 							"Function output '"+outputs.get(i)+"' does not match with declaration.");
 				}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
index f8e2669..56b1c8b 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
@@ -150,7 +150,7 @@ public class ParameterizedBuiltinSPInstruction  extends ComputationSPInstruction
 			{
 				boolean bRmEmptyBC = false; 
 				if(parts.length > 6)
-					bRmEmptyBC = (parts[5].compareTo("true") == 0)?true:false;
+					bRmEmptyBC = Boolean.parseBoolean(parts[5]);
 									
 				func = ParameterizedBuiltin.getParameterizedBuiltinFnObject(opcode);
 				return new ParameterizedBuiltinSPInstruction(new SimpleOperator(func), paramsMap, out, opcode, str, bRmEmptyBC);

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
index c475517..abc54f1 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
@@ -63,7 +63,7 @@ public class ReblockSPInstruction extends UnarySPInstruction
 		String parts[] = InstructionUtils.getInstructionPartsWithValueType(str);
 		String opcode = parts[0];
 		
-		if(opcode.compareTo("rblk") != 0) {
+		if(!opcode.equals("rblk")) {
 			throw new DMLRuntimeException("Incorrect opcode for ReblockSPInstruction:" + opcode);
 		}
 		

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
index cdfdc54..1514e5e 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
@@ -107,7 +107,7 @@ public class ReorgSPInstruction extends UnarySPInstruction
 			boolean bSortIndInMem = false;		
 			
 			if(parts.length > 5)
-				bSortIndInMem = (parts[6].compareTo("true") == 0)?true:false;
+				bSortIndInMem = Boolean.parseBoolean(parts[6]);
 						
 			return new ReorgSPInstruction(new ReorgOperator(SortIndex.getSortIndexFnObject(1,false,false)), 
 					                      in, col, desc, ixret, out, opcode, bSortIndInMem, str);

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
index 1408d4d..f949f74 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
@@ -131,13 +131,10 @@ public class RDDConverterUtilsExt
 	
 	// Useful for printing, testing binary blocked RDD and also for external use.
 	public static JavaRDD<String> binaryBlockToStringRDD(JavaPairRDD<MatrixIndexes, MatrixBlock> input, MatrixCharacteristics mcIn, String format) throws DMLRuntimeException {
-		if(format.compareTo("text") == 0) {
+		if(format.equals("text")) {
 			JavaRDD<String> ijv = input.flatMap(new ConvertMatrixBlockToIJVLines(mcIn.getRowsPerBlock(), mcIn.getColsPerBlock()));
 			return ijv;
 		}
-//		else if(format.compareTo("csv") == 0) {
-//			
-//		}
 		else {
 			throw new DMLRuntimeException("The output format:" + format + " is not implemented yet.");
 		}
@@ -194,7 +191,7 @@ public class RDDConverterUtilsExt
 		String firstCol = null;
 		boolean colPresent = false;
 		for(String col : df.columns()) {
-			if(col.compareTo(column) == 0) {
+			if(col.equals(column)) {
 				colPresent = true;
 			}
 			else if(firstCol == null) {

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
index 7199477..06ae844 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
@@ -835,7 +835,7 @@ public class MRJobConfiguration
 		for(int i=0; i<matrices.length; i++)
 		{
 			Path p = new Path(matrices[i]).makeQualified(fs);
-			if(thisFile.toUri().compareTo(p.toUri())==0 || thisDir.toUri().compareTo(p.toUri())==0)
+			if(thisFile.toUri().equals(p.toUri()) || thisDir.toUri().equals(p.toUri()))
 				representativeMatrixes.add(indexes[i]);
 		}
 		return representativeMatrixes;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/8cea30cd/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
index 4dde85b..957c89a 100644
--- a/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
@@ -1421,9 +1421,9 @@ public class DataTransform {
 		String fullTxMtdPath = path1.toString();
 		String fullOutputPath = path2.toString();
 		
-		if(path1.getParent().toString().compareTo(path2.getParent().toString()) == 0) {
+		if(path1.getParent().toString().equals(path2.getParent().toString())) {
 			// Both txMtdPath and outputPath are in same folder, but outputPath can have suffix 
-			if(fullTxMtdPath.compareTo(fullOutputPath) == 0) {
+			if(fullTxMtdPath.equals(fullOutputPath)) {
 				throw new DMLRuntimeException("The transform path \'" + txMtdPath 
 						+ "\' cannot overlap with the output path \'" + outputPath + "\'");
 			}