Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
overloaded load method in Readable transformers to be Java compatible
  • Loading branch information
jkbradley committed Nov 17, 2015
commit 31b6bc4741e5165f8f5f1e6493f4e5d461389bbb
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,7 @@ object Binarizer extends Readable[Binarizer] {

@Since("1.6.0")
override def read: Reader[Binarizer] = new DefaultParamsReader[Binarizer]

@Since("1.6.0")
override def load(path: String): Binarizer = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package org.apache.spark.ml.feature
import java.{util => ju}

import org.apache.spark.SparkException
import org.apache.spark.annotation.Experimental
import org.apache.spark.annotation.{Since, Experimental}
import org.apache.spark.ml.Model
import org.apache.spark.ml.attribute.NominalAttribute
import org.apache.spark.ml.param._
Expand Down Expand Up @@ -94,6 +94,7 @@ final class Bucketizer(override val uid: String)
defaultCopy[Bucketizer](extra).setParent(parent)
}

@Since("1.6.0")
override def write: Writer = new DefaultParamsWriter(this)
}

Expand Down Expand Up @@ -138,5 +139,9 @@ object Bucketizer extends Readable[Bucketizer] {
}
}

@Since("1.6.0")
override def read: Reader[Bucketizer] = new DefaultParamsReader[Bucketizer]

@Since("1.6.0")
override def load(path: String): Bucketizer = read.load(path)
}
3 changes: 3 additions & 0 deletions mllib/src/main/scala/org/apache/spark/ml/feature/DCT.scala
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,7 @@ object DCT extends Readable[DCT] {

@Since("1.6.0")
override def read: Reader[DCT] = new DefaultParamsReader[DCT]

@Since("1.6.0")
override def load(path: String): DCT = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ class HashingTF(override val uid: String)

@Since("1.6.0")
object HashingTF extends Readable[HashingTF] {

@Since("1.6.0")
override def read: Reader[HashingTF] = new DefaultParamsReader[HashingTF]

@Since("1.6.0")
override def load(path: String): HashingTF = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,12 @@ class Interaction @Since("1.6.0") (override val uid: String) extends Transformer

@Since("1.6.0")
object Interaction extends Readable[Interaction] {

@Since("1.6.0")
override def read: Reader[Interaction] = new DefaultParamsReader[Interaction]

@Since("1.6.0")
override def load(path: String): Interaction = read.load(path)
}

/**
Expand Down
4 changes: 4 additions & 0 deletions mllib/src/main/scala/org/apache/spark/ml/feature/NGram.scala
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ class NGram(override val uid: String)

@Since("1.6.0")
object NGram extends Readable[NGram] {

@Since("1.6.0")
override def read: Reader[NGram] = new DefaultParamsReader[NGram]

@Since("1.6.0")
override def load(path: String): NGram = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ class Normalizer(override val uid: String)

@Since("1.6.0")
object Normalizer extends Readable[Normalizer] {

@Since("1.6.0")
override def read: Reader[Normalizer] = new DefaultParamsReader[Normalizer]

@Since("1.6.0")
override def load(path: String): Normalizer = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ class OneHotEncoder(override val uid: String) extends Transformer

@Since("1.6.0")
object OneHotEncoder extends Readable[OneHotEncoder] {

@Since("1.6.0")
override def read: Reader[OneHotEncoder] = new DefaultParamsReader[OneHotEncoder]

@Since("1.6.0")
override def load(path: String): OneHotEncoder = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,7 @@ object PolynomialExpansion extends Readable[PolynomialExpansion] {

@Since("1.6.0")
override def read: Reader[PolynomialExpansion] = new DefaultParamsReader[PolynomialExpansion]

@Since("1.6.0")
override def load(path: String): PolynomialExpansion = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,7 @@ object QuantileDiscretizer extends Readable[QuantileDiscretizer] with Logging {

@Since("1.6.0")
override def read: Reader[QuantileDiscretizer] = new DefaultParamsReader[QuantileDiscretizer]

@Since("1.6.0")
override def load(path: String): QuantileDiscretizer = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ class SQLTransformer @Since("1.6.0") (override val uid: String) extends Transfor

@Since("1.6.0")
object SQLTransformer extends Readable[SQLTransformer] {

@Since("1.6.0")
override def read: Reader[SQLTransformer] = new DefaultParamsReader[SQLTransformer]

@Since("1.6.0")
override def load(path: String): SQLTransformer = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ class StopWordsRemover(override val uid: String)

@Since("1.6.0")
object StopWordsRemover extends Readable[StopWordsRemover] {

@Since("1.6.0")
override def read: Reader[StopWordsRemover] = new DefaultParamsReader[StopWordsRemover]

@Since("1.6.0")
override def load(path: String): StopWordsRemover = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ class IndexToString private[ml] (override val uid: String)

@Since("1.6.0")
object IndexToString extends Readable[IndexToString] {

@Since("1.6.0")
override def read: Reader[IndexToString] = new DefaultParamsReader[IndexToString]

@Since("1.6.0")
override def load(path: String): IndexToString = read.load(path)
}
11 changes: 11 additions & 0 deletions mllib/src/main/scala/org/apache/spark/ml/feature/Tokenizer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ class Tokenizer(override val uid: String)

@Since("1.6.0")
object Tokenizer extends Readable[Tokenizer] {

@Since("1.6.0")
override def read: Reader[Tokenizer] = new DefaultParamsReader[Tokenizer]

@Since("1.6.0")
override def load(path: String): Tokenizer = read.load(path)
}

/**
Expand Down Expand Up @@ -142,9 +146,16 @@ class RegexTokenizer(override val uid: String)

override def copy(extra: ParamMap): RegexTokenizer = defaultCopy(extra)

@Since("1.6.0")
override def write: Writer = new DefaultParamsWriter(this)
}

@Since("1.6.0")
object RegexTokenizer extends Readable[RegexTokenizer] {

@Since("1.6.0")
override def read: Reader[RegexTokenizer] = new DefaultParamsReader[RegexTokenizer]

@Since("1.6.0")
override def load(path: String): RegexTokenizer = read.load(path)
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ object VectorAssembler extends Readable[VectorAssembler] {
@Since("1.6.0")
override def read: Reader[VectorAssembler] = new DefaultParamsReader[VectorAssembler]

@Since("1.6.0")
override def load(path: String): VectorAssembler = read.load(path)

private[feature] def assemble(vv: Any*): Vector = {
val indices = ArrayBuilder.make[Int]
val values = ArrayBuilder.make[Double]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,7 @@ object VectorSlicer extends Readable[VectorSlicer] {

@Since("1.6.0")
override def read: Reader[VectorSlicer] = new DefaultParamsReader[VectorSlicer]

@Since("1.6.0")
override def load(path: String): VectorSlicer = read.load(path)
}