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

Apply DateToUnitCircleTransformer logic in raw feature transformations. #130

Merged
merged 18 commits into from
Sep 21, 2018
Merged

Apply DateToUnitCircleTransformer logic in raw feature transformations. #130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3664d3a
Date unit circle binning for RFF
Sep 12, 2018
f62c38d
Add to OpWorkflow constructor
Sep 13, 2018
c93d083
Add to OpWorkflow constructor
Sep 13, 2018
6a41399
Merge branch 'mv/datetime-rff' of github.com:marcovivero/TransmogrifA…
marcovivero Sep 13, 2018
5afa43c
Merge branch 'master' of https://github.com/salesforce/TransmogrifAI …
marcovivero Sep 13, 2018
37f4c41
Forgot some docs
marcovivero Sep 13, 2018
84f72ae
Fix tests
marcovivero Sep 13, 2018
9d6ea44
Split out time period test cases
marcovivero Sep 13, 2018
bc39bfe
Add time zone + move out dataframe from function
marcovivero Sep 13, 2018
f255f87
mt/Clean up tests
marcovivero Sep 13, 2018
e1cc959
Merge branch 'master' into mv/datetime-rff
tovbinm Sep 13, 2018
0ef87da
Address last few comments
marcovivero Sep 13, 2018
3635e24
Merge branch 'mv/datetime-rff' of github.com:marcovivero/TransmogrifA…
marcovivero Sep 13, 2018
cb63dd4
Add back private[op]
marcovivero Sep 13, 2018
724b22e
Merge branch 'master' into mv/datetime-rff
tovbinm Sep 14, 2018
9582002
Silly bug
marcovivero Sep 18, 2018
2758202
Merge branch 'master' into mv/datetime-rff
tovbinm Sep 20, 2018
104169e
Merge branch 'master' into mv/datetime-rff
tovbinm Sep 21, 2018
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
Next Next commit
Add time zone + move out dataframe from function
  • Loading branch information
@marcovivero
marcovivero committed Sep 13, 2018
commit bc39bfe123323a0efe2e4d586695f97c3fc3bd21
2 changes: 1 addition & 1 deletion 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 @@ -115,7 +115,7 @@ object DateToUnitCircle {
}.getOrElse(Array(0.0, 0.0))

private def getPeriodWithSize(timestamp: Long, timePeriod: TimePeriod): (Double, Int) = {
val dt = new JDateTime(timestamp)
val dt = new JDateTime(timestamp).withZone(DateTimeZone.UTC)
timePeriod match {
case TimePeriod.DayOfMonth => (dt.dayOfMonth.get.toDouble - 1, 31)
case TimePeriod.DayOfWeek => (dt.dayOfWeek.get.toDouble - 1, 7)
Expand Down
12 changes: 6 additions & 6 deletions core/src/test/scala/com/salesforce/op/filters/PreparedFeaturesTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ class PreparedFeaturesTest extends FlatSpec with PassengerSparkFixtureTest {
val allPredictorKeys1 = Array(predictorKey1, predictorKey2A, predictorKey2B)
val allPredictorKeys2 = Array(predictorKey1)

val dateMap =
FeatureBuilder.DateMap[Passenger].extract(p => Map("DTMap" -> p.getBoarded.toLong).toDateMap).asPredictor
val dateFeatures: Array[OPFeature] = Array(boarded, boardedTime, boardedTimeAsDateTime, dateMap)
lazy val dateDataFrame: DataFrame = dataReader.generateDataFrame(dateFeatures)

Spec[PreparedFeatures] should "produce correct summaries" in {
val (responseSummaries1, predictorSummaries1) = preparedFeatures1.summaries
val (responseSummaries2, predictorSummaries2) = preparedFeatures2.summaries
Expand Down Expand Up @@ -197,18 +202,13 @@ class PreparedFeaturesTest extends FlatSpec with PassengerSparkFixtureTest {
expected3: Double,
expected4: Double,
expected5: Double): Unit = {
val dateMap =
FeatureBuilder.DateMap[Passenger].extract(p => Map("DTMap" -> p.getBoarded.toLong).toDateMap).asPredictor
val dateFeatures: Array[OPFeature] = Array(boarded, boardedTime, boardedTimeAsDateTime, dateMap)
val df: DataFrame = dataReader.generateDataFrame(dateFeatures)

def createExpectedDateMap(d: Double, aggregates: Int): Map[FeatureKey, ProcessedSeq] = Map(
(boarded.name, None) -> Right((0 until aggregates).map(_ => d).toList),
(boardedTime.name, None) -> Right(List(d)),
(boardedTimeAsDateTime.name, None) -> Right(List(d)),
(dateMap.name, Option("DTMap")) -> Right(List(d)))

val ppRDD: RDD[Map[FeatureKey, ProcessedSeq]] = df.rdd
val ppRDD: RDD[Map[FeatureKey, ProcessedSeq]] = dateDataFrame.rdd
.map(PreparedFeatures(
_, Array.empty[TransientFeature], dateFeatures.map(TransientFeature(_)), Option(period)))
.map(_.predictors.mapValues(_.right.map(_.toList)))
Expand Down