fix count plot

Quafadas · Nov 15, 2024 · 735cf69 · 735cf69
1 parent fbf5e73
commit 735cf69
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/jsSite/src/BenchmarkPlots.scala b/jsSite/src/BenchmarkPlots.scala
@@ -15,24 +15,24 @@ object BenchmarkPlots:
       ) ++
       (vconcat =
         List(
-          BenchmarkPlotElements.layer(10),
-          BenchmarkPlotElements.layer(1000),
-          BenchmarkPlotElements.layer(100000)
+          BenchmarkPlotElements.layer(10, "n"),
+          BenchmarkPlotElements.layer(1000, "n"),
+          BenchmarkPlotElements.layer(100000, "n")
         )
       )
     write(thePlot)
   end addScalarBenchmark
 
   def addScalarBenchmarkOverTime: String =
     val thePlot = BenchmarkPlotElements.schema ++
-      // BenchmarkPlotElements.data("../../benchmarks/benchmark_history.json") ++
-      BenchmarkPlotElements.fakeData ++
+      BenchmarkPlotElements.data("../../benchmarks/benchmark_history.json") ++
+      // BenchmarkPlotElements.fakeData ++
       (transform = BenchmarkPlotElements.timeTransform(List("AddScalarBenchmark.vecxt_add_vec"))) ++
       (vconcat =
         List(
-          BenchmarkPlotElements.timeLayer(10),
-          BenchmarkPlotElements.timeLayer(1000),
-          BenchmarkPlotElements.timeLayer(100000)
+          BenchmarkPlotElements.timeLayer(10, "n"),
+          BenchmarkPlotElements.timeLayer(1000, "n"),
+          BenchmarkPlotElements.timeLayer(100000, "n")
         )
       )
     write(thePlot)
@@ -48,9 +48,9 @@ object BenchmarkPlots:
       ) ++
       (vconcat =
         List(
-          BenchmarkPlotElements.layer(3),
-          BenchmarkPlotElements.layer(128),
-          BenchmarkPlotElements.layer(100000)
+          BenchmarkPlotElements.layer(3, "len"),
+          BenchmarkPlotElements.layer(128, "len"),
+          BenchmarkPlotElements.layer(100000, "len")
         )
       )
     write(thePlot)

diff --git a/jsSite/src/PlotElements.scala b/jsSite/src/PlotElements.scala
@@ -101,7 +101,7 @@ object BenchmarkPlotElements:
     )
     *: windowAndSortAndFilterLatest
 
-  def timeLayer(n: Int) = (
+  def timeLayer(n: Int, benchmarkVariableName: String) = (
     layer = Tuple2(
       (
         title = s"n = $n",
@@ -146,11 +146,11 @@ object BenchmarkPlotElements:
       )
     ),
     transform = List(
-      (filter = s"(datum.params.n == '$n')")
+      (filter = s"(datum.params.$benchmarkVariableName == '$n')")
     )
   )
 
-  def layer(n: Int, yZeroScale: Boolean = false) =
+  def layer(n: Int, benchmarkVariableName: String, yZeroScale: Boolean = false) =
 
     val yScale = (
       field = "benchmark",
@@ -199,7 +199,7 @@ object BenchmarkPlotElements:
         )
       ),
       transform = List(
-        (filter = s"(datum.params.n == '$n')")
+        (filter = s"(datum.params.$benchmarkVariableName == '$n')")
       )
     )
   end layer

diff --git a/jsSite/test/src/plotChecks.scala b/jsSite/test/src/plotChecks.scala
@@ -38,11 +38,11 @@ end Process
 
 class PlotChecks extends munit.FunSuite:
 
-  // test("some test data") {
-  //   val argy = Fake.fakeData.arr.filter(d => d("benchmark").str.contains("AddScalarBenchmark.vecxt_add_vec"))
-  //   println(argy)
+  test("some test data") {
+    val argy = Fake.fakeData.arr.filter(d => d("benchmark").str.contains("CountTrueBenchmark"))
+    println(argy)
 
-  // }
+  }
 
   test("Add scalar plot") {
     assertEquals(