Skip to content

Commit e1160cf

Browse files
committed
fix tests
1 parent fbc39f0 commit e1160cf

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ private[ml] object DecisionTreeClassificationModel {
140140
s"Cannot convert non-classification DecisionTreeModel (old API) to" +
141141
s" DecisionTreeClassificationModel (new API). Algo is: ${oldModel.algo}")
142142
val rootNode = Node.fromOld(oldModel.topNode, categoricalFeatures)
143+
val uid = if (parent != null) parent.uid else Identifiable.randomUID("dtc")
143144
new DecisionTreeClassificationModel(parent.uid, rootNode)
144145
}
145146
}

mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ private[ml] object GBTClassificationModel {
212212
// parent, fittingParamMap for each tree is null since there are no good ways to set these.
213213
DecisionTreeRegressionModel.fromOld(tree, null, categoricalFeatures)
214214
}
215+
val uid = if (parent != null) parent.uid else Identifiable.randomUID("gbtc")
215216
new GBTClassificationModel(parent.uid, newTrees, oldModel.treeWeights)
216217
}
217218
}

mllib/src/main/scala/org/apache/spark/ml/regression/DecisionTreeRegressor.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ private[ml] object DecisionTreeRegressionModel {
130130
s"Cannot convert non-regression DecisionTreeModel (old API) to" +
131131
s" DecisionTreeRegressionModel (new API). Algo is: ${oldModel.algo}")
132132
val rootNode = Node.fromOld(oldModel.topNode, categoricalFeatures)
133-
new DecisionTreeRegressionModel(parent.uid, rootNode)
133+
val uid = if (parent != null) parent.uid else Identifiable.randomUID("dtr")
134+
new DecisionTreeRegressionModel(uid, rootNode)
134135
}
135136
}

mllib/src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ private[ml] object GBTRegressionModel {
201201
// parent, fittingParamMap for each tree is null since there are no good ways to set these.
202202
DecisionTreeRegressionModel.fromOld(tree, null, categoricalFeatures)
203203
}
204+
val uid = if (parent != null) parent.uid else Identifiable.randomUID("gbtr")
204205
new GBTRegressionModel(parent.uid, newTrees, oldModel.treeWeights)
205206
}
206207
}

mllib/src/test/scala/org/apache/spark/ml/param/ParamsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ParamsSuite extends FunSuite {
2727

2828
assert(maxIter.name === "maxIter")
2929
assert(maxIter.doc === "max number of iterations (>= 0)")
30-
assert(maxIter.parent.eq(solver))
30+
assert(maxIter.parent === solver.uid)
3131
assert(maxIter.toString === "maxIter: max number of iterations (>= 0) (default: 10)")
3232
assert(!maxIter.isValid(-1))
3333
assert(maxIter.isValid(0))

0 commit comments

Comments
 (0)