Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Null Imputation for DateUnitCircleVectorizer #555

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Null Imputation for DateUnitCircleVectorizer #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
810edcc
Changing Name
mweilsalesforce Jun 3, 2021
533e281
Adding default radians for null
mweilsalesforce Jun 3, 2021
660c269
radians instead of randians
mweilsalesforce Jun 3, 2021
49425a8
Changing transformer test
mweilsalesforce Jun 7, 2021
0cab7fb
Merge branch 'master' into mw/DateImputation
tovbinm Sep 9, 2021
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
2 changes: 1 addition & 1 deletion .../src/main/scala/com/salesforce/op/stages/impl/feature/DateMapToUnitCircleVectorizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ final class DateMapToUnitCircleVectorizerModel[T <: DateMap] private[op]
val cleanedMap = cleanMap(map, shouldClean, shouldCleanValue = false)
keys.map(k => {
val vOpt = cleanedMap.get(k)
DateToUnitCircle.convertToRandians(vOpt, timePeriod)
DateToUnitCircle.convertToRadians(vOpt, timePeriod)
})
}.toArray
Vectors.dense(eachPivoted.flatten).compressed.toOPVector
Expand Down
11 changes: 7 additions & 4 deletions core/src/main/scala/com/salesforce/op/stages/impl/feature/DateToUnitCircleTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ class DateToUnitCircleTransformer[T <: Date]
) with DateToUnitCircleParams {

override def transformFn: Seq[T] => OPVector = timestamp => {
val randians = timestamp.flatMap(ts => DateToUnitCircle.convertToRandians(ts.v, getTimePeriod)).toArray
Vectors.dense(randians).toOPVector
val radians = timestamp.flatMap(ts => DateToUnitCircle.convertToRadians(ts.v, getTimePeriod)).toArray
Vectors.dense(radians).toOPVector
}

override def onGetMetadata(): Unit = {
Expand All @@ -101,17 +101,20 @@ class DateToUnitCircleTransformer[T <: Date]

private[op] object DateToUnitCircle {

val defaultRadians: Array[Double] = Array(1.0, 0.0)

def metadataValues(timePeriod: TimePeriod): Seq[String] = Seq(s"x_$timePeriod", s"y_$timePeriod")

def convertToBin(timestamp: Long, timePeriodDesired: TimePeriod): Double =
getPeriodWithSize(timestamp, timePeriodDesired)._1

def convertToRandians(timestamp: Option[Long], timePeriodDesired: TimePeriod): Array[Double] =
def convertToRadians(timestamp: Option[Long], timePeriodDesired: TimePeriod,
nullRadians: Array[Double] = defaultRadians): Array[Double] =
timestamp.map { ts =>
val (timePeriod, periodSize) = getPeriodWithSize(ts, timePeriodDesired)
val radians = (2 * math.Pi * timePeriod) / periodSize
Array(math.cos(radians), math.sin(radians))
}.getOrElse(Array(0.0, 0.0))
}.getOrElse(nullRadians)

private def getPeriodWithSize(timestamp: Long, timePeriod: TimePeriod): (Double, Int) = {
val tpv = timePeriod.extractTimePeriodVal(timestamp)
Expand Down
2 changes: 1 addition & 1 deletion .../test/scala/com/salesforce/op/stages/impl/feature/DateMapToUnitCircleVectorizerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class DateMapToUnitCircleVectorizerTest extends OpEstimatorSpec[OPVector, Sequen
*/
override val expectedResult: Seq[OPVector] = sampleDateTimes
.map{ v =>
val rad = DateToUnitCircle.convertToRandians(Option(v.getMillis), TimePeriod.HourOfDay)
val rad = DateToUnitCircle.convertToRadians(Option(v.getMillis), TimePeriod.HourOfDay)
(rad ++ rad).toOPVector
}

Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/scala/com/salesforce/op/stages/impl/feature/DateToUnitCircleTransformerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class DateToUnitCircleTransformerTest extends OpTransformerSpec[OPVector, DateTo
val vector = vectorizer.getOutput()
val actual = transformed.collect(vector)
val expected = Array(
Array(0.0, 0.0),
Array(1.0, 0.0),
Array(1.0, 0.0)
).map(Vectors.dense(_).toOPVector)
all(actual.zip(expected).map(g => Vectors.sqdist(g._1.value, g._2.value))) should be < eps
Expand Down