icplot 0.0.12__tar.gz → 0.0.13__tar.gz

{icplot-0.0.12/src/icplot.egg-info → icplot-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.0.12
+Version: 0.0.13
 Summary: Utilities for generating plots and graphics for technical reports.
 Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
 Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot

{icplot-0.0.12 → icplot-0.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "icplot"
-version = "0.0.12"
+version = "0.0.13"
 authors = [
   { name="James Grogan, Irish Centre for High End Computing", email="james.grogan@ichec.ie" },
 ]

icplot-0.0.13/src/icplot/graph/generator.py

@@ -0,0 +1,84 @@
+from typing import Any, Callable
+import copy
+import os
+from pathlib import Path
+
+from pydantic import BaseModel
+
+from .plot import Plot
+from .series import LinePlotSeries
+from .matplotlib import MatplotlibPlotter
+
+
+class PlotConfig(BaseModel):
+
+    series_attr: str
+    x_attr: str
+    plots: dict[str, Plot]
+    colormap: Any
+
+
+def make_plots(
+    results: list[Any], config: PlotConfig, point_func: Callable
+) -> list[Plot]:
+    """
+    For a set of results and a given plot config generate a list of
+    plots.
+    """
+
+    # The instance attribute value for 'series_attr' is used to generate
+    # a set of labels, one per plot series
+    series_labels = set(getattr(r, config.series_attr) for r in results)
+
+    plots: list[Plot] = []
+    # Each 'y attribute' in the config corresponds to a 'plot' of this
+    # attribute's values.
+    for y_attr, plot_template in config.plots.items():
+        new_plot = copy.deepcopy(plot_template)
+        new_plot.name = y_attr
+        series = []
+
+        for label in series_labels:
+            # Get results for this series
+            label_results = [
+                r for r in results if getattr(r, config.series_attr) == label
+            ]
+
+            # Use a user-provided 'point_func' to get the series 'x, y' points
+            # from the results, given a 'x_attr, y_attr' pair
+            points = [point_func(r, config.x_attr, y_attr) for r in label_results].sort(
+                key=lambda x: x[0]
+            )
+            x, y = zip(*points)
+
+            if label in config.colormap:
+                series.append(
+                    LinePlotSeries(
+                        x=x,
+                        y=y,
+                        label=label,
+                        highlight=True,
+                        color=config.colormap[label],
+                    )
+                )
+            else:
+                series.append(LinePlotSeries(x=x, y=y, label=label))
+        new_plot.series.extend(series)
+        plots.append(new_plot)
+    return plots
+
+
+def plot(
+    results: list[Any],
+    config: PlotConfig,
+    point_func: Callable,
+    output_dir: Path = Path(os.getcwd()),
+    plotter=MatplotlibPlotter(),
+):
+    """
+    For a given set of results and plot config generate the
+    corresponding plots and render them to files.
+    """
+
+    for p in make_plots(results, config, point_func):
+        plotter.plot(p, output_dir / f"{p.name}.svg")

{icplot-0.0.12 → icplot-0.0.13}/src/icplot/graph/plot.py

@@ -17,6 +17,7 @@ class Plot(BaseModel):
 
     title: str = ""
     legend_label: str = ""
+    name: str = ""
     x_axis: PlotAxis = PlotAxis()
     y_axis: PlotAxis = PlotAxis()
     plot_type: str = ""

{icplot-0.0.12 → icplot-0.0.13/src/icplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.0.12
+Version: 0.0.13
 Summary: Utilities for generating plots and graphics for technical reports.
 Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
 Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot

{icplot-0.0.12 → icplot-0.0.13}/src/icplot.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/icplot/gantt/gantt_renderer.py
 src/icplot/gantt/pgfgantt.py
 src/icplot/graph/__init__.py
 src/icplot/graph/axis.py
+src/icplot/graph/generator.py
 src/icplot/graph/matplotlib.py
 src/icplot/graph/plot.py
 src/icplot/graph/plotter.py