Repository: incubator-hivemall Updated Branches: refs/heads/master e9c6f3e04 -> 8f285d75b
Applied source code formatter Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/8f285d75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/8f285d75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/8f285d75 Branch: refs/heads/master Commit: 8f285d75be9b8ad2e4b2b8d68e0a3c05faefff0d Parents: e9c6f3e Author: Makoto Yui <[email protected]> Authored: Wed Oct 18 21:18:22 2017 +0900 Committer: Makoto Yui <[email protected]> Committed: Wed Oct 18 21:18:22 2017 +0900 ---------------------------------------------------------------------- .../main/java/hivemall/evaluation/HitRateUDAF.java | 2 +- core/src/main/java/hivemall/evaluation/MAPUDAF.java | 2 +- core/src/main/java/hivemall/evaluation/MRRUDAF.java | 2 +- .../src/main/java/hivemall/evaluation/NDCGUDAF.java | 2 +- .../java/hivemall/evaluation/PrecisionUDAF.java | 2 +- .../main/java/hivemall/evaluation/RecallUDAF.java | 2 +- .../main/java/hivemall/ftvec/FeatureIndexUDF.java | 3 +-- .../java/hivemall/ftvec/trans/FFMFeaturesUDF.java | 4 ++-- .../main/java/hivemall/math/matrix/FloatMatrix.java | 2 +- .../java/hivemall/math/matrix/sparse/CSCMatrix.java | 12 ++++++------ .../math/matrix/sparse/floats/CSCFloatMatrix.java | 16 ++++++++-------- .../hivemall/mf/OnlineMatrixFactorizationUDTF.java | 6 +++--- .../smile/tools/RandomForestEnsembleUDAF.java | 2 +- .../evaluation/BinaryResponsesMeasuresTest.java | 2 +- .../matrix/sparse/floats/DoKFloatMatrixTest.java | 6 +++--- 15 files changed, 32 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/HitRateUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/HitRateUDAF.java b/core/src/main/java/hivemall/evaluation/HitRateUDAF.java index 5464654..522c0f1 100644 --- a/core/src/main/java/hivemall/evaluation/HitRateUDAF.java +++ b/core/src/main/java/hivemall/evaluation/HitRateUDAF.java @@ -106,7 +106,7 @@ public final class HitRateUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/MAPUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/MAPUDAF.java b/core/src/main/java/hivemall/evaluation/MAPUDAF.java index 61341a3..8f3922d 100644 --- a/core/src/main/java/hivemall/evaluation/MAPUDAF.java +++ b/core/src/main/java/hivemall/evaluation/MAPUDAF.java @@ -88,7 +88,7 @@ public final class MAPUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/MRRUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/MRRUDAF.java b/core/src/main/java/hivemall/evaluation/MRRUDAF.java index e92df67..70e6af5 100644 --- a/core/src/main/java/hivemall/evaluation/MRRUDAF.java +++ b/core/src/main/java/hivemall/evaluation/MRRUDAF.java @@ -88,7 +88,7 @@ public final class MRRUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/NDCGUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/NDCGUDAF.java b/core/src/main/java/hivemall/evaluation/NDCGUDAF.java index 6b92afe..86990d8 100644 --- a/core/src/main/java/hivemall/evaluation/NDCGUDAF.java +++ b/core/src/main/java/hivemall/evaluation/NDCGUDAF.java @@ -91,7 +91,7 @@ public final class NDCGUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/PrecisionUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/PrecisionUDAF.java b/core/src/main/java/hivemall/evaluation/PrecisionUDAF.java index ca6c4f0..8dc9b3a 100644 --- a/core/src/main/java/hivemall/evaluation/PrecisionUDAF.java +++ b/core/src/main/java/hivemall/evaluation/PrecisionUDAF.java @@ -88,7 +88,7 @@ public final class PrecisionUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/evaluation/RecallUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/evaluation/RecallUDAF.java b/core/src/main/java/hivemall/evaluation/RecallUDAF.java index d0722d0..427ae7b 100644 --- a/core/src/main/java/hivemall/evaluation/RecallUDAF.java +++ b/core/src/main/java/hivemall/evaluation/RecallUDAF.java @@ -88,7 +88,7 @@ public final class RecallUDAF extends AbstractGenericUDAFResolver { @Override public ObjectInspector init(Mode mode, ObjectInspector[] parameters) throws HiveException { - assert (parameters.length >=1 && parameters.length <= 3) : parameters.length; + assert (parameters.length >= 1 && parameters.length <= 3) : parameters.length; super.init(mode, parameters); // initialize input http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/ftvec/FeatureIndexUDF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/ftvec/FeatureIndexUDF.java b/core/src/main/java/hivemall/ftvec/FeatureIndexUDF.java index 9fdbc01..8b0b993 100644 --- a/core/src/main/java/hivemall/ftvec/FeatureIndexUDF.java +++ b/core/src/main/java/hivemall/ftvec/FeatureIndexUDF.java @@ -30,8 +30,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.udf.UDFType; import org.apache.hadoop.io.IntWritable; -@Description( - name = "feature_index", +@Description(name = "feature_index", value = "_FUNC_(feature_vector in array<string>) - Returns feature indices in array<index>") @UDFType(deterministic = true, stateful = false) public final class FeatureIndexUDF extends UDF { http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/ftvec/trans/FFMFeaturesUDF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/ftvec/trans/FFMFeaturesUDF.java b/core/src/main/java/hivemall/ftvec/trans/FFMFeaturesUDF.java index a0acd36..b72b51a 100644 --- a/core/src/main/java/hivemall/ftvec/trans/FFMFeaturesUDF.java +++ b/core/src/main/java/hivemall/ftvec/trans/FFMFeaturesUDF.java @@ -189,8 +189,8 @@ public final class FFMFeaturesUDF extends UDFWithOptions { // categorical feature representation final String fv; if (_mhash) { - int field = _emitIndices ? i : MurmurHash3.murmurhash3(_featureNames[i], - _numFields); + int field = _emitIndices ? i + : MurmurHash3.murmurhash3(_featureNames[i], _numFields); // +NUM_FIELD to avoid conflict to quantitative features int index = MurmurHash3.murmurhash3(feature, _numFeatures) + _numFields; fv = builder.append(field).append(':').append(index).append(":1").toString(); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/math/matrix/FloatMatrix.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/math/matrix/FloatMatrix.java b/core/src/main/java/hivemall/math/matrix/FloatMatrix.java index f1af65f..79c34df 100644 --- a/core/src/main/java/hivemall/math/matrix/FloatMatrix.java +++ b/core/src/main/java/hivemall/math/matrix/FloatMatrix.java @@ -70,4 +70,4 @@ public interface FloatMatrix extends Matrix { @Override public ColumnMajorFloatMatrix toColumnMajorMatrix(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/math/matrix/sparse/CSCMatrix.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/math/matrix/sparse/CSCMatrix.java b/core/src/main/java/hivemall/math/matrix/sparse/CSCMatrix.java index 14bb4f9..b55e204 100644 --- a/core/src/main/java/hivemall/math/matrix/sparse/CSCMatrix.java +++ b/core/src/main/java/hivemall/math/matrix/sparse/CSCMatrix.java @@ -108,8 +108,8 @@ public final class CSCMatrix extends ColumnMajorMatrix { final int numCols = columnPointers.length - 1; for (int j = 0; j < numCols; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { row[j] = values[k]; } @@ -124,8 +124,8 @@ public final class CSCMatrix extends ColumnMajorMatrix { final int last = Math.min(dst.length, columnPointers.length - 1); for (int j = 0; j < last; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { dst[j] = values[k]; } else { @@ -145,8 +145,8 @@ public final class CSCMatrix extends ColumnMajorMatrix { row.clear(); for (int j = 0, last = columnPointers.length - 1; j < last; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { double v = values[k]; row.set(j, v); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/math/matrix/sparse/floats/CSCFloatMatrix.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/math/matrix/sparse/floats/CSCFloatMatrix.java b/core/src/main/java/hivemall/math/matrix/sparse/floats/CSCFloatMatrix.java index 3aa1dc9..948b6d5 100644 --- a/core/src/main/java/hivemall/math/matrix/sparse/floats/CSCFloatMatrix.java +++ b/core/src/main/java/hivemall/math/matrix/sparse/floats/CSCFloatMatrix.java @@ -108,8 +108,8 @@ public final class CSCFloatMatrix extends ColumnMajorFloatMatrix { final int numCols = columnPointers.length - 1; for (int j = 0; j < numCols; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { row[j] = values[k]; } @@ -124,8 +124,8 @@ public final class CSCFloatMatrix extends ColumnMajorFloatMatrix { final int last = Math.min(dst.length, columnPointers.length - 1); for (int j = 0; j < last; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { dst[j] = values[k]; } else { @@ -145,8 +145,8 @@ public final class CSCFloatMatrix extends ColumnMajorFloatMatrix { final int last = Math.min(dst.length, columnPointers.length - 1); for (int j = 0; j < last; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { dst[j] = values[k]; } else { @@ -166,8 +166,8 @@ public final class CSCFloatMatrix extends ColumnMajorFloatMatrix { row.clear(); for (int j = 0, last = columnPointers.length - 1; j < last; j++) { - final int k = Arrays.binarySearch(rowIndices, columnPointers[j], - columnPointers[j + 1], index); + final int k = Arrays.binarySearch(rowIndices, columnPointers[j], columnPointers[j + 1], + index); if (k >= 0) { float v = values[k]; row.set(j, v); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/mf/OnlineMatrixFactorizationUDTF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/mf/OnlineMatrixFactorizationUDTF.java b/core/src/main/java/hivemall/mf/OnlineMatrixFactorizationUDTF.java index ee549c5..e389edf 100644 --- a/core/src/main/java/hivemall/mf/OnlineMatrixFactorizationUDTF.java +++ b/core/src/main/java/hivemall/mf/OnlineMatrixFactorizationUDTF.java @@ -147,8 +147,8 @@ public abstract class OnlineMatrixFactorizationUDTF extends UDTFWithOptions impl initStdDev = Primitives.parseDouble(cl.getOptionValue("min_init_stddev"), 0.1d); this.iterations = Primitives.parseInt(cl.getOptionValue("iterations"), 1); if (iterations < 1) { - throw new UDFArgumentException( - "'-iterations' must be greater than or equal to 1: " + iterations); + throw new UDFArgumentException("'-iterations' must be greater than or equal to 1: " + + iterations); } conversionCheck = !cl.hasOption("disable_cvtest"); convergenceRate = Primitives.parseDouble(cl.getOptionValue("cv_rate"), convergenceRate); @@ -506,7 +506,7 @@ public abstract class OnlineMatrixFactorizationUDTF extends UDTFWithOptions impl if (inputBuf.position() > 0) { writeBuffer(inputBuf, fileIO, lastWritePos); } - + try { fileIO.flush(); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/main/java/hivemall/smile/tools/RandomForestEnsembleUDAF.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/smile/tools/RandomForestEnsembleUDAF.java b/core/src/main/java/hivemall/smile/tools/RandomForestEnsembleUDAF.java index 7f1d1ec..452c5f4 100644 --- a/core/src/main/java/hivemall/smile/tools/RandomForestEnsembleUDAF.java +++ b/core/src/main/java/hivemall/smile/tools/RandomForestEnsembleUDAF.java @@ -120,7 +120,7 @@ public final class RandomForestEnsembleUDAF extends AbstractGenericUDAFResolver public ObjectInspector init(@Nonnull Mode mode, @Nonnull ObjectInspector[] argOIs) throws HiveException { super.init(mode, argOIs); - + // initialize input if (mode == Mode.PARTIAL1 || mode == Mode.COMPLETE) {// from original data this.yhatOI = HiveUtils.asIntegerOI(argOIs[0]); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/test/java/hivemall/evaluation/BinaryResponsesMeasuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/hivemall/evaluation/BinaryResponsesMeasuresTest.java b/core/src/test/java/hivemall/evaluation/BinaryResponsesMeasuresTest.java index 574fc04..853dba0 100644 --- a/core/src/test/java/hivemall/evaluation/BinaryResponsesMeasuresTest.java +++ b/core/src/test/java/hivemall/evaluation/BinaryResponsesMeasuresTest.java @@ -103,7 +103,7 @@ public class BinaryResponsesMeasuresTest { List<Integer> groundTruth = Arrays.asList(1, 2, 4); double actual = BinaryResponsesMeasures.ReciprocalRank(rankedList, groundTruth, - rankedList.size()); + rankedList.size()); Assert.assertEquals(1.0d, actual, 0.0001d); Collections.reverse(rankedList); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/8f285d75/core/src/test/java/hivemall/math/matrix/sparse/floats/DoKFloatMatrixTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/hivemall/math/matrix/sparse/floats/DoKFloatMatrixTest.java b/core/src/test/java/hivemall/math/matrix/sparse/floats/DoKFloatMatrixTest.java index 697d348..8c64462 100644 --- a/core/src/test/java/hivemall/math/matrix/sparse/floats/DoKFloatMatrixTest.java +++ b/core/src/test/java/hivemall/math/matrix/sparse/floats/DoKFloatMatrixTest.java @@ -40,9 +40,9 @@ public class DoKFloatMatrixTest { Assert.assertEquals(v, matrix.get(row, col), 0.00001f); } } - + @Test - public void testToRowMajorMatrix() { + public void testToRowMajorMatrix() { DoKFloatMatrix matrix = new DoKFloatMatrix(); Random rnd = new Random(43); @@ -52,7 +52,7 @@ public class DoKFloatMatrixTest { float v = rnd.nextFloat(); matrix.set(row, col, v); } - + CSRFloatMatrix csr = matrix.toRowMajorMatrix(); Assert.assertEquals(10, csr.nnz()); }
