Generate plots

Author: staadecker

src/benchmarks/.gitignore benchmarks/.gitignoresrc/benchmarks/.gitignore renamed to benchmarks/.gitignore

@@ -4,4 +4,4 @@ This folder contains the code and instructions needed to compare Pyoframe's perf
 
 ## Running energy model benchmark locally
 
-1. Download the California Test System data. Specifically, place the [load data](https://drive.google.com/file/d/1Sz8st7g4Us6oijy1UYMPUvkA1XeZlIr8/view?usp=drive_link), [generation data](https://drive.google.com/file/d/1CxLlcwAEUy-JvJQdAfVydJ1p9Ecot-4d/view?usp=drive_link), and [line data](https://github.com/staadecker/CATS-CaliforniaTestSystem/blob/master/GIS/CATS_lines.json) in the `/benchmarks/energy_model/data`.
+1. Download the California Test System data. Specifically, place the [load data](https://drive.google.com/file/d/1Sz8st7g4Us6oijy1UYMPUvkA1XeZlIr8/view?usp=drive_link), [generation data](https://drive.google.com/file/d/1CxLlcwAEUy-JvJQdAfVydJ1p9Ecot-4d/view?usp=drive_link), and [line data](https://github.com/staadecker/CATS-CaliforniaTestSystem/blob/master/GIS/CATS_lines.json) in the `/benchmarks/energy_planning/data`.

src/benchmarks/README.md benchmarks/README.mdsrc/benchmarks/README.md renamed to benchmarks/README.md

@@ -1,4 +1,4 @@
-configfile: "src/benchmarks/config.yaml"
+configfile: "config.yaml"
 
 def generate_all_runs():
     import itertools
@@ -23,19 +23,29 @@ def generate_all_runs():
 
 rule all:
     input:
-        "src/benchmarks/results.csv"
+        expand("{problem}/results/{solver}.png", problem=config["problems"], solver=config["solvers"]),
+        "results.csv"
+
+rule plot_results:
+    input:
+        "results.csv"
+    output:
+        mem_plot="{problem}/results/memory_{solver}.png",
+        time_plot="{problem}/results/time_{solver}.png"
+    script:
+        "plot_results.py"
 
 rule collect_benchmarks:
     input:
-        [f"src/benchmarks/{problem}/results/{library}_{solver}_{size}.tsv"
+        [f"{problem}/results/{library}_{solver}_{size}.tsv"
          for problem, size, library, solver in generate_all_runs()]
     output:
-        "src/benchmarks/results.csv"
+        "results.csv"
     script:
-        "src/benchmarks/collect_benchmarks.py"
+        "collect_benchmarks.py"
 
 rule run_benchmark:
     benchmark:
-        repeat("src/benchmarks/{problem}/results/{library}_{solver}_{size}.tsv", config["repeat"])
+        repeat("{problem}/results/{library}_{solver}_{size}.tsv", config["repeat"])
     shell:
-        "python src/benchmarks/run_benchmark.py {wildcards.problem} --library {wildcards.library} --solver {wildcards.solver} --size {wildcards.size}"
+        "python run_benchmark.py {wildcards.problem} --library {wildcards.library} --solver {wildcards.solver} --size {wildcards.size}"

Snakefile benchmarks/SnakefileSnakefile renamed to benchmarks/Snakefile

@@ -15,7 +15,7 @@ def collect_benchmarks(input_files):
         size = name[2]
         dfs.append(
             pl.read_csv(input_file, separator="\t")
-            .mean()
+            .mean()  # TODO also compute std(). Maybe at the plotting stage.
             .with_columns(
                 problem=pl.lit(problem),
                 library=pl.lit(library),

src/benchmarks/__init__.py benchmarks/__init__.pysrc/benchmarks/__init__.py renamed to benchmarks/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 CATS_GITHUB_URL = "https://raw.githubusercontent.com/WISPO-POP/CATS-CaliforniaTestSystem/f260d8bd89e68997bf12d24e767475b2f2b88a77/GIS/"
 
-ENERGY_BENCHMARKS = Path("benchmarks/energy_model")
+ENERGY_BENCHMARKS = Path("benchmarks/energy_planning")
 PREPROCESS_DIR = ENERGY_BENCHMARKS / "data/preprocess"
 POSTPROCESS_DIR = ENERGY_BENCHMARKS / "data/postprocess"
 SCRIPTS_DIR = ENERGY_BENCHMARKS / "scripts"