From b65a442cb097df6b347b4e8aa04e82624798b55f Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Wed, 3 Feb 2021 13:02:18 +0100
Subject: [PATCH] fig: use timetable attribute in other plots

---
 garlic/fig/index.nix | 57 +++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/garlic/fig/index.nix b/garlic/fig/index.nix
index 5abc91d..5cb454d 100644
--- a/garlic/fig/index.nix
+++ b/garlic/fig/index.nix
@@ -12,56 +12,33 @@ let
   exp = garlic.exp;
   pp = garlic.pp;
 
-  rPlotExp = rScript: exp: rPlot { script = rScript; dataset = exp; };
+  exptt = exlist: map (e: e.timetable) exlist;
+  rPlotExp = rScript: exp: rPlot {
+    script = rScript;
+    dataset = pp.mergeDatasets (exptt exp);
+  };
 in
 {
   nbody = with exp.nbody; {
-    baseline = rPlot {
-      script = ./nbody/baseline.R;
-      dataset = ds.nbody.baseline;
-    };
-
-    small = rPlotExp ./nbody/baseline.R small.timetable;
-
-    jemalloc = rPlot {
-      script = ./nbody/jemalloc.R;
-      dataset = ds.nbody.jemalloc;
-    };
-    #freeCpu = rPlot {
-    #  script = ./nbody/freeCpu.R;
-    #  dataset = ds.nbody.freeCpu;
-    #};
-    ctf = rPlot {
-      script = ./nbody/baseline.R;
-      dataset = ds.nbody.ctf;
-    };
+    baseline  = rPlotExp ./nbody/baseline.R [ baseline ];
+    small     = rPlotExp ./nbody/baseline.R [ small ];
+    jemalloc  = rPlotExp ./nbody/jemalloc.R [ baseline jemalloc ];
+    ctf       = rPlotExp ./nbody/baseline.R [ ctf ];
   };
 
-  hpcg = {
-    oss = with ds.hpcg; rPlot {
-      script = ./hpcg/oss.R;
-      dataset = oss;
-    };
+  hpcg = with exp.hpcg; {
+    oss = rPlotExp ./hpcg/oss.R [ oss ];
   };
 
-  saiph = {
-    granularity = with ds.saiph; rPlot {
-      script = ./saiph/granularity.R;
-      dataset = granularity;
-    };
+  saiph = with exp.saiph; {
+    granularity = rPlotExp ./saiph/granularity.R [ granularity ];
   };
 
-  heat = {
-    test = with ds.heat; rPlot {
-      script = ./heat/test.R;
-      dataset = test;
-    };
+  heat = with exp.heat; {
+    test = rPlotExp ./heat/test.R [ test ];
   };
 
-  creams = {
-    ss = with ds.creams; rPlot {
-      script = ./creams/ss.R;
-      dataset = ss.all;
-    };
+  creams = with exp.creams; {
+    ss = rPlotExp ./creams/ss.R [ ss.hybrid ss.pure ];
   };
 }