[SPARK-1406] Added Double Min and Max

Fixed scala style
vanzin · Apr 29, 2015 · 085cf42 · 085cf42
1 parent 30165c4
commit 085cf42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...c/main/scala/org/apache/spark/mllib/pmml/export/BinaryClassificationPMMLModelExport.scala b/...c/main/scala/org/apache/spark/mllib/pmml/export/BinaryClassificationPMMLModelExport.scala
@@ -48,12 +48,13 @@ private[mllib] class BinaryClassificationPMMLModelExport(
        val regressionTableYES = new RegressionTable(model.intercept).withTargetCategory("1")
        var interceptNO = threshold
        if (RegressionNormalizationMethodType.LOGIT == normalizationMethod) {
-         if (threshold <= 0)
-           interceptNO = -1000
-         else if (threshold >= 1)
-           interceptNO = 1000
-         else
-           interceptNO = -math.log(1/threshold -1)
+         if (threshold <= 0) {
+           interceptNO = Double.MinValue
+         } else if (threshold >= 1) {
+           interceptNO = Double.MaxValue
+         } else {
+           interceptNO = -math.log(1 / threshold - 1)
+         }
        }
        val regressionTableNO = new RegressionTable(interceptNO).withTargetCategory("0")
        val regressionModel = new RegressionModel()

diff --git a/mllib/src/main/scala/org/apache/spark/mllib/pmml/export/PMMLModelExportFactory.scala b/mllib/src/main/scala/org/apache/spark/mllib/pmml/export/PMMLModelExportFactory.scala
@@ -47,13 +47,14 @@ private[mllib] object PMMLModelExportFactory {
           svm, "linear SVM", RegressionNormalizationMethodType.NONE, 
           svm.getThreshold.getOrElse(0.0))
       case logistic: LogisticRegressionModel =>
-        if (logistic.numClasses == 2)
+        if (logistic.numClasses == 2) {
           new BinaryClassificationPMMLModelExport(
             logistic, "logistic regression", RegressionNormalizationMethodType.LOGIT,
             logistic.getThreshold.getOrElse(0.5))
-        else
+        } else {
           throw new IllegalArgumentException(
             "PMML Export not supported for Multinomial Logistic Regression")
+        }
       case _ =>
         throw new IllegalArgumentException(
           "PMML Export not supported for model: " + model.getClass.getName)