This is an automated email from the ASF dual-hosted git repository.
myui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hivemall.git
The following commit(s) were added to refs/heads/master by this push:
new f700a51 Moved matrix/random package to utils/random
f700a51 is described below
commit f700a51b8e26c01fd9530cfb7e664c340ba68135
Author: Makoto Yui <[email protected]>
AuthorDate: Mon Oct 7 16:16:19 2019 +0900
Moved matrix/random package to utils/random
---
core/src/main/java/hivemall/knn/similarity/DIMSUMMapperUDTF.java | 4 ++--
core/src/main/java/hivemall/smile/classification/DecisionTree.java | 4 ++--
.../smile/classification/GradientTreeBoostingClassifierUDTF.java | 4 ++--
.../hivemall/smile/classification/RandomForestClassifierUDTF.java | 4 ++--
.../java/hivemall/smile/regression/RandomForestRegressionUDTF.java | 4 ++--
core/src/main/java/hivemall/smile/regression/RegressionTree.java | 4 ++--
core/src/main/java/hivemall/smile/utils/SmileExtUtils.java | 4 ++--
core/src/main/java/hivemall/topicmodel/IncrementalPLSAModel.java | 4 ++--
core/src/main/java/hivemall/utils/lang/ArrayUtils.java | 2 +-
.../main/java/hivemall/{math => utils}/random/CommonsMathRandom.java | 2 +-
core/src/main/java/hivemall/{math => utils}/random/JavaRandom.java | 2 +-
core/src/main/java/hivemall/{math => utils}/random/PRNG.java | 2 +-
.../hivemall/{math => utils}/random/RandomNumberGeneratorFactory.java | 2 +-
core/src/main/java/hivemall/{math => utils}/random/SmileRandom.java | 2 +-
.../src/test/java/hivemall/smile/classification/DecisionTreeTest.java | 4 ++--
core/src/test/java/hivemall/smile/regression/RegressionTreeTest.java | 2 +-
16 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/core/src/main/java/hivemall/knn/similarity/DIMSUMMapperUDTF.java
b/core/src/main/java/hivemall/knn/similarity/DIMSUMMapperUDTF.java
index 1a91121..175e3df 100644
--- a/core/src/main/java/hivemall/knn/similarity/DIMSUMMapperUDTF.java
+++ b/core/src/main/java/hivemall/knn/similarity/DIMSUMMapperUDTF.java
@@ -22,10 +22,10 @@ import hivemall.UDTFWithOptions;
import hivemall.fm.Feature;
import hivemall.fm.IntFeature;
import hivemall.fm.StringFeature;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.utils.hadoop.HiveUtils;
import hivemall.utils.lang.Primitives;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/core/src/main/java/hivemall/smile/classification/DecisionTree.java
b/core/src/main/java/hivemall/smile/classification/DecisionTree.java
index 74a99ad..2d89e55 100644
--- a/core/src/main/java/hivemall/smile/classification/DecisionTree.java
+++ b/core/src/main/java/hivemall/smile/classification/DecisionTree.java
@@ -28,8 +28,6 @@ import static hivemall.smile.utils.SmileExtUtils.resolveName;
import hivemall.annotations.VisibleForTesting;
import hivemall.math.matrix.Matrix;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.DenseVector;
import hivemall.math.vector.SparseVector;
import hivemall.math.vector.Vector;
@@ -44,6 +42,8 @@ import hivemall.utils.lang.ArrayUtils;
import hivemall.utils.lang.ObjectUtils;
import hivemall.utils.lang.StringUtils;
import hivemall.utils.lang.mutable.MutableInt;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import hivemall.utils.sampling.IntReservoirSampler;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git
a/core/src/main/java/hivemall/smile/classification/GradientTreeBoostingClassifierUDTF.java
b/core/src/main/java/hivemall/smile/classification/GradientTreeBoostingClassifierUDTF.java
index a25ab44..ad3f178 100644
---
a/core/src/main/java/hivemall/smile/classification/GradientTreeBoostingClassifierUDTF.java
+++
b/core/src/main/java/hivemall/smile/classification/GradientTreeBoostingClassifierUDTF.java
@@ -23,8 +23,6 @@ import hivemall.math.matrix.Matrix;
import hivemall.math.matrix.builders.CSRMatrixBuilder;
import hivemall.math.matrix.builders.MatrixBuilder;
import hivemall.math.matrix.builders.RowMajorDenseMatrixBuilder;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.DenseVector;
import hivemall.math.vector.SparseVector;
import hivemall.math.vector.Vector;
@@ -38,6 +36,8 @@ import hivemall.utils.hadoop.SerdeUtils;
import hivemall.utils.hadoop.WritableUtils;
import hivemall.utils.lang.Primitives;
import hivemall.utils.math.MathUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import java.util.ArrayList;
import java.util.Arrays;
diff --git
a/core/src/main/java/hivemall/smile/classification/RandomForestClassifierUDTF.java
b/core/src/main/java/hivemall/smile/classification/RandomForestClassifierUDTF.java
index 7ae6f10..c9b00df 100644
---
a/core/src/main/java/hivemall/smile/classification/RandomForestClassifierUDTF.java
+++
b/core/src/main/java/hivemall/smile/classification/RandomForestClassifierUDTF.java
@@ -26,8 +26,6 @@ import hivemall.math.matrix.builders.MatrixBuilder;
import hivemall.math.matrix.builders.RowMajorDenseMatrixBuilder;
import hivemall.math.matrix.ints.DoKIntMatrix;
import hivemall.math.matrix.ints.IntMatrix;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.Vector;
import hivemall.math.vector.VectorProcedure;
import hivemall.smile.classification.DecisionTree.SplitRule;
@@ -41,6 +39,8 @@ import hivemall.utils.hadoop.WritableUtils;
import hivemall.utils.lang.Preconditions;
import hivemall.utils.lang.Primitives;
import hivemall.utils.lang.RandomUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import java.util.ArrayList;
import java.util.Arrays;
diff --git
a/core/src/main/java/hivemall/smile/regression/RandomForestRegressionUDTF.java
b/core/src/main/java/hivemall/smile/regression/RandomForestRegressionUDTF.java
index 19cec91..6b3b1a2 100644
---
a/core/src/main/java/hivemall/smile/regression/RandomForestRegressionUDTF.java
+++
b/core/src/main/java/hivemall/smile/regression/RandomForestRegressionUDTF.java
@@ -23,8 +23,6 @@ import hivemall.math.matrix.Matrix;
import hivemall.math.matrix.builders.CSRMatrixBuilder;
import hivemall.math.matrix.builders.MatrixBuilder;
import hivemall.math.matrix.builders.RowMajorDenseMatrixBuilder;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.Vector;
import hivemall.math.vector.VectorProcedure;
import hivemall.smile.utils.SmileExtUtils;
@@ -37,6 +35,8 @@ import hivemall.utils.hadoop.SerdeUtils;
import hivemall.utils.hadoop.WritableUtils;
import hivemall.utils.lang.Primitives;
import hivemall.utils.lang.RandomUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/core/src/main/java/hivemall/smile/regression/RegressionTree.java
b/core/src/main/java/hivemall/smile/regression/RegressionTree.java
index ab2f25f..a22ea68 100755
--- a/core/src/main/java/hivemall/smile/regression/RegressionTree.java
+++ b/core/src/main/java/hivemall/smile/regression/RegressionTree.java
@@ -27,8 +27,6 @@ import static
hivemall.smile.utils.SmileExtUtils.resolveFeatureName;
import hivemall.annotations.VisibleForTesting;
import hivemall.math.matrix.Matrix;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.DenseVector;
import hivemall.math.vector.SparseVector;
import hivemall.math.vector.Vector;
@@ -44,6 +42,8 @@ import hivemall.utils.lang.ArrayUtils;
import hivemall.utils.lang.ObjectUtils;
import hivemall.utils.lang.StringUtils;
import hivemall.utils.lang.mutable.MutableInt;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import hivemall.utils.sampling.IntReservoirSampler;
import it.unimi.dsi.fastutil.ints.Int2DoubleOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2IntMap.Entry;
diff --git a/core/src/main/java/hivemall/smile/utils/SmileExtUtils.java
b/core/src/main/java/hivemall/smile/utils/SmileExtUtils.java
index a0844f4..6d1a514 100644
--- a/core/src/main/java/hivemall/smile/utils/SmileExtUtils.java
+++ b/core/src/main/java/hivemall/smile/utils/SmileExtUtils.java
@@ -22,8 +22,6 @@ import hivemall.annotations.VisibleForTesting;
import hivemall.math.matrix.ColumnMajorMatrix;
import hivemall.math.matrix.Matrix;
import hivemall.math.matrix.MatrixUtils;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.VectorProcedure;
import hivemall.smile.classification.DecisionTree.SplitRule;
import hivemall.utils.collections.arrays.SparseIntArray;
@@ -32,6 +30,8 @@ import hivemall.utils.collections.lists.IntArrayList;
import hivemall.utils.lang.NumberUtils;
import hivemall.utils.lang.Preconditions;
import hivemall.utils.math.MathUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import smile.data.NominalAttribute;
import smile.data.NumericAttribute;
import smile.sort.QuickSort;
diff --git a/core/src/main/java/hivemall/topicmodel/IncrementalPLSAModel.java
b/core/src/main/java/hivemall/topicmodel/IncrementalPLSAModel.java
index 7a95539..5251937 100644
--- a/core/src/main/java/hivemall/topicmodel/IncrementalPLSAModel.java
+++ b/core/src/main/java/hivemall/topicmodel/IncrementalPLSAModel.java
@@ -21,9 +21,9 @@ package hivemall.topicmodel;
import static hivemall.utils.lang.ArrayUtils.newRandomFloatArray;
import static hivemall.utils.math.MathUtils.l1normalize;
import hivemall.annotations.VisibleForTesting;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.utils.math.MathUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/core/src/main/java/hivemall/utils/lang/ArrayUtils.java
b/core/src/main/java/hivemall/utils/lang/ArrayUtils.java
index caf21d3..f90011f 100644
--- a/core/src/main/java/hivemall/utils/lang/ArrayUtils.java
+++ b/core/src/main/java/hivemall/utils/lang/ArrayUtils.java
@@ -18,7 +18,7 @@
*/
package hivemall.utils.lang;
-import hivemall.math.random.PRNG;
+import hivemall.utils.random.PRNG;
import java.lang.reflect.Array;
import java.util.ArrayList;
diff --git a/core/src/main/java/hivemall/math/random/CommonsMathRandom.java
b/core/src/main/java/hivemall/utils/random/CommonsMathRandom.java
similarity index 98%
rename from core/src/main/java/hivemall/math/random/CommonsMathRandom.java
rename to core/src/main/java/hivemall/utils/random/CommonsMathRandom.java
index e0b7554..5ea2029 100644
--- a/core/src/main/java/hivemall/math/random/CommonsMathRandom.java
+++ b/core/src/main/java/hivemall/utils/random/CommonsMathRandom.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hivemall.math.random;
+package hivemall.utils.random;
import javax.annotation.Nonnull;
diff --git a/core/src/main/java/hivemall/math/random/JavaRandom.java
b/core/src/main/java/hivemall/utils/random/JavaRandom.java
similarity index 97%
rename from core/src/main/java/hivemall/math/random/JavaRandom.java
rename to core/src/main/java/hivemall/utils/random/JavaRandom.java
index f0ed4c7..addeb59 100644
--- a/core/src/main/java/hivemall/math/random/JavaRandom.java
+++ b/core/src/main/java/hivemall/utils/random/JavaRandom.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hivemall.math.random;
+package hivemall.utils.random;
import java.util.Random;
diff --git a/core/src/main/java/hivemall/math/random/PRNG.java
b/core/src/main/java/hivemall/utils/random/PRNG.java
similarity index 97%
rename from core/src/main/java/hivemall/math/random/PRNG.java
rename to core/src/main/java/hivemall/utils/random/PRNG.java
index d42dcfb..bcce156 100644
--- a/core/src/main/java/hivemall/math/random/PRNG.java
+++ b/core/src/main/java/hivemall/utils/random/PRNG.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hivemall.math.random;
+package hivemall.utils.random;
import javax.annotation.Nonnegative;
diff --git
a/core/src/main/java/hivemall/math/random/RandomNumberGeneratorFactory.java
b/core/src/main/java/hivemall/utils/random/RandomNumberGeneratorFactory.java
similarity index 99%
rename from
core/src/main/java/hivemall/math/random/RandomNumberGeneratorFactory.java
rename to
core/src/main/java/hivemall/utils/random/RandomNumberGeneratorFactory.java
index 2045d33..1fa534d 100644
--- a/core/src/main/java/hivemall/math/random/RandomNumberGeneratorFactory.java
+++ b/core/src/main/java/hivemall/utils/random/RandomNumberGeneratorFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hivemall.math.random;
+package hivemall.utils.random;
import hivemall.utils.lang.Primitives;
diff --git a/core/src/main/java/hivemall/math/random/SmileRandom.java
b/core/src/main/java/hivemall/utils/random/SmileRandom.java
similarity index 98%
rename from core/src/main/java/hivemall/math/random/SmileRandom.java
rename to core/src/main/java/hivemall/utils/random/SmileRandom.java
index 1edc56c..d7c4e86 100644
--- a/core/src/main/java/hivemall/math/random/SmileRandom.java
+++ b/core/src/main/java/hivemall/utils/random/SmileRandom.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package hivemall.math.random;
+package hivemall.utils.random;
import javax.annotation.Nonnull;
diff --git
a/core/src/test/java/hivemall/smile/classification/DecisionTreeTest.java
b/core/src/test/java/hivemall/smile/classification/DecisionTreeTest.java
index 9e5ee9a..130c0b3 100644
--- a/core/src/test/java/hivemall/smile/classification/DecisionTreeTest.java
+++ b/core/src/test/java/hivemall/smile/classification/DecisionTreeTest.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertEquals;
import hivemall.math.matrix.Matrix;
import hivemall.math.matrix.builders.CSRMatrixBuilder;
import hivemall.math.matrix.dense.RowMajorDenseMatrix2d;
-import hivemall.math.random.PRNG;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.math.vector.DenseVector;
import hivemall.smile.classification.DecisionTree.Node;
import hivemall.smile.classification.DecisionTree.SplitRule;
@@ -35,6 +33,8 @@ import hivemall.utils.codec.Base91;
import hivemall.utils.lang.ArrayUtils;
import hivemall.utils.lang.StringUtils;
import hivemall.utils.math.MathUtils;
+import hivemall.utils.random.PRNG;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import smile.data.Attribute;
import smile.data.AttributeDataset;
import smile.data.NominalAttribute;
diff --git
a/core/src/test/java/hivemall/smile/regression/RegressionTreeTest.java
b/core/src/test/java/hivemall/smile/regression/RegressionTreeTest.java
index 3f1b782..f7bbb46 100644
--- a/core/src/test/java/hivemall/smile/regression/RegressionTreeTest.java
+++ b/core/src/test/java/hivemall/smile/regression/RegressionTreeTest.java
@@ -21,10 +21,10 @@ package hivemall.smile.regression;
import hivemall.math.matrix.Matrix;
import hivemall.math.matrix.builders.CSRMatrixBuilder;
import hivemall.math.matrix.dense.RowMajorDenseMatrix2d;
-import hivemall.math.random.RandomNumberGeneratorFactory;
import hivemall.smile.tools.TreeExportUDF.Evaluator;
import hivemall.smile.tools.TreeExportUDF.OutputType;
import hivemall.utils.codec.Base91;
+import hivemall.utils.random.RandomNumberGeneratorFactory;
import smile.math.Math;
import smile.validation.LOOCV;
