From cea15ab055c1156c0f1ab0f0ac6f4c6a435908a2 Mon Sep 17 00:00:00 2001
From: Erick Lavoie <erick.lavoie@epfl.ch>
Date: Mon, 11 Apr 2022 17:19:47 +0200
Subject: [PATCH] Added new required prediction
---
src/main/scala/distributed/Exact.scala | 3 ++-
src/main/scala/optimizing/Optimizing.scala | 3 ++-
src/test/scala/distributed/ExactTests.scala | 3 +++
src/test/scala/optimizing/OptimizingTests.scala | 3 +++
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/scala/distributed/Exact.scala b/src/main/scala/distributed/Exact.scala
index b2b6ebf..ae05d2d 100644
--- a/src/main/scala/distributed/Exact.scala
+++ b/src/main/scala/distributed/Exact.scala
@@ -90,7 +90,8 @@ object Exact {
"2.knn_u1v864" -> ujson.Num(0.0),
"3.knn_u1v886" -> ujson.Num(0.0),
"4.PredUser1Item1" -> ujson.Num(0.0),
- "5.Mae" -> ujson.Num(measurements(0)._1)
+ "5.PredUser327Item2" -> ujson.Num(0.0),
+ "6.Mae" -> ujson.Num(0.0)
),
"EK.2" -> ujson.Obj(
"average (ms)" -> ujson.Num(mean(timings)), // Datatype of answer: Double
diff --git a/src/main/scala/optimizing/Optimizing.scala b/src/main/scala/optimizing/Optimizing.scala
index 0afcc5f..08d27c3 100644
--- a/src/main/scala/optimizing/Optimizing.scala
+++ b/src/main/scala/optimizing/Optimizing.scala
@@ -76,7 +76,8 @@ object Optimizing extends App {
"2.k10u1v864" -> ujson.Num(0.0),
"3.k10u1v886" -> ujson.Num(0.0),
"4.PredUser1Item1" -> ujson.Num(0.0),
- "5.Mae" -> ujson.Num(0.0)
+ "5.PredUser327Item2" -> ujson.Num(0.0),
+ "6.Mae" -> ujson.Num(0.0)
),
"BR.2" -> ujson.Obj(
"average (ms)" -> ujson.Num(mean(timings)), // Datatype of answer: Double
diff --git a/src/test/scala/distributed/ExactTests.scala b/src/test/scala/distributed/ExactTests.scala
index ad94055..4a05e2a 100644
--- a/src/test/scala/distributed/ExactTests.scala
+++ b/src/test/scala/distributed/ExactTests.scala
@@ -46,6 +46,9 @@ class ExactTests extends AnyFunSuite with BeforeAndAfterAll {
// Prediction user 1 and item 1
assert(within(1.0, 0.0, 0.0001))
+ // Prediction user 327 and item 2
+ assert(within(1.0, 0.0, 0.0001))
+
// MAE on test
assert(within(1.0, 0.0, 0.0001))
}
diff --git a/src/test/scala/optimizing/OptimizingTests.scala b/src/test/scala/optimizing/OptimizingTests.scala
index b13b1c9..3ef3a72 100644
--- a/src/test/scala/optimizing/OptimizingTests.scala
+++ b/src/test/scala/optimizing/OptimizingTests.scala
@@ -41,6 +41,9 @@ class OptimizingTests extends AnyFunSuite with BeforeAndAfterAll {
// Prediction user 1 and item 1
assert(within(1.0, 0.0, 0.0001))
+ // Prediction user 327 and item 2
+ assert(within(1.0, 0.0, 0.0001))
+
// MAE on test2
assert(within(1.0, 0.0, 0.0001))
}
--
GitLab