Merge pull request #30 from BatyLeo/improve-type-stability

Improve type stability of algorithms

Author: BatyLeo

CITATION.bib

@@ -2,7 +2,7 @@ @misc{ConstrainedShortestPaths.jl
 	author  = {Léo Baty and contributors},
 	title   = {ConstrainedShortestPaths.jl},
 	url     = {https://github.com/BatyLeo/ConstrainedShortestPaths.jl},
-	version = {v0.6.2},
+	version = {v0.6.3},
 	year    = {2024},
 	month   = {12}
 }

Project.toml

@@ -1,7 +1,7 @@
 name = "ConstrainedShortestPaths"
 uuid = "b3798467-87dc-4d99-943d-35a1bd39e395"
 authors = ["Léo Baty and contributors"]
-version = "0.6.2"
+version = "0.6.3"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

src/algorithms.jl

@@ -3,14 +3,13 @@ $TYPEDSIGNATURES
 
 Compute backward bounds of instance (see [Computing bounds](@ref)).
 """
-function compute_bounds(instance::CSPInstance; kwargs...)
+function compute_bounds(instance::CSPInstance{T,G,FR,BR}; kwargs...) where {T,G,FR,BR}
     (; graph, destination_vertex, topological_ordering, is_useful) = instance
 
     vertices_order = topological_ordering
     @assert vertices_order[1] == destination_vertex
 
-    bounds = Dict{Int,typeof(instance.destination_backward_resource)}()
-    # bounds = Vector{typeof(instance.destination_backward_resource)}(undef, nv(graph))
+    bounds = Dict{Int,BR}()
     bounds[destination_vertex] = instance.destination_backward_resource
 
     for vertex in vertices_order[2:end]
@@ -30,7 +29,7 @@ $TYPEDSIGNATURES
 Perform generalized A star algorithm on instnace using bounds
 (see [Generalized `A^\\star`](@ref)).
 """
-function generalized_a_star(instance::CSPInstance, bounds; kwargs...)
+function generalized_a_star(instance::CSPInstance{T,G,FR}, bounds; kwargs...) where {T,G,FR}
     (; graph, origin_vertex, destination_vertex, is_useful) = instance
     nb_vertices = nv(graph)
 
@@ -42,8 +41,8 @@ function generalized_a_star(instance::CSPInstance, bounds; kwargs...)
             instance.cost_function(forward_resources[empty_path], bounds[origin_vertex]),
     )
 
-    forward_type = typeof(forward_resources[empty_path])
-    M = [forward_type[] for _ in 1:nb_vertices]
+    # forward_type = typeof(forward_resources[empty_path])
+    M = [FR[] for _ in 1:nb_vertices]
     push!(M[origin_vertex], forward_resources[empty_path])
     c_star = Inf
     p_star = [origin_vertex]

src/utils/utils.jl

@@ -7,14 +7,9 @@ function is_dominated(rq::F, Mw::Vector{F}) where {F}
     return false
 end
 
+# Remove all elements in Mw that are dominated by rq
 function remove_dominated!(Mw::AbstractVector{R}, rq::R) where {R}
-    to_delete = Int[]
-    for (i, r) in enumerate(Mw)
-        if rq <= r
-            push!(to_delete, i)
-        end
-    end
-    deleteat!(Mw, to_delete)
+    filter!(r -> !(rq <= r), Mw)
     return nothing
 end
 

test/code.jl

@@ -7,9 +7,7 @@ end
 
 @testset "Correctness (JET.jl)" begin
     using JET
-    if VERSION >= v"1.8"
-        JET.test_package(ConstrainedShortestPaths; toplevel_logger=nothing, mode=:typo)
-    end
+    JET.test_package(ConstrainedShortestPaths; target_modules=[ConstrainedShortestPaths])
 end
 
 @testset "Formatting (JuliaFormatter.jl)" begin