chore: move powerspy-core to scala 2.12

chore: fix the CLI help (remove non-existing aggregator)
fix: there was a problem with the conversion when the powers were aggregated (add also a test to cover this case)

Author: mcolmant

powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -95,7 +95,7 @@ object PowerAPI extends App {
         |                          monitor (1, *)
         |                            --frequency $MILLISECONDS
         |                            --self (0, 1) --pids [pid, ...] (0, *) --apps [app, ...] (0, *) --containers [id, ...] (0, *) | all (0, 1)
-        |                            --agg max|min|geomean|logsum|mean|median|stdev|sum|variance
+        |                            --agg max|min|mean|median|sum
         |                            --console (0, 1) --file $FILEPATH (0, *) --chart (0, 1) --influx $HOST $PORT $USER $PWD $DB $MEASUREMENT (0, *)
         |                  duration [s]
         |

powerapi-core/build.sbt

@@ -14,7 +14,7 @@ resolvers ++= Seq(
 libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-actor" % "2.4.14",
   "com.typesafe" % "config" % "1.3.1",
-  "fr.inria.powerspy" % "powerspy-core_2.11" % "1.2",
+  "fr.inria.powerspy" %% "powerspy-core" % "1.2",
   "com.nativelibs4java" % "bridj" % "0.7.0",
   "org.jfree" % "jfreechart" % "1.0.19",
   "org.clapper" %% "grizzled-scala" % "4.0.0",

powerapi-core/src/main/scala/org/powerapi/core/power/package.scala

@@ -32,15 +32,15 @@ package object power {
   final val KILOWATTS = org.powerapi.core.power.PowerConverter.KILOWATTS
   final val MEGAWATTS = org.powerapi.core.power.PowerConverter.MEGAWATTS
 
-  def MAX(s: Seq[Power]): Power = s.map(_.value).max.mW
+  def MAX(s: Seq[Power]): Power = s.map(_.toMilliWatts).max.mW
 
-  def MIN(s: Seq[Power]): Power = s.map(_.value).min.mW
+  def MIN(s: Seq[Power]): Power = s.map(_.toMilliWatts).min.mW
 
-  def SUM(s : Seq[Power]): Power = s.map(_.value).sum.mW
+  def SUM(s : Seq[Power]): Power = s.map(_.toMilliWatts).sum.mW
 
-  def MEAN(s: Seq[Power]): Power = mean(s.map(_.value): _*).mW
+  def MEAN(s: Seq[Power]): Power = mean(s.map(_.toMilliWatts): _*).mW
 
-  def MEDIAN(s: Seq[Power]): Power = median(s.map(_.value): _*).mW
+  def MEDIAN(s: Seq[Power]): Power = median(s.map(_.toMilliWatts): _*).mW
 
   implicit final class DoublePower(private val value: Double) extends AnyVal {
     def mW: Power = Power(value, MILLIWATTS)

powerapi-core/src/test/scala/org/powerapi/core/power/PowerSuite.scala

@@ -38,12 +38,8 @@ class PowerSuite extends UnitTest {
 
   "A Power" should "handle a various kind of operations" in {
     val p1 = Power(1.0, "W")
-    p1 should (
-      equal(1.W) and
-        equal(1000L.mW) and
-        equal(0.001.kW) and
-        equal(Power(1.0, "nW"))
-      )
+    p1 should (equal(1.W) and equal(1000L.mW) and equal(0.001.kW) and equal(Power(1.0, "nW")))
+
     p1.value should (
       equal(0.000001.MW.toWatts) and
         equal(1000L.mW.toUnit(WATTS))
@@ -91,6 +87,12 @@ class PowerSuite extends UnitTest {
     0.5.W / 2 should equal(250.mW)
     1000L.MW / 100 should equal(10000.kW)
 
+    MAX(Seq(10.W, 10.mW)) should equal(10.W)
+    MIN(Seq(10.W, 10.mW)) should equal(10.mW)
+    SUM(Seq(10.W, 10.mW)) should equal(10010.mW)
+    MEAN(Seq(10.W, 10.W)) should equal(10.W)
+    MEDIAN(Seq(10.W, 10.mW, 12.mW)) should equal(12.mW)
+
     intercept[java.lang.IllegalArgumentException] {
       1.W * Double.NaN
     }