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/08/01 22:00:56 UTC
systemml git commit: [MINOR] Refactoring - boolean constructors,
returns, semicolons
Repository: systemml
Updated Branches:
refs/heads/master 2942f89b3 -> 8c11e8c07
[MINOR] Refactoring - boolean constructors, returns, semicolons
1) Boolean constructor creates new Boolean instances, so follow best
practice of using Boolean.TRUE, Boolean.FALSE, and Boolean.valueOf()
rather than the Boolean constructor. See Boolean constructor javadocs
for more information.
2) Remove unnecessary return statements
3) Remove extraneous semicolons
Closes #583.
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/8c11e8c0
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/8c11e8c0
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/8c11e8c0
Branch: refs/heads/master
Commit: 8c11e8c075d5fcf8e2b190dd34c3cd1be8d11186
Parents: 2942f89
Author: Deron Eriksson <de...@apache.org>
Authored: Tue Aug 1 14:58:22 2017 -0700
Committer: Deron Eriksson <de...@apache.org>
Committed: Tue Aug 1 14:58:22 2017 -0700
----------------------------------------------------------------------
.../apache/sysml/api/mlcontext/MLResults.java | 2 +-
.../sysml/parser/BuiltinFunctionExpression.java | 1 -
.../org/apache/sysml/parser/DMLTranslator.java | 4 ---
.../org/apache/sysml/parser/DataExpression.java | 1 -
.../sysml/parser/FunctionCallIdentifier.java | 2 --
.../ParameterizedBuiltinFunctionExpression.java | 4 ---
.../controlprogram/parfor/ProgramConverter.java | 2 +-
.../instructions/cp/VariableCPInstruction.java | 2 +-
.../sysml/runtime/matrix/data/MatrixBlock.java | 2 +-
.../functions/frame/FrameCopyTest.java | 2 +-
.../indexing/IndexRangeBlockAlignmentTest.java | 32 ++++++++++----------
.../misc/RewriteCTableToRExpandTest.java | 4 +--
.../functions/ternary/TernaryAggregateTest.java | 4 +--
13 files changed, 25 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/api/mlcontext/MLResults.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/mlcontext/MLResults.java b/src/main/java/org/apache/sysml/api/mlcontext/MLResults.java
index e4d23da..6c4cfc5 100644
--- a/src/main/java/org/apache/sysml/api/mlcontext/MLResults.java
+++ b/src/main/java/org/apache/sysml/api/mlcontext/MLResults.java
@@ -1980,7 +1980,7 @@ public class MLResults {
private <T> T outputValue(String outputName) {
Data data = getData(outputName);
if (data instanceof BooleanObject) {
- return (T) new Boolean(((BooleanObject) data).getBooleanValue());
+ return (T) Boolean.valueOf(((BooleanObject) data).getBooleanValue());
} else if (data instanceof DoubleObject) {
return (T) new Double(((DoubleObject) data).getDoubleValue());
} else if (data instanceof IntObject) {
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
index 54281cc..3ffc2d9 100644
--- a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
@@ -1217,7 +1217,6 @@ public class BuiltinFunctionExpression extends DataIdentifier
raiseValidateError("Unsupported function "+op, false, LanguageErrorCodes.INVALID_PARAMETERS);
}
}
- return;
}
private void setBinaryOutputProperties(DataIdentifier output)
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/parser/DMLTranslator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DMLTranslator.java b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
index b547985..818815d 100644
--- a/src/main/java/org/apache/sysml/parser/DMLTranslator.java
+++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
@@ -175,8 +175,6 @@ public class DMLTranslator
constVars = sb.getConstOut();
}
}
-
- return;
}
public void liveVariableAnalysis(DMLProgram dmlp) throws LanguageException {
@@ -240,8 +238,6 @@ public class DMLTranslator
currentLiveOut = sb.analyze(currentLiveOut);
}
}
- return;
-
}
/**
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/parser/DataExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/DataExpression.java b/src/main/java/org/apache/sysml/parser/DataExpression.java
index 47f85f4..1fa8fd3 100644
--- a/src/main/java/org/apache/sysml/parser/DataExpression.java
+++ b/src/main/java/org/apache/sysml/parser/DataExpression.java
@@ -1671,7 +1671,6 @@ public class DataExpression extends DataIdentifier
default:
raiseValidateError("Unsupported Data expression"+ this.getOpCode(), false, LanguageErrorCodes.INVALID_PARAMETERS); //always unconditional
}
- return;
}
private void performConstantPropagationRand( HashMap<String, ConstIdentifier> currConstVars )
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
index 8f48789..14880ce 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
@@ -163,8 +163,6 @@ public class FunctionCallIdentifier extends DataIdentifier
for(int i=0; i < fstmt.getOutputParams().size(); i++) {
_outputs[i] = new DataIdentifier(fstmt.getOutputParams().get(i));
}
-
- return;
}
@Override
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index 4a3da28..f90b7ef 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -244,7 +244,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
raiseValidateError("Unsupported parameterized function "+ getOpCode(),
false, LanguageErrorCodes.UNSUPPORTED_EXPRESSION);
}
- return;
}
@Override
@@ -277,8 +276,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
default: //always unconditional (because unsupported operation)
raiseValidateError("Unsupported parameterized function "+ getOpCode(), false, LanguageErrorCodes.INVALID_PARAMETERS);
}
-
- return;
}
// example: A = transformapply(target=X, meta=M, spec=s)
@@ -645,7 +642,6 @@ public class ParameterizedBuiltinFunctionExpression extends DataIdentifier
output.setDataType(DataType.SCALAR);
output.setValueType(ValueType.DOUBLE);
output.setDimensions(0, 0);
- return;
}
private void validateCastAsString(DataIdentifier output, boolean conditional)
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
index a946372..d786eaa 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
@@ -1427,7 +1427,7 @@ public class ProgramConverter
throws DMLRuntimeException
{
ArrayList<ProgramBlock> pbs = new ArrayList<ProgramBlock>();
- String tmpdata = in.substring(PARFOR_PBS_BEGIN.length(),in.length()-PARFOR_PBS_END.length()); ;
+ String tmpdata = in.substring(PARFOR_PBS_BEGIN.length(),in.length()-PARFOR_PBS_END.length());
HierarchyAwareStringTokenizer st = new HierarchyAwareStringTokenizer(tmpdata, ELEMENT_DELIM);
while( st.hasMoreTokens() )
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
index 336cfbf..c2aa5d5 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
@@ -492,7 +492,7 @@ public class VariableCPInstruction extends CPInstruction
String fname = getInput2().getName();
// check if unique filename needs to be generated
- boolean overrideFileName = ((BooleanObject) ec.getScalarInput(getInput3().getName(), getInput3().getValueType(), true)).getBooleanValue();; //!(input1.getName().startsWith("p")); //
+ boolean overrideFileName = ((BooleanObject) ec.getScalarInput(getInput3().getName(), getInput3().getValueType(), true)).getBooleanValue();
if ( overrideFileName ) {
fname = fname + "_" + _uniqueVarID.getNextID();
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
index 93f48c7..7d19d61 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
@@ -2986,7 +2986,7 @@ public class MatrixBlock extends MatrixValue implements CacheBlock, Externalizab
for(int c=0; c<clen; c++)
{
buffer._sum=this.quickGetValue(r, c);
- buffer._correction=cor.quickGetValue(r, 0);;
+ buffer._correction=cor.quickGetValue(r, 0);
buffer=(KahanObject) aggOp.increOp.fn.execute(buffer, newWithCor.quickGetValue(r, c), newWithCor.quickGetValue(r, c+1));
quickSetValue(r, c, buffer._sum);
cor.quickSetValue(r, 0, buffer._correction);
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameCopyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameCopyTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameCopyTest.java
index 84bd36d..b0e56af 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameCopyTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameCopyTest.java
@@ -137,7 +137,7 @@ public class FrameCopyTest extends AutomatedTestBase
for( int j=0; j<lschema.length; j++ ) {
switch( lschema[j] ) {
case STRING: frame.set(updateRow, j, "String:"+ frame.get(updateRow, j)); break;
- case BOOLEAN: frame.set(updateRow, j, ((Boolean)frame.get(updateRow, j))?(new Boolean(false)):(new Boolean(true))); break;
+ case BOOLEAN: frame.set(updateRow, j, ((Boolean)frame.get(updateRow, j))?Boolean.FALSE:Boolean.TRUE); break;
case INT: frame.set(updateRow, j, (Long)frame.get(updateRow, j) * 2 + 5); break;
case DOUBLE: frame.set(updateRow, j, (Double)frame.get(updateRow, j) * 2 + 7); break;
default: throw new RuntimeException("Unsupported value type: "+lschema[j]);
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
index b14ae99..9eb04ad 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/IndexRangeBlockAlignmentTest.java
@@ -38,49 +38,49 @@ public class IndexRangeBlockAlignmentTest extends AutomatedTestBase
@Test
public void testRowBlockFirstColumn() {
- Assert.assertEquals(new Boolean(true),
- OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 1, 1736, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.TRUE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testRowBlockColBlock() {
- Assert.assertEquals(new Boolean(true),
- OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 7001, 9000, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.TRUE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2001, 4000, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockFirstColumn() {
- Assert.assertEquals(new Boolean(true),
- OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 1, 1736, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.TRUE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockColBlock() {
- Assert.assertEquals(new Boolean(true),
- OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 7001, 9000, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.TRUE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2500, 2600, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testRowBlockFirstColumnNeg() {
- Assert.assertEquals(new Boolean(false),
- OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 1, 1736, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.FALSE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testRowBlockColBlockNeg() {
- Assert.assertEquals(new Boolean(false),
- OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 7001, 9000, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.FALSE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2501, 4500, 7001, 9000, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockFirstColumnNeg() {
- Assert.assertEquals(new Boolean(false),
- OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 1, 1736, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.FALSE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 1, 1736, BRLEN, BCLEN));
}
@Test
public void testSingleRowBlockColBlockNeg() {
- Assert.assertEquals(new Boolean(false),
- OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 7001, 9000, BRLEN, BCLEN));
+ Assert.assertEquals(Boolean.FALSE,
+ OptimizerUtils.isIndexingRangeBlockAligned(2500, 3001, 7001, 9000, BRLEN, BCLEN));
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java
index aa7d25a..b42a978 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteCTableToRExpandTest.java
@@ -124,7 +124,7 @@ public class RewriteCTableToRExpandTest extends AutomatedTestBase
checkDMLMetaDataFile("R", new MatrixCharacteristics(rrows, rcols, 1, 1));
//check for applied rewrite
- Assert.assertEquals(new Boolean(testname.equals(TEST_NAME1)||testname.equals(TEST_NAME2)),
- new Boolean(heavyHittersContainsSubString("rexpand")));
+ Assert.assertEquals(Boolean.valueOf(testname.equals(TEST_NAME1) || testname.equals(TEST_NAME2)),
+ Boolean.valueOf(heavyHittersContainsSubString("rexpand")));
}
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/8c11e8c0/src/test/java/org/apache/sysml/test/integration/functions/ternary/TernaryAggregateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/ternary/TernaryAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TernaryAggregateTest.java
index 6885e81..600a6c0 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/ternary/TernaryAggregateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TernaryAggregateTest.java
@@ -254,8 +254,8 @@ public class TernaryAggregateTest extends AutomatedTestBase
if( rewrites && et != ExecType.MR ) {
String opcode = ((et == ExecType.SPARK) ? Instruction.SP_INST_PREFIX : "") +
(((testname.equals(TEST_NAME1) || vectors ) ? "tak+*" : "tack+*"));
- Assert.assertEquals(new Boolean(true), new Boolean(
- Statistics.getCPHeavyHitterOpCodes().contains(opcode)));
+ Assert.assertEquals(Boolean.TRUE,
+ Boolean.valueOf(Statistics.getCPHeavyHitterOpCodes().contains(opcode)));
}
}
finally {