fixed compilation issues, but have not added tests yet

apache · Feb 5, 2015 · d35bb5d · d35bb5d
1 parent bfade12
commit d35bb5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/AdaBoost.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/AdaBoost.scala
@@ -57,10 +57,11 @@ class AdaBoost extends Classifier[AdaBoost, AdaBoostModel]
     val featuresColName = paramMap(featuresCol)
     val wl = paramMap(weakLearner)
     val featuresRDD: RDD[Vector] = wl match {
-      case wlTagged: WeakLearner =>
+      case wlTagged: WeakLearner[_] =>
         val wlParamMap = paramMap(weakLearnerParamMap)
         val wlFeaturesColName = wlParamMap(wl.featuresCol)
-        val origFeaturesRDD = dataset.select(featuresColName.attr).as(wlFeaturesColName.attr)
+        // TODO: How do I get this to use the string value of wlFeaturesColName?
+        val origFeaturesRDD = dataset.select(featuresColName.attr).as('wlFeaturesColName)
         wlTagged.getNativeFeatureRDD(origFeaturesRDD, wlParamMap)
       case _ =>
         dataset.select(featuresColName.attr).map { case Row(features: Vector) => features }

diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
@@ -149,7 +149,7 @@ class LogisticRegressionModel private[ml] (
   }
 
   override def predictRaw(features: Vector): Vector = {
-    val m = margin(m)
+    val m = margin(features)
     Vectors.dense(Array(-m, m))
   }
 }