clean up after pio eval
diff --git a/src/main/scala/Evaluation.scala b/src/main/scala/Evaluation.scala
index 6ddc67d..8a903ee 100644
--- a/src/main/scala/Evaluation.scala
+++ b/src/main/scala/Evaluation.scala
@@ -13,17 +13,16 @@
case class Precision
extends AverageMetric[EmptyEvaluationInfo,
Query, PredictedResult, ActualResult] {
- def header: String = "Precision"
-
def calculate(query: Query, predicted: PredictedResult, actual: ActualResult)
: Double = (if (predicted.label == actual.label) 1.0 else 0.0)
}
-object PrecisionEvaluation
-extends Evaluation with EngineParamsGenerator {
+object PrecisionEvaluation extends Evaluation {
// Define Engine and Metric used in Evaluation
engineMetric = (ClassificationEngine(), new Precision())
+}
+object EngineParamsList extends EngineParamsGenerator {
// Define list of EngineParams used in Evaluation
// First, we define the base engine params. It specifies the appId from which
@@ -40,10 +39,3 @@
baseEP.copy(algorithmParamsList = Seq(("naive", AlgorithmParams(100.0)))),
baseEP.copy(algorithmParamsList = Seq(("naive", AlgorithmParams(1000.0)))))
}
-
-// To be replaced by "pio eval xxx"
-object Eval {
- def main(args: Array[String]) {
- Workflow.runEvaluation(PrecisionEvaluation, PrecisionEvaluation)
- }
-}
