Skip to content

Cox multivariate #467

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

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

Cox multivariate #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4cada9
Updated Cox code
abhiwand Aug 30, 2016
4c25e53
Cleanup of Cox code
abhiwand Aug 31, 2016
3c9d6f7
Renamed Cox to CoxPh
abhiwand Sep 1, 2016
2d47c99
Merge branch 'master' of github.com:trustedanalytics/atk into DPNG-7943
abhiwand Sep 2, 2016
91442e6
Added equations in scala doc
abhiwand Sep 7, 2016
1c51272
Merge branch 'master' of github.com:trustedanalytics/atk into DPNG-7943
abhiwand Sep 7, 2016
05e3aba
Renamed CoxPHTest to CoxPhTest
abhiwand Sep 7, 2016
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
10 changes: 5 additions & 5 deletions ...plugins/model-plugins/src/main/scala/org/apache/spark/ml/atk/plugins/MLJsonProtocol.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.apache.spark.ml.atk.plugins

import org.apache.spark.ml.regression.CoxModel
import org.apache.spark.ml.regression.CoxPhModel
import org.apache.spark.mllib.atk.plugins.MLLibJsonProtocol
import org.apache.spark.mllib.atk.plugins.MLLibJsonProtocol.VectorFormat
import org.trustedanalytics.atk.domain.DomainJsonProtocol._
Expand Down Expand Up @@ -52,9 +52,9 @@ object MLJsonProtocol {
}
}

implicit object CoxModelFormat extends JsonFormat[CoxModel] {
implicit object CoxModelFormat extends JsonFormat[CoxPhModel] {

override def write(obj: CoxModel): JsValue = {
override def write(obj: CoxPhModel): JsValue = {
val beta = VectorFormat.write(obj.beta)
val mean = VectorFormat.write(obj.meanVector)
JsObject(
Expand All @@ -64,7 +64,7 @@ object MLJsonProtocol {
)
}

override def read(json: JsValue): org.apache.spark.ml.regression.CoxModel = {
override def read(json: JsValue): org.apache.spark.ml.regression.CoxPhModel = {
val fields = json.asJsObject.fields
val uid = getOrInvalid(fields, "uid").convertTo[String]
val beta = fields.get("beta").map(v => {
Expand All @@ -75,7 +75,7 @@ object MLJsonProtocol {
VectorFormat.read(v)
}).get

new CoxModel(uid, beta, mean)
new CoxPhModel(uid, beta, mean)
}
}

Expand Down
Loading