resolve conflicts

actuaryzhang · actuaryzhang · commit 83deee352c46 · 2017-01-17T16:51:20.000-08:00
diff --git a/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala
@@ -341,7 +341,7 @@ class GeneralizedLinearRegression @Since("2.0.0") (@Since("2.0.0") override val
           Instance(label, weight, features)
       }
 
-    val model = if (familyAndLink.familyObj == Gaussian && familyAndLink.linkObj == Identity) {
+    val model = if (familyAndLink.family == Gaussian && familyAndLink.link == Identity) {
       // TODO: Make standardizeFeatures and standardizeLabel configurable.
       val optimizer = new WeightedLeastSquares($(fitIntercept), $(regParam), elasticNetParam = 0.0,
         standardizeFeatures = true, standardizeLabel = true)

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ class GeneralizedLinearRegression @Since("2.0.0") (@Since("2.0.0") override val`
`341`	`341`	`Instance(label, weight, features)`
`342`	`342`	`}`
`343`	`343`
`344`		`- val model = if (familyAndLink.familyObj == Gaussian && familyAndLink.linkObj == Identity) {`
	`344`	`+ val model = if (familyAndLink.family == Gaussian && familyAndLink.link == Identity) {`
`345`	`345`	`// TODO: Make standardizeFeatures and standardizeLabel configurable.`
`346`	`346`	`val optimizer = new WeightedLeastSquares($(fitIntercept), $(regParam), elasticNetParam = 0.0,`
`347`	`347`	`standardizeFeatures = true, standardizeLabel = true)`