This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new 9e68af9 [MINOR] Code cleanup (warnings and some refactoring)
9e68af9 is described below
commit 9e68af9decc2404a9041fca75bbf5bb989e41efd
Author: Matthias Boehm <[email protected]>
AuthorDate: Sun Jul 4 22:37:16 2021 +0200
[MINOR] Code cleanup (warnings and some refactoring)
---
src/main/java/org/apache/sysds/hops/Hop.java | 2 +-
.../SingletonLookupHashMap.java | 2 +-
.../compress/colgroup/ColGroupCompressed.java | 2 +
.../runtime/compress/colgroup/ColGroupConst.java | 2 +
.../runtime/compress/colgroup/ColGroupDDC.java | 3 +-
.../runtime/compress/colgroup/ColGroupEmpty.java | 1 +
.../runtime/compress/colgroup/ColGroupOLE.java | 3 +-
.../runtime/compress/colgroup/ColGroupOffset.java | 2 +-
.../runtime/compress/colgroup/ColGroupRLE.java | 1 +
.../runtime/compress/colgroup/ColGroupSDC.java | 2 +-
.../compress/colgroup/ColGroupSDCSingle.java | 2 +-
.../compress/colgroup/ColGroupSDCSingleZeros.java | 2 +-
.../compress/colgroup/ColGroupSDCZeros.java | 1 +
.../compress/colgroup/ColGroupUncompressed.java | 2 +-
.../runtime/compress/colgroup/ColGroupValue.java | 1 +
.../runtime/compress/colgroup/offset/AOffset.java | 2 +-
.../compress/cost/ComputationCostEstimator.java | 8 ++-
.../compress/cost/DistinctCostEstimator.java | 2 +-
.../runtime/compress/cost/MemoryCostEstimator.java | 1 +
.../instructions/cp/CompressionCPInstruction.java | 2 +-
.../fed/QuaternaryWUMMFEDInstruction.java | 4 --
.../spark/CompressionSPInstruction.java | 2 +-
.../apache/sysds/runtime/util/PorterStemmer.java | 84 +++++++++++-----------
.../component/compress/workload/WorkloadTest.java | 2 +-
.../federated/quaternary/FederatedWUMMPow2Test.dml | 2 +
.../quaternary/FederatedWUMMPow2TestReference.dml | 3 +
26 files changed, 75 insertions(+), 65 deletions(-)
diff --git a/src/main/java/org/apache/sysds/hops/Hop.java
b/src/main/java/org/apache/sysds/hops/Hop.java
index ec23ddb..e01ffa1 100644
--- a/src/main/java/org/apache/sysds/hops/Hop.java
+++ b/src/main/java/org/apache/sysds/hops/Hop.java
@@ -48,9 +48,9 @@ import org.apache.sysds.lops.LopsException;
import org.apache.sysds.lops.ReBlock;
import org.apache.sysds.lops.UnaryCP;
import org.apache.sysds.parser.ParseInfo;
+import org.apache.sysds.runtime.compress.SingletonLookupHashMap;
import org.apache.sysds.runtime.compress.workload.AWTreeNode;
import org.apache.sysds.runtime.controlprogram.LocalVariableMap;
-import org.apache.sysds.runtime.controlprogram.SingletonLookupHashMap;
import org.apache.sysds.runtime.controlprogram.caching.MatrixObject.UpdateType;
import org.apache.sysds.runtime.controlprogram.context.SparkExecutionContext;
import org.apache.sysds.runtime.controlprogram.parfor.util.IDSequence;
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/SingletonLookupHashMap.java
b/src/main/java/org/apache/sysds/runtime/compress/SingletonLookupHashMap.java
similarity index 97%
rename from
src/main/java/org/apache/sysds/runtime/controlprogram/SingletonLookupHashMap.java
rename to
src/main/java/org/apache/sysds/runtime/compress/SingletonLookupHashMap.java
index 52895e9..bad83bf 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/SingletonLookupHashMap.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/SingletonLookupHashMap.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.runtime.controlprogram;
+package org.apache.sysds.runtime.compress;
import java.util.HashMap;
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupCompressed.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupCompressed.java
index 1470e3f..968e261 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupCompressed.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupCompressed.java
@@ -35,6 +35,8 @@ import
org.apache.sysds.runtime.matrix.operators.AggregateUnaryOperator;
*/
public abstract class ColGroupCompressed extends AColGroup {
+ private static final long serialVersionUID = 6219835795420081223L;
+
final protected int _numRows;
protected ColGroupCompressed(int numRows) {
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupConst.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupConst.java
index f1e4470..feca06f 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupConst.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupConst.java
@@ -31,6 +31,8 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
public class ColGroupConst extends ColGroupValue {
+ private static final long serialVersionUID = -7387793538322386611L;
+
/**
* Constructor for serialization
*
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
index 49bc16e..4749ffe 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupDDC.java
@@ -43,7 +43,8 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
*
*/
public class ColGroupDDC extends ColGroupValue {
-
+ private static final long serialVersionUID = -5769772089913918987L;
+
protected AMapToData _data;
protected ColGroupDDC(int numRows) {
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupEmpty.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupEmpty.java
index 3657231..0032f68 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupEmpty.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupEmpty.java
@@ -26,6 +26,7 @@ import
org.apache.sysds.runtime.matrix.operators.BinaryOperator;
import org.apache.sysds.runtime.matrix.operators.ScalarOperator;
public class ColGroupEmpty extends ColGroupCompressed {
+ private static final long serialVersionUID = -2307677253622099958L;
/**
* Constructor for serialization
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
index 355f2f8..97cc7bc 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOLE.java
@@ -37,7 +37,8 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
* distinct values.
*/
public class ColGroupOLE extends ColGroupOffset {
-
+ private static final long serialVersionUID = 5723227906925121066L;
+
/**
* Constructor for serialization
*
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOffset.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOffset.java
index 7f51774..1b2bb2e 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOffset.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupOffset.java
@@ -36,7 +36,7 @@ import org.apache.sysds.utils.MemoryEstimates;
* difficult to support both data layouts at the same time (distributed/local
as well as w/ and w/o low-level opt)
*/
public abstract class ColGroupOffset extends ColGroupValue {
-
+ private static final long serialVersionUID = -4105103687174067602L;
/** Bitmaps, one per uncompressed value tuple in {@link #_dict}. */
protected int[] _ptr;
/** Linearized bitmaps (variable lengths) */
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
index 6817d6a..9a5066e 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupRLE.java
@@ -36,6 +36,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
/** A group of columns compressed with a single run-length encoded bitmap. */
public class ColGroupRLE extends ColGroupOffset {
+ private static final long serialVersionUID = -1560710477952862791L;
/**
* Constructor for serialization
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDC.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDC.java
index ccb20b8..0358ac3 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDC.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDC.java
@@ -47,7 +47,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
* would be materialized in the group without any overhead.
*/
public class ColGroupSDC extends ColGroupValue {
-
+ private static final long serialVersionUID = 769993538831949086L;
/**
* Sparse row indexes for the data
*/
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingle.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingle.java
index 0d35395..c66c50b 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingle.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingle.java
@@ -45,7 +45,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
* would be materialized in the group without any overhead.
*/
public class ColGroupSDCSingle extends ColGroupValue {
-
+ private static final long serialVersionUID = 3883228464052204200L;
/**
* Sparse row indexes for the data
*/
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
index a1c3578..b3827ec 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCSingleZeros.java
@@ -45,7 +45,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
* would be materialized in the group without any overhead.
*/
public class ColGroupSDCSingleZeros extends ColGroupValue {
-
+ private static final long serialVersionUID = 8033235615964315078L;
/**
* Sparse row indexes for the data
*/
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCZeros.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCZeros.java
index 8115882..4301de1 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCZeros.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupSDCZeros.java
@@ -48,6 +48,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
* This column group is handy in cases where sparse unsafe operations is
executed on very sparse columns.
*/
public class ColGroupSDCZeros extends ColGroupValue {
+ private static final long serialVersionUID = -3703199743391937991L;
/**
* Sparse row indexes for the data
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
index d3be13b..a9412d0 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupUncompressed.java
@@ -48,7 +48,7 @@ import org.apache.sysds.runtime.util.SortUtils;
*
*/
public class ColGroupUncompressed extends AColGroup {
-
+ private static final long serialVersionUID = -8254271148043292199L;
/**
* We store the contents of the columns as a MatrixBlock to take
advantage of high-performance routines available
* for this data structure.
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupValue.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupValue.java
index 024e8a9..fb20170 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupValue.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupValue.java
@@ -53,6 +53,7 @@ import
org.apache.sysds.runtime.matrix.operators.ScalarOperator;
*
*/
public abstract class ColGroupValue extends ColGroupCompressed implements
Cloneable {
+ private static final long serialVersionUID = -6835757655517301955L;
/** Thread-local pairs of reusable temporary vectors for positions and
values */
private static ThreadLocal<Pair<int[], double[]>> memPool = new
ThreadLocal<Pair<int[], double[]>>() {
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
index b4478ab..3c340be 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/offset/AOffset.java
@@ -69,7 +69,7 @@ public abstract class AOffset {
sk.put(row, it.clone());
}
else {
- Map<Integer, AIterator> nsk = new HashMap<Integer,
AIterator>();
+ Map<Integer, AIterator> nsk = new HashMap<>();
nsk.put(row, it.clone());
skipIterators = new SoftReference<>(nsk);
}
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/cost/ComputationCostEstimator.java
b/src/main/java/org/apache/sysds/runtime/compress/cost/ComputationCostEstimator.java
index 55a4aec..2d4bffa 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/cost/ComputationCostEstimator.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/cost/ComputationCostEstimator.java
@@ -26,6 +26,8 @@ import
org.apache.sysds.runtime.compress.estim.CompressedSizeInfoColGroup;
public class ComputationCostEstimator implements ICostEstimate {
+ private static final long serialVersionUID = -1205636215389161815L;
+
private final boolean _isCompareAll;
private final int _nRows;
@@ -103,7 +105,7 @@ public class ComputationCostEstimator implements
ICostEstimate {
return preAggregateCost + postScalingCost;
}
- private double rightMultCost(CompressedSizeInfoColGroup g) {
+ private static double rightMultCost(CompressedSizeInfoColGroup g) {
final int nCols = g.getColumns().length;
final int numberTuples = g.getNumVals() * 10;
final double tupleSparsity = g.getTupleSparsity();
@@ -123,7 +125,7 @@ public class ComputationCostEstimator implements
ICostEstimate {
return _nRows * 16 * (g.getNumVals() / 64000 + 1);
}
- private double dictionaryOpsCost(CompressedSizeInfoColGroup g) {
+ private static double dictionaryOpsCost(CompressedSizeInfoColGroup g) {
return g.getColumns().length * g.getNumVals();
}
@@ -186,7 +188,7 @@ public class ComputationCostEstimator implements
ICostEstimate {
return Math.min(costLeft, costRight);
}
- private double getCostOfSelfMultiplication(CompressedSizeInfoColGroup
g) {
+ private static double
getCostOfSelfMultiplication(CompressedSizeInfoColGroup g) {
final int nv = g.getNumVals();
final int nCols = g.getColumns().length;
final double ts = g.getTupleSparsity();
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
b/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
index a6128d7..26441d0 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/cost/DistinctCostEstimator.java
@@ -33,7 +33,7 @@ import
org.apache.sysds.runtime.compress.estim.CompressedSizeInfoColGroup;
* values.
*/
public class DistinctCostEstimator implements ICostEstimate {
-
+ private static final long serialVersionUID = 4784682182584508597L;
private final static int toSmallForAnalysis = 64;
private final int nRows;
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/cost/MemoryCostEstimator.java
b/src/main/java/org/apache/sysds/runtime/compress/cost/MemoryCostEstimator.java
index 0d68901..e49d102 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/cost/MemoryCostEstimator.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/cost/MemoryCostEstimator.java
@@ -25,6 +25,7 @@ import
org.apache.sysds.runtime.compress.DMLCompressionException;
import org.apache.sysds.runtime.compress.estim.CompressedSizeInfoColGroup;
public class MemoryCostEstimator implements ICostEstimate {
+ private static final long serialVersionUID = -1264988969161809465L;
public MemoryCostEstimator() {
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/CompressionCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/CompressionCPInstruction.java
index 775bb7a..5ccbc41 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/CompressionCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/CompressionCPInstruction.java
@@ -21,8 +21,8 @@ package org.apache.sysds.runtime.instructions.cp;
import org.apache.sysds.hops.OptimizerUtils;
import org.apache.sysds.runtime.compress.CompressedMatrixBlockFactory;
+import org.apache.sysds.runtime.compress.SingletonLookupHashMap;
import org.apache.sysds.runtime.compress.workload.WTreeRoot;
-import org.apache.sysds.runtime.controlprogram.SingletonLookupHashMap;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.instructions.InstructionUtils;
import org.apache.sysds.runtime.matrix.data.MatrixBlock;
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/fed/QuaternaryWUMMFEDInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/fed/QuaternaryWUMMFEDInstruction.java
index 1d84c97..c580b58 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/fed/QuaternaryWUMMFEDInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/fed/QuaternaryWUMMFEDInstruction.java
@@ -72,8 +72,6 @@ public class QuaternaryWUMMFEDInstruction extends
QuaternaryFEDInstruction {
if(X.isFederated(FType.ROW)) { // row partitioned X
if(U.isFederated(FType.ROW) &&
fedMap.isAligned(U.getFedMapping(), AlignType.ROW)) {
-
System.out.println("QuaternaryWUMMFEDInstruction.java:75 - U federated and
aligned");
- // U federated and aligned
varNewIn[1] = U.getFedMapping().getID();
}
else {
@@ -87,8 +85,6 @@ public class QuaternaryWUMMFEDInstruction extends
QuaternaryFEDInstruction {
frB = fedMap.broadcast(U);
varNewIn[1] = frB.getID();
if(V.isFederated() &&
fedMap.isAligned(V.getFedMapping(), AlignType.COL, AlignType.COL_T)) {
-
System.out.println("QuaternaryWUMMFEDInstruction.java:90 - V federated and
aligned");
- // V federated and aligned
varNewIn[2] = V.getFedMapping().getID();
}
else {
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/spark/CompressionSPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/spark/CompressionSPInstruction.java
index 6b4eada..64809cf 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/spark/CompressionSPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/spark/CompressionSPInstruction.java
@@ -22,10 +22,10 @@ package org.apache.sysds.runtime.instructions.spark;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.function.Function;
import org.apache.sysds.runtime.compress.CompressedMatrixBlockFactory;
+import org.apache.sysds.runtime.compress.SingletonLookupHashMap;
import org.apache.sysds.runtime.compress.cost.CostEstimatorBuilder;
import org.apache.sysds.runtime.compress.cost.ICostEstimate;
import org.apache.sysds.runtime.compress.workload.WTreeRoot;
-import org.apache.sysds.runtime.controlprogram.SingletonLookupHashMap;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.controlprogram.context.SparkExecutionContext;
import
org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
diff --git a/src/main/java/org/apache/sysds/runtime/util/PorterStemmer.java
b/src/main/java/org/apache/sysds/runtime/util/PorterStemmer.java
index bc084fa..9c8b241 100644
--- a/src/main/java/org/apache/sysds/runtime/util/PorterStemmer.java
+++ b/src/main/java/org/apache/sysds/runtime/util/PorterStemmer.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
+import java.util.Map.Entry;
/**
* Stemmer, implementing the Porter Stemming Algorithm
@@ -122,13 +122,13 @@ public class PorterStemmer
return true;
}
// process the collection of tuples to find which prefix matches the
case.
- private static String processMatched(String word, HashMap suffixAndfix,
int mCount)
+ private static String processMatched(String word,
HashMap<String,String> suffixAndfix, int mCount)
{
String stemmed = null;
- Iterator it = suffixAndfix.entrySet().iterator();
+ Iterator<Entry<String,String>> it =
suffixAndfix.entrySet().iterator();
while (it.hasNext() && (stemmed == null)) {
- Map.Entry pair = (Map.Entry)it.next();
- stemmed = replacer(word, pair.getKey().toString(),
pair.getValue().toString(), mCount);
+ Entry<String,String> pair = it.next();
+ stemmed = replacer(word, pair.getKey().toString(),
pair.getValue(), mCount);
it.remove();
}
return stemmed;
@@ -220,35 +220,33 @@ public class PorterStemmer
private static String step2(String word) {
int len = word .length();
if (len == 0) return word;
- HashMap<String, String> suffixAndfix = new HashMap<String,
String>()
- {{
- put("ational", "ate");
- put("tional","tion");
- put("enci","ence");
- put("anci","ance");
- put("izer","ize");
- put("bli","ble");
- put("alli", "al");
- put("entli","ent");
- put("eli","e");
- put("ousli","ous");
- put("ization","ize");
- put("ation","ate");
- put("ator","ate");
- put("alism","al");
- put("iveness", "ive");
- put("fulness","ful");
- put("ousness", "ous");
- put("aliti", "al");
- put("iviti","ive");
- put("biliti", "ble");
- put("log", "logi");
- put("icate", "ic");
- put("ative","");
- put("alize","al");
- put("iciti","ic");
- put("ical","ic");
- }};
+ HashMap<String, String> suffixAndfix = new HashMap<>();
+ suffixAndfix.put("ational", "ate");
+ suffixAndfix.put("tional","tion");
+ suffixAndfix.put("enci","ence");
+ suffixAndfix.put("anci","ance");
+ suffixAndfix.put("izer","ize");
+ suffixAndfix.put("bli","ble");
+ suffixAndfix.put("alli", "al");
+ suffixAndfix.put("entli","ent");
+ suffixAndfix.put("eli","e");
+ suffixAndfix.put("ousli","ous");
+ suffixAndfix.put("ization","ize");
+ suffixAndfix.put("ation","ate");
+ suffixAndfix.put("ator","ate");
+ suffixAndfix.put("alism","al");
+ suffixAndfix.put("iveness", "ive");
+ suffixAndfix.put("fulness","ful");
+ suffixAndfix.put("ousness", "ous");
+ suffixAndfix.put("aliti", "al");
+ suffixAndfix.put("iviti","ive");
+ suffixAndfix.put("biliti", "ble");
+ suffixAndfix.put("log", "logi");
+ suffixAndfix.put("icate", "ic");
+ suffixAndfix.put("ative","");
+ suffixAndfix.put("alize","al");
+ suffixAndfix.put("iciti","ic");
+ suffixAndfix.put("ical","ic");
String stemmed = processMatched(word, suffixAndfix, 0);
return (stemmed != null)? stemmed: word;
@@ -257,16 +255,14 @@ public class PorterStemmer
private static String step3(String word) {
int len = word .length();
if (len == 0) return word;
- HashMap<String, String> suffixAndfix = new HashMap<String,
String>()
- {{
- put("icate", "ic");
- put("ative","");
- put("alize","al");
- put("iciti","ic");
- put("ical","ic");
- put("ful","");
- put("ness","");
- }};
+ HashMap<String, String> suffixAndfix = new HashMap<>();
+ suffixAndfix.put("icate", "ic");
+ suffixAndfix.put("ative","");
+ suffixAndfix.put("alize","al");
+ suffixAndfix.put("iciti","ic");
+ suffixAndfix.put("ical","ic");
+ suffixAndfix.put("ful","");
+ suffixAndfix.put("ness","");
String stemmed = processMatched(word, suffixAndfix, 0);
return (stemmed != null)? stemmed: word;
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/workload/WorkloadTest.java
b/src/test/java/org/apache/sysds/test/component/compress/workload/WorkloadTest.java
index e0281ec..d2a3258 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/workload/WorkloadTest.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/workload/WorkloadTest.java
@@ -200,7 +200,7 @@ public class WorkloadTest {
Assert.assertEquals(shouldCompress, ceb.shouldTryToCompress());
}
- private WTreeRoot getWorkloadTree(DMLProgram prog) {
+ private static WTreeRoot getWorkloadTree(DMLProgram prog) {
Map<Long, WTreeRoot> c =
WorkloadAnalyzer.getAllCandidateWorkloads(prog);
Assert.assertEquals(c.size(), 1);
for(long k : c.keySet())
diff --git
a/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2Test.dml
b/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2Test.dml
index 8c9642f..a191fc1 100644
--- a/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2Test.dml
+++ b/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2Test.dml
@@ -38,6 +38,8 @@ while(FALSE) { }
Z3 = X / (V %*% t(U))^2;
while(FALSE) { }
+print("XX "+mean(Z3))
Z = Z1 + Z2 + mean(Z3);
+print("XXX "+as.scalar(Z[1,1]))
write(Z, $out_Z);
diff --git
a/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2TestReference.dml
b/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2TestReference.dml
index 6e454e7..e1a3230 100644
---
a/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2TestReference.dml
+++
b/src/test/scripts/functions/federated/quaternary/FederatedWUMMPow2TestReference.dml
@@ -33,6 +33,9 @@ X = t(X);
Z3 = X / (V %*% t(U))^2;
+print("XX "+mean(Z3))
+
Z = Z1 + Z2 + mean(Z3);
+print("XXX "+as.scalar(Z[1,1]))
write(Z, $out_Z);
