refactor benchmark script

- remove compat for old nd
- introduce BenchmarkCase data structure

Author: hexaeder

benchmark/benchmark_cases.jl

@@ -16,66 +16,65 @@ struct BenchmarkCase
     description::String
 end
 
-# Helper functions to reduce code duplication
-function make_ws_graph(N, k, β=0.0; rng=StableRNG(1))
-    watts_strogatz(N, k, β; rng)
-end
-
-function make_mixed_vertices(v1, v2, N; rng=StableRNG(1))
-    vertex = [v1, v2]
-    vertex[shuffle(rng, vcat([1 for _ in 1:N÷2], [2 for _ in 1:N÷2]))]
-end
-
 # Standard benchmark cases
-const BENCHMARK_CASES = [
+BENCHMARK_CASES = [
     BenchmarkCase(
         "diffusion_static_edge",
         N -> begin
-            g = make_ws_graph(N, N ÷ 2)
+            g = watts_strogatz(N, N ÷ 2, 0.0; rng=StableRNG(1))
             Network(g, diffusion_vertex(), diffusion_edge())
         end,
+        # [10,20],
         [100, 300, 1000, 3000],
         "Diffusion network with static edges"
     ),
 
     BenchmarkCase(
         "diffusion_ode_edge",
         N -> begin
-            g = make_ws_graph(N, N ÷ 2)
+            g = watts_strogatz(N, N ÷ 2, 0.0; rng=StableRNG(1))
             Network(g, diffusion_vertex(), diffusion_dedge())
         end,
+        # [10,20],
         [100, 300, 1000, 3000],
         "Diffusion network with ODE edges"
     ),
 
     BenchmarkCase(
         "kuramoto_homogeneous",
         N -> begin
-            g = make_ws_graph(N, 3, 0.8)
+            g = watts_strogatz(N, 3, 0.8; rng=StableRNG(1))
             Network(g, kuramoto_vertex_2d(), static_kuramoto_edge())
         end,
+        # [10,20],
         [100, 1_000, 10_000, 100_000],
         "Homogeneous Kuramoto oscillators"
     ),
 
     BenchmarkCase(
         "kuramoto_heterogeneous",
         N -> begin
-            g = make_ws_graph(N, 3, 0.8)
-            vertices = make_mixed_vertices(kuramoto_vertex_1d(), kuramoto_vertex_2d(), N)
+            g = watts_strogatz(N, 3, 0.8; rng=StableRNG(1))
+            rng = StableRNG(1)
+            vtypes = [kuramoto_vertex_1d(), kuramoto_vertex_2d()]
+            vertices = vtypes[shuffle(rng, vcat([1 for _ in 1:N÷2], [2 for _ in 1:N÷2]))]
             Network(g, vertices, static_kuramoto_edge())
         end,
+        # [10,20],
         [100, 1_000, 10_000, 100_000],
         "Heterogeneous Kuramoto oscillators"
     ),
 
     BenchmarkCase(
         "powergrid",
         N -> begin
-            g = make_ws_graph(N, 3, 0.8)
-            vertices = make_mixed_vertices(pqnode(), generator(), N)
+            g = watts_strogatz(N, 3, 0.8; rng=StableRNG(1))
+            rng = StableRNG(1)
+            vtypes = [pqnode(), generator()]
+            vertices = vtypes[shuffle(rng, vcat([1 for _ in 1:N÷2], [2 for _ in 1:N÷2]))]
             Network(g, vertices, piline())
         end,
+        # [10,20],
         [100, 1_000, 10_000, 100_000],
         "Power grid network with PQ nodes and generators"
     )

benchmark/benchmark_compat.jl

@@ -10,10 +10,5 @@ end
 
 function randp(nd::Network)
     rng = StableRNG(1)
-    _p = rand(rng, pdim(nd))
-    p = NWParameter(nd; ptype=typeof(_p))
-    for (i, sym) in enumerate(_psyms_old_order(nd))
-        p[sym] = _p[i]
-    end
-    p[:]
+    rand(rng, pdim(nd))
 end