Repository: incubator-predictionio-template-text-classifier Updated Branches: refs/heads/develop 4a78a5fc6 -> 260ee0918
Fix use of case class Closes #14 Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/commit/260ee091 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/tree/260ee091 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/diff/260ee091 Branch: refs/heads/develop Commit: 260ee09184d8a51f0902a49dc257af7a503063e1 Parents: 4a78a5f Author: Naoki Takezoe <[email protected]> Authored: Tue Aug 29 13:58:51 2017 +0900 Committer: Naoki Takezoe <[email protected]> Committed: Tue Aug 29 13:58:51 2017 +0900 ---------------------------------------------------------------------- src/main/scala/DataSource.scala | 4 ++-- src/main/scala/Engine.scala | 6 +++--- src/main/scala/Evaluation.scala | 2 +- src/main/scala/LRAlgorithm.scala | 2 +- src/main/scala/NBAlgorithm.scala | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/blob/260ee091/src/main/scala/DataSource.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala index 80b6344..82344d0 100644 --- a/src/main/scala/DataSource.scala +++ b/src/main/scala/DataSource.scala @@ -95,7 +95,7 @@ class DataSource ( // Prepare test data for fold. val test = data.filter(_._2 % dsp.evalK.get == k) .map(_._1) - .map(e => (new Query(e.text), new ActualResult(e.category))) + .map(e => (Query(e.text), ActualResult(e.category))) (train, new EmptyEvaluationInfo, test) } @@ -110,7 +110,7 @@ case class Observation( label: Double, text: String, category: String -) extends Serializable +) /** TrainingData class serving as a wrapper for all * read in from the Event Server. http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/blob/260ee091/src/main/scala/Engine.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala index abe8778..bb4de3d 100644 --- a/src/main/scala/Engine.scala +++ b/src/main/scala/Engine.scala @@ -6,7 +6,7 @@ import org.apache.predictionio.controller.Engine /** Define Query class which serves as a wrapper for * new text data. */ -case class Query(text: String) extends Serializable +case class Query(text: String) /** Define PredictedResult class which serves as a * wrapper for a predicted class label and the associated @@ -14,12 +14,12 @@ case class Query(text: String) extends Serializable */ case class PredictedResult( category: String, - confidence: Double) extends Serializable + confidence: Double) /** Define ActualResult class which serves as a wrapper * for an observation's true class label. */ -case class ActualResult(category: String) extends Serializable +case class ActualResult(category: String) /** Define Engine */ object TextClassificationEngine extends EngineFactory { http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/blob/260ee091/src/main/scala/Evaluation.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/Evaluation.scala b/src/main/scala/Evaluation.scala index 979d976..60c0d49 100644 --- a/src/main/scala/Evaluation.scala +++ b/src/main/scala/Evaluation.scala @@ -27,7 +27,7 @@ object AccuracyEvaluation extends Evaluation { // Define Engine and Metric used in Evaluation. engineMetric = ( TextClassificationEngine(), - new Accuracy + Accuracy() ) } http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/blob/260ee091/src/main/scala/LRAlgorithm.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/LRAlgorithm.scala b/src/main/scala/LRAlgorithm.scala index e056cf9..6e127c8 100644 --- a/src/main/scala/LRAlgorithm.scala +++ b/src/main/scala/LRAlgorithm.scala @@ -74,7 +74,7 @@ class LRAlgorithm(val ap: LRAlgorithmParams) case class LREstimate ( coefficients : Array[Double], intercept : Double -) extends Serializable +) class LRModel( val tfIdf: TFIDFModel, http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-text-classifier/blob/260ee091/src/main/scala/NBAlgorithm.scala ---------------------------------------------------------------------- diff --git a/src/main/scala/NBAlgorithm.scala b/src/main/scala/NBAlgorithm.scala index 9a408c5..6576234 100644 --- a/src/main/scala/NBAlgorithm.scala +++ b/src/main/scala/NBAlgorithm.scala @@ -77,6 +77,6 @@ class NBModel( def predict(doc : String) : PredictedResult = { val x: Array[Double] = getScores(doc) val y: (Double, Double) = (nb.labels zip x).maxBy(_._2) - new PredictedResult(categoryMap.getOrElse(y._1, ""), y._2) + PredictedResult(categoryMap.getOrElse(y._1, ""), y._2) } }
