cleanup

Author: BatyLeo

ext/plots/dvs_plots.jl

@@ -42,11 +42,6 @@ function _plot_static_instance(
     return fig
 end
 
-function _plot_static_instance(instance::DVS.StaticInstance; kwargs...)
-    x_depot, y_depot, x, y = DVS.build_instance_data(instance)
-    return _plot_static_instance(x_depot, y_depot, x, y; kwargs...)
-end
-
 # ── plot_state ───────────────────────────────────────────────────────────────
 
 """

src/DynamicVehicleScheduling/DynamicVehicleScheduling.jl

@@ -42,7 +42,6 @@ include("utils.jl")
 include("static_vsp/instance.jl")
 include("static_vsp/parsing.jl")
 include("static_vsp/solution.jl")
-include("static_vsp/instance_data.jl")
 
 include("instance.jl")
 include("state.jl")

src/DynamicVehicleScheduling/static_vsp/instance_data.jl

@@ -16,8 +16,13 @@
     gap = compute_gap(b, dataset, model, maximizer)
     @test gap >= 0
 
+    @test has_visualization(b)
     figure = plot_solution(b, dataset[1])
     @test figure isa Plots.Plot
+    figure2 = plot_instance(b, dataset[1])
+    @test figure2 isa Plots.Plot
+    figure3 = plot_solution(b, dataset[1], dataset[2].y)
+    @test figure3 isa Plots.Plot
 
     for (i, sample) in enumerate(dataset)
         x = sample.x

test/argmax_2d.jl

@@ -13,8 +13,13 @@
     bellman_maximizer = generate_maximizer(b; dijkstra=false)
     dijkstra_maximizer = generate_maximizer(b; dijkstra=true)
 
+    @test has_visualization(b)
     figure = plot_solution(b, dataset[1])
     @test figure isa Plots.Plot
+    figure2 = plot_instance(b, dataset[1])
+    @test figure2 isa Plots.Plot
+    figure3 = plot_solution(b, dataset[1], dataset[2].y)
+    @test figure3 isa Plots.Plot
     gap = compute_gap(b, dataset, model, dijkstra_maximizer)
     @test gap >= 0