Github user Yunni commented on a diff in the pull request:
https://github.com/apache/spark/pull/15874#discussion_r89175401
--- Diff: mllib/src/main/scala/org/apache/spark/ml/feature/MinHashLSH.scala
---
@@ -31,36 +31,38 @@ import org.apache.spark.sql.types.StructType
/**
* :: Experimental ::
*
- * Model produced by [[MinHash]], where multiple hash functions are
stored. Each hash function is
- * a perfect hash function:
- * `h_i(x) = (x * k_i mod prime) mod numEntries`
- * where `k_i` is the i-th coefficient, and both `x` and `k_i` are from
`Z_prime^*`
+ * Model produced by [[MinHashLSH]], where multiple hash functions are
stored. Each hash function is
+ * picked from a hash family for a specific set `S` with cardinality equal
to `numEntries`:
+ * `h_i(x) = ((x \cdot a_i + b_i) \mod prime) \mod numEntries`
+ *
+ * This hash family is approximately min-wise independent according to the
reference.
*
* Reference:
- * [[https://en.wikipedia.org/wiki/Perfect_hash_function Wikipedia on
Perfect Hash Function]]
+ *
[[http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.121.8215&rep=rep1&type=pdf
Min-wise
+ * independent permutations]]
*
- * @param numEntries The number of entries of the hash functions.
- * @param randCoefficients An array of random coefficients, each used by
one hash function.
+ * @param randCoefficients Pairs of random coefficients. Each pair is used
by one hash function.
*/
@Experimental
@Since("2.1.0")
-class MinHashModel private[ml] (
+class MinHashLSHModel private[ml](
override val uid: String,
- @Since("2.1.0") val numEntries: Int,
- @Since("2.1.0") val randCoefficients: Array[Int])
- extends LSHModel[MinHashModel] {
+ private[ml] val randCoefficients: Array[(Int, Int)])
+ extends LSHModel[MinHashLSHModel] {
@Since("2.1.0")
- override protected[ml] val hashFunction: Vector => Vector = {
- elems: Vector =>
+ override protected[ml] val hashFunction: Vector => Array[Vector] = {
+ elems: Vector => {
require(elems.numNonzeros > 0, "Must have at least 1 non zero
entry.")
val elemsList = elems.toSparse.indices.toList
- val hashValues = randCoefficients.map({ randCoefficient: Int =>
- elemsList.map({elem: Int =>
- (1 + elem) * randCoefficient.toLong % MinHash.prime %
numEntries
- }).min.toDouble
+ val hashValues = randCoefficients.map({ case (a: Int, b: Int) =>
+ elemsList.map { elem: Int =>
+ ((1 + elem) * a + b) % MinHashLSH.HASH_PRIME
+ }.min.toDouble
})
- Vectors.dense(hashValues)
+ // TODO: Output vectors of dimension numHashFunctions in SPARK-18450
+ hashValues.grouped(1).map(Vectors.dense).toArray
--- End diff --
Vectors.dense takes an array instead of a single number.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
