Skip to content

[MINOR]Correct validateAndTransformSchema in GaussianMixture and AFTSurvivalRegression #18980

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

Closed
sharp-pixel wants to merge 4 commits into from
Closed

[MINOR]Correct validateAndTransformSchema in GaussianMixture and AFTSurvivalRegression #18980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa5e3f9
Correct validateAndTransformSchema
sharp-pixel Aug 17, 2017
b2df776
Correct validateAndTransformSchema
sharp-pixel Aug 17, 2017
eb66b1e
Merge branch 'master' of https://github.com/sharp-pixel/spark
sharp-pixel Aug 18, 2017
d14c21e
Renamed schema_temp with more descriptive camelCase variable names.
sharp-pixel Aug 19, 2017
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
Correct validateAndTransformSchema
  • Loading branch information
@sharp-pixel
sharp-pixel committed Aug 18, 2017
commit b2df776c5f48bfb1c3e5e0cda82b901405f9c6c5
4 changes: 2 additions & 2 deletions mllib/src/main/scala/org/apache/spark/ml/clustering/GaussianMixture.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ private[clustering] trait GaussianMixtureParams extends Params with HasMaxIter w
*/
protected def validateAndTransformSchema(schema: StructType): StructType = {
SchemaUtils.checkColumnType(schema, $(featuresCol), new VectorUDT)
SchemaUtils.appendColumn(schema, $(predictionCol), IntegerType)
SchemaUtils.appendColumn(schema, $(probabilityCol), new VectorUDT)
val schema_temp = SchemaUtils.appendColumn(schema, $(predictionCol), IntegerType)
Copy link
Member

@srowen srowen Aug 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tiny nit: Java/Scala use camelCase var names. Maybe call this withPredictionCol or something, as it's more descriptive anyway.

Copy link
Contributor Author

@sharp-pixel sharp-pixel Aug 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad! Just committed with more descriptive variables in camelCase. Thanks

SchemaUtils.appendColumn(schema_temp, $(probabilityCol), new VectorUDT)
}
}

Expand Down
8 changes: 5 additions & 3 deletions mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,12 @@ private[regression] trait AFTSurvivalRegressionParams extends Params
SchemaUtils.checkNumericType(schema, $(censorCol))
SchemaUtils.checkNumericType(schema, $(labelCol))
}
if (hasQuantilesCol) {

val temp_schema = if (hasQuantilesCol) {
SchemaUtils.appendColumn(schema, $(quantilesCol), new VectorUDT)
}
SchemaUtils.appendColumn(schema, $(predictionCol), DoubleType)
} else schema

SchemaUtils.appendColumn(temp_schema, $(predictionCol), DoubleType)
}
}

Expand Down