-
Notifications
You must be signed in to change notification settings - Fork 22
Additional preprocessors #68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
449d6c5
Add threshold-based binarizer
matejklemen 228e692
Add normalization (L1/L2/max norm) preprocessor
matejklemen 601dc47
Add range (interval) scaler
matejklemen 5bbb37b
Address codacy code quality review
matejklemen 8b78e30
Fix Binarizer's compilation issue
matejklemen 795708b
Address code review:
matejklemen 2a520c3
Minor style change in normalizer test
matejklemen d0275c5
Add tests for norms
matejklemen 782590a
Address code review:
matejklemen 288aac2
Fix compilation issue in RangeScaler by transforming Vector to DenseV…
matejklemen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
src/main/scala/io/picnicml/doddlemodel/preprocessing/Binarizer.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.{*, DenseVector} | ||
| import io.picnicml.doddlemodel.data.Feature.FeatureIndex | ||
| import io.picnicml.doddlemodel.data.{Features, RealVector} | ||
| import io.picnicml.doddlemodel.typeclasses.Transformer | ||
|
|
||
| case class Binarizer private (private val featureIndex: FeatureIndex, | ||
| private val thresholds: RealVector) | ||
|
|
||
| object Binarizer { | ||
|
|
||
| def apply(threshold: Double, featureIndex: FeatureIndex): Binarizer = { | ||
| val numNumeric: Int = featureIndex.numerical.columnIndices.length | ||
| require(numNumeric > 0, "There must be at least 1 numeric column in the given data") | ||
| val thresholdsExtended = DenseVector.fill(numNumeric) {threshold} | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| new Binarizer(featureIndex, thresholdsExtended) | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| def apply(thresholds: RealVector, featureIndex: FeatureIndex): Binarizer = { | ||
| val numNumeric = featureIndex.numerical.columnIndices.length | ||
| require(numNumeric > 0, "There must be at least 1 numeric column in the given data") | ||
| require(numNumeric == thresholds.length, "A threshold should be given for every numerical column") | ||
| new Binarizer(featureIndex, thresholds) | ||
| } | ||
|
|
||
| implicit lazy val ev: Transformer[Binarizer] = new Transformer[Binarizer] { | ||
|
|
||
| override def fit(model: Binarizer, x: Features): Binarizer = model | ||
|
|
||
| override protected def transformSafe(model: Binarizer, x: Features): Features = { | ||
|
inejc marked this conversation as resolved.
inejc marked this conversation as resolved.
|
||
| val numericColsOnly = x(::, model.featureIndex.numerical.columnIndices).toDenseMatrix | ||
| (numericColsOnly(*, ::) >:> model.thresholds).mapValues((v: Boolean) => if (v) 1.0 else 0.0) | ||
| } | ||
|
|
||
| override def isFitted(model: Binarizer): Boolean = true | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| } | ||
| } | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
35 changes: 35 additions & 0 deletions
35
src/main/scala/io/picnicml/doddlemodel/preprocessing/Normalizer.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.{*, Axis, max, sum} | ||
| import breeze.numerics.{abs, pow, sqrt} | ||
| import io.picnicml.doddlemodel.data.{Features, RealVector} | ||
| import io.picnicml.doddlemodel.typeclasses.Transformer | ||
|
|
||
| case class Normalizer private (private val normFunction: Features => RealVector) | ||
|
|
||
| object Normalizer { | ||
|
|
||
| def apply(norm: String = "l2"): Normalizer = { | ||
| // TODO: expose norms for re-use | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| val normFunction = norm match { | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| case "l2" => (x: Features) => sqrt(sum(pow(x, 2), Axis._1)) | ||
| case "l1" => (x: Features) => sum(abs(x), Axis._1) | ||
| case "max" => (x: Features) => max(abs(x), Axis._1) | ||
| case _ => throw new IllegalArgumentException("Unsupported norm") | ||
| } | ||
| new Normalizer(normFunction) | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| implicit lazy val ev: Transformer[Normalizer] = new Transformer[Normalizer] { | ||
| override def fit(model: Normalizer, x: Features): Normalizer = model | ||
|
inejc marked this conversation as resolved.
|
||
|
|
||
| override protected def transformSafe(model: Normalizer, x: Features): Features = { | ||
| val rowNorms = model.normFunction(x) | ||
| // no-op for zero vector | ||
| rowNorms(rowNorms :== 0.0) := 1.0 | ||
| x(::, *) /:/ rowNorms | ||
| } | ||
|
|
||
| override def isFitted(model: Normalizer): Boolean = true | ||
| } | ||
| } | ||
52 changes: 52 additions & 0 deletions
52
src/main/scala/io/picnicml/doddlemodel/preprocessing/RangeScaler.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.{*, Axis, max, min} | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| import cats.syntax.option._ | ||
| import io.picnicml.doddlemodel.data.Feature.FeatureIndex | ||
| import io.picnicml.doddlemodel.data.{Features, RealVector} | ||
| import io.picnicml.doddlemodel.typeclasses.Transformer | ||
| import io.picnicml.doddlemodel.syntax.OptionSyntax._ | ||
|
|
||
| case class RangeScaler private (private val scale: Option[RealVector], | ||
| private val minAdjustment: Option[RealVector], | ||
| private val range: (Double, Double), | ||
| private val featureIndex: FeatureIndex) | ||
|
|
||
| object RangeScaler { | ||
|
|
||
| def apply(range: (Double, Double), featureIndex: FeatureIndex): RangeScaler = { | ||
| val (lowerBound, upperBound) = range | ||
| val numNumeric = featureIndex.numerical.columnIndices.length | ||
| require(numNumeric > 0, "There must be at least 1 numeric column in the given data") | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| require(upperBound > lowerBound, "Upper bound of range must be greater than lower bound") | ||
| RangeScaler(none, none, range, featureIndex) | ||
| } | ||
|
|
||
| implicit lazy val ev: Transformer[RangeScaler] = new Transformer[RangeScaler] { | ||
|
|
||
| override def fit(model: RangeScaler, x: Features): RangeScaler = { | ||
| val (lowerBound, upperBound) = model.range | ||
| val numericColsOnly = x(::, model.featureIndex.numerical.columnIndices).toDenseMatrix | ||
| val (colMax: RealVector, colMin: RealVector) = | ||
| (max(numericColsOnly, Axis._0).inner, min(numericColsOnly, Axis._0).inner) | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| val dataRange = colMax - colMin | ||
| // avoid division by zero for constant features (max == min) | ||
| dataRange(dataRange :== 0.0) := 1.0 | ||
|
|
||
| val scale = (upperBound - lowerBound) / dataRange | ||
| val minAdjustment = lowerBound - (colMin *:* scale) | ||
|
|
||
| model.copy(scale.some, minAdjustment.some) | ||
| } | ||
|
|
||
| override protected def transformSafe(model: RangeScaler, x: Features): Features = { | ||
|
inejc marked this conversation as resolved.
|
||
| val numericColsOnly = x(::, model.featureIndex.numerical.columnIndices).toDenseMatrix | ||
| val colsScaled: Features = numericColsOnly(*, ::) *:* model.scale.getOrBreak | ||
| colsScaled(*, ::) +:+ model.minAdjustment.getOrBreak | ||
| } | ||
|
|
||
| override def isFitted(model: RangeScaler): Boolean = | ||
| model.scale.isDefined && model.minAdjustment.isDefined | ||
| } | ||
|
|
||
|
inejc marked this conversation as resolved.
Outdated
|
||
| } | ||
51 changes: 51 additions & 0 deletions
51
src/test/scala/io/picnicml/doddlemodel/preprocessing/BinarizerTest.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.{DenseMatrix, DenseVector} | ||
| import io.picnicml.doddlemodel.TestingUtils | ||
| import io.picnicml.doddlemodel.data.Feature.{CategoricalFeature, FeatureIndex, NumericalFeature} | ||
| import io.picnicml.doddlemodel.preprocessing.Binarizer.ev | ||
| import org.scalatest.{FlatSpec, Matchers} | ||
|
|
||
| class BinarizerTest extends FlatSpec with Matchers with TestingUtils { | ||
| val xMatrix = DenseMatrix( | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| List(0.0, 1.0, 0.0), | ||
| List(0.3, -1.0, 1.0), | ||
| List(-0.3, 2.0, 0.0) | ||
| ) | ||
|
|
||
| "Binarizer" should "process the numerical columns by corresponding thresholds" in { | ||
| val featureIndex = FeatureIndex(List(NumericalFeature, NumericalFeature, CategoricalFeature)) | ||
| val thresholds: DenseVector[Double] = DenseVector(0.0, -1.5) | ||
|
|
||
| val binarizer = Binarizer(thresholds, featureIndex) | ||
|
|
||
| breezeEqual(ev.transform(binarizer, xMatrix), DenseMatrix( | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| List(0.0, 1.0), | ||
| List(1.0, 1.0), | ||
| List(0.0, 1.0))) shouldBe true | ||
| } | ||
|
|
||
| it should "process all the numerical columns by a single threshold" in { | ||
| val featureIndex = FeatureIndex(List(NumericalFeature, NumericalFeature, NumericalFeature)) | ||
| val threshold: Double = 0.5 | ||
|
|
||
| val binarizer = Binarizer(threshold, featureIndex) | ||
|
|
||
| breezeEqual(ev.transform(binarizer, xMatrix), DenseMatrix( | ||
| List(0.0, 1.0, 0.0), | ||
| List(0.0, 0.0, 1.0), | ||
| List(0.0, 1.0, 0.0) | ||
| )) | ||
| } | ||
|
|
||
| it should "fail when there are insufficient/no numeric features in data" in { | ||
| val featureIndex1 = FeatureIndex(List(NumericalFeature, NumericalFeature, NumericalFeature)) | ||
| val featureIndex2 = FeatureIndex(List(CategoricalFeature, CategoricalFeature, CategoricalFeature)) | ||
| val thresholds: DenseVector[Double] = DenseVector(0.0, -1.5) | ||
|
|
||
| // 3 numeric columns vs 2 thresholds | ||
| an [IllegalArgumentException] should be thrownBy Binarizer(thresholds, featureIndex1) | ||
| // 0 numeric columns | ||
| an [IllegalArgumentException] should be thrownBy Binarizer(thresholds, featureIndex2) | ||
| } | ||
| } | ||
53 changes: 53 additions & 0 deletions
53
src/test/scala/io/picnicml/doddlemodel/preprocessing/NormalizerTest.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.DenseMatrix | ||
| import io.picnicml.doddlemodel.TestingUtils | ||
| import io.picnicml.doddlemodel.preprocessing.Normalizer.ev | ||
| import org.scalactic.{Equality, TolerantNumerics} | ||
| import org.scalatest.{FlatSpec, Matchers} | ||
|
|
||
| class NormalizerTest extends FlatSpec with Matchers with TestingUtils { | ||
|
|
||
| implicit val doubleTolerance: Equality[Double] = TolerantNumerics.tolerantDoubleEquality(1e-4) | ||
|
|
||
| "Normalizer" should "scale rows to unit norm using various norms" in { | ||
| val xMatrix = DenseMatrix( | ||
| List(1.0, 2.0, 2.0), | ||
| List(-1.0, 1.0, 0.5), | ||
| List(-2.0, 0.0, 0.0) | ||
| ) | ||
| val l2Normalizer = Normalizer() | ||
| val l1Normalizer = Normalizer("l1") | ||
| val maxNormalizer = Normalizer("max") | ||
|
|
||
| breezeEqual(ev.transform(l2Normalizer, xMatrix), DenseMatrix( | ||
| List(0.3333, 0.6666, 0.6666), | ||
| List(-0.6666, 0.6666, 0.3333), | ||
| List(-1.0, 0.0, 0.0) | ||
| )) shouldBe true | ||
|
|
||
| breezeEqual(ev.transform(l1Normalizer, xMatrix), DenseMatrix( | ||
| List(0.2, 0.4, 0.4), | ||
| List(-0.4, 0.4, 0.2), | ||
| List(-1.0, 0.0, 0.0) | ||
| )) shouldBe true | ||
|
|
||
| breezeEqual(ev.transform(maxNormalizer, xMatrix), DenseMatrix( | ||
| List(0.5, 1.0, 1.0), | ||
| List(-1.0, 1.0, 0.5), | ||
| List(-1.0, 0.0, 0.0) | ||
| )) shouldBe true | ||
| } | ||
|
|
||
| it should "handle rows with zero norm" in { | ||
| val l2Normalizer = Normalizer() | ||
| val xMatrix = DenseMatrix( | ||
| List(0.0, 0.0, 0.0), | ||
| List(0.0, 3.0, 4.0) | ||
| ) | ||
| breezeEqual(ev.transform(l2Normalizer, xMatrix), DenseMatrix( | ||
| List(0.0, 0.0, 0.0), | ||
| List(0.0, 0.6, 0.8) | ||
| )) shouldBe true | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
src/test/scala/io/picnicml/doddlemodel/preprocessing/RangeScalerTest.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package io.picnicml.doddlemodel.preprocessing | ||
|
|
||
| import breeze.linalg.DenseMatrix | ||
| import io.picnicml.doddlemodel.TestingUtils | ||
| import io.picnicml.doddlemodel.data.Feature.{CategoricalFeature, FeatureIndex, NumericalFeature} | ||
| import org.scalatest.{FlatSpec, Matchers} | ||
| import io.picnicml.doddlemodel.preprocessing.RangeScaler.ev | ||
| import org.scalactic.{Equality, TolerantNumerics} | ||
|
|
||
| class RangeScalerTest extends FlatSpec with Matchers with TestingUtils { | ||
|
inejc marked this conversation as resolved.
|
||
| implicit val doubleTolerance: Equality[Double] = TolerantNumerics.tolerantDoubleEquality(1e-4) | ||
|
|
||
| "Range scaler" should "scale features to specified range" in { | ||
|
inejc marked this conversation as resolved.
Outdated
|
||
| val xMatrix: DenseMatrix[Double] = DenseMatrix( | ||
| List(-3.0, 2.0, 1.0), | ||
| List(-3.0, 3.0, 0.0), | ||
| List(-3.0, 0.0, 0.0), | ||
| List(-3.0, 5.0, 1.0) | ||
| ) | ||
| val featureIndex = FeatureIndex(List(NumericalFeature, NumericalFeature, CategoricalFeature)) | ||
| val rangeScaler = RangeScaler((0.0, 1.0), featureIndex) | ||
| val trainedRangeScaler = ev.fit(rangeScaler, xMatrix) | ||
| breezeEqual(ev.transform(trainedRangeScaler, xMatrix), DenseMatrix( | ||
| List(0.0, 0.4), | ||
| List(0.0, 0.6), | ||
| List(0.0, 0.0), | ||
| List(0.0, 1.0) | ||
| )) shouldBe true | ||
| } | ||
|
|
||
|
inejc marked this conversation as resolved.
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.