Changes from review and finish changing build -> getSubgraph (probably still wrong verbNoun)

Author: Affie

src/Deprecated.jl

@@ -436,7 +436,7 @@ end
 # - Orphaned factors (where the subgraph does not contain all the related variables) are not included.
 # Related:
 # - [`copyGraph!`](@ref)
-# - [`buildSubgraph`](@ref)
+# - [`getSubgraph`](@ref)
 # - [`listNeighborhood`](@ref)
 # - [`deepcopyGraph`](@ref)
 # """
@@ -455,7 +455,7 @@ NOTE: `copyGraphMetadata` is deprecated – use agent/graph Bloblets instead.
 Related:
 - [`deepcopyGraph`](@ref)
 - [`deepcopyGraph!`](@ref)
-- [`buildSubgraph`](@ref)
+- [`getSubgraph`](@ref)
 - [`listNeighborhood`](@ref)
 - [`mergeGraph!`](@ref)
 """
@@ -528,7 +528,7 @@ Copy nodes from one graph into another graph by making deepcopies.
 see [`copyGraph!`](@ref) for more detail.
 Related:
 - [`deepcopyGraph`](@ref)
-- [`buildSubgraph`](@ref)
+- [`getSubgraph`](@ref)
 - [`listNeighborhood`](@ref)
 - [`mergeGraph!`](@ref)
 """
@@ -556,7 +556,7 @@ Copy nodes from one graph into a new graph by making deepcopies.
 see [`copyGraph!`](@ref) for more detail.
 Related:
 - [`deepcopyGraph!`](@ref)
-- [`buildSubgraph`](@ref)
+- [`getSubgraph`](@ref)
 - [`listNeighborhood`](@ref)
 - [`mergeGraph!`](@ref)
 """

src/GraphsDFG/GraphsDFG.jl

@@ -56,7 +56,7 @@ import ...DistributedFactorGraphs:
     listNeighbors,
     getPaths,
     getPath,
-    buildSubgraph,
+    getSubgraph,
     getBiadjacencyMatrix,
     toDot,
     toDotFile,

src/GraphsDFG/services/GraphsDFG.jl

@@ -404,11 +404,11 @@ function getPaths(
     edgepath = Graphs.a_star(dfg.g, dfg.g.labels[from], dfg.g.labels[to], distmx, heuristic)
 
     if isempty(edgepath)
-        return @NamedTuple{path::Vector{Symbol}, dist::Int64}[]
+        return @NamedTuple{path::Vector{Symbol}, dist::T}[]
     end
 
     path = [dfg.g.labels[edgepath[1].src]]
-    dist = 0
+    dist = zero(T)
     for (; dst, src) in edgepath
         push!(path, dfg.g.labels[dst])
         dist += distmx[src, dst]
@@ -429,18 +429,26 @@ function getPaths(
     kwargs...,
 )
     # If the user provided restricted lists, build the subgraph automatically
-    active_dfg = if variableLabels === nothing && factorLabels === nothing
-        dfg
-    else
-        vlabels = something(variableLabels, listVariables(dfg))
-        flabels = something(factorLabels, listFactors(dfg))
-        labels = vcat(vlabels, flabels)
-        DFG.getSubgraph(
-            GraphsDFG{NoSolverParams, VariableSkeleton, FactorSkeleton},
-            dfg,
-            labels,
-        )
-    end
+    active_dfg =
+        if isa(dfg, GraphsDFG) && isnothing(variableLabels) && isnothing(factorLabels)
+            dfg
+        else
+            vlabels = something(variableLabels, listVariables(dfg))
+            flabels = something(factorLabels, listFactors(dfg))
+            labels = vcat(vlabels, flabels)
+            DFG.getSubgraph(
+                GraphsDFG{NoSolverParams, VariableSkeleton, FactorSkeleton},
+                dfg,
+                labels,
+            )
+        end
+    !hasVariable(active_dfg, from) &&
+        !hasFactor(active_dfg, from) &&
+        throw(DFG.LabelNotFoundError(from))
+    !hasVariable(active_dfg, to) &&
+        !hasFactor(active_dfg, to) &&
+        throw(DFG.LabelNotFoundError(to))
+
     return getPaths(algorithm, active_dfg, from, to, k; kwargs...)
 end
 

src/services/AbstractDFG.jl

@@ -565,7 +565,7 @@ function getSubgraph(
     if !isnothing(solvable)
         Base.depwarn(
             "solvable kwarg is deprecated, use kwarg `solvableFilter = (>=solvable)` instead", #v0.29
-            :buildSubgraph,
+            :getSubgraph,
         )
         !isnothing(solvableFilter) &&
             error("Cannot use both solvable and solvableFilter kwargs.")

test/iifCompareTests.jl

@@ -107,7 +107,7 @@ end
     addVariable!(fg, :l1, ContinuousScalar)
     addFactor!(fg, [:x1; :l1], LinearRelative(Rayleigh()))
 
-    sfg = buildSubgraph(GraphsDFG, fg, [:x0; :x1])
+    sfg = getSubgraph(GraphsDFG, fg, [:x0; :x1])
 
     @warn "FIXME This is NOT supposed to pass"
     @test_skip compareFactorGraphs(fg, sfg, skip = [:labelDict; :addHistory; :logpath])

test/testBlocks.jl

@@ -1518,47 +1518,47 @@ function BuildingSubgraphs(testDFGAPI; VARTYPE = VariableDFG, FACTYPE = FactorDF
     # "Getting Subgraphs"
     dfg, verts, facs = connectivityTestGraph(testDFGAPI, VARTYPE, FACTYPE)
     # Subgraphs
-    dfgSubgraph = buildSubgraph(testDFGAPI, dfg, [verts[1].label], 2)
+    dfgSubgraph = getSubgraph(testDFGAPI, dfg, [verts[1].label], 2)
     # Only returns x1 and x2
     @test issetequal([:x1, :x1x2f1, :x2], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
     #
-    dfgSubgraph = buildSubgraph(testDFGAPI, dfg, [:x1, :x2, :x1x2f1])
+    dfgSubgraph = getSubgraph(testDFGAPI, dfg, [:x1, :x2, :x1x2f1])
     # Only returns x1 and x2
     @test issetequal([:x1, :x1x2f1, :x2], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
 
-    dfgSubgraph = buildSubgraph(testDFGAPI, dfg, [:x1x2f1], 1)
+    dfgSubgraph = getSubgraph(testDFGAPI, dfg, [:x1x2f1], 1)
     # Only returns x1 and x2
     @test issetequal([:x1, :x1x2f1, :x2], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
 
     #TODO if not a GraphsDFG with and summary or skeleton
     if VARTYPE == VariableDFG
-        dfgSubgraph = buildSubgraph(testDFGAPI, dfg, [:x8], 2; solvableFilter = >=(1))
+        dfgSubgraph = getSubgraph(testDFGAPI, dfg, [:x8], 2; solvableFilter = >=(1))
         @test issetequal([:x7], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
         #end if not a GraphsDFG with and summary or skeleton
     end
     # DFG issue #95 - confirming that getSubgraphAroundNode retains order
     # REF: https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/issues/95
     for fId in listVariables(dfg)
         # Get a subgraph of this and it's related factors+variables
-        dfgSubgraph = buildSubgraph(testDFGAPI, dfg, [fId], 2)
+        dfgSubgraph = getSubgraph(testDFGAPI, dfg, [fId], 2)
         # For each factor check that the order the copied graph == original
         for fact in getFactors(dfgSubgraph)
             @test fact.variableorder == getFactor(dfg, fact.label).variableorder
         end
     end
 
-    #TODO buildSubgraph default constructors for skeleton and summary
+    #TODO getSubgraph default constructors for skeleton and summary
     if VARTYPE == VariableDFG
-        dfgSubgraph = buildSubgraph(dfg, [:x1, :x2, :x1x2f1])
+        dfgSubgraph = getSubgraph(dfg, [:x1, :x2, :x1x2f1])
         @test issetequal([:x1, :x1x2f1, :x2], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
 
-        dfgSubgraph = buildSubgraph(dfg, [:x2, :x3], 2)
+        dfgSubgraph = getSubgraph(dfg, [:x2, :x3], 2)
         @test issetequal(
             [:x2, :x3, :x1, :x4, :x3x4f1, :x1x2f1, :x2x3f1],
             [ls(dfgSubgraph)..., lsf(dfgSubgraph)...],
         )
 
-        dfgSubgraph = buildSubgraph(dfg, [:x1x2f1], 1)
+        dfgSubgraph = getSubgraph(dfg, [:x1x2f1], 1)
         @test issetequal([:x1, :x1x2f1, :x2], [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])
     end
 end
@@ -1893,14 +1893,14 @@ function PathFindingTests(testDFGAPI)
 
     # --- Restrict with factorLabels only (all variables kept) ---
     # Only allow the first 4 factors, path x1→x5 should still work
-    facs_first4 = listFactors(dfg; labelFilter = contains(r"x[1-4]"))
+    facs_first4 = listFactors(dfg; labelFilter = contains(r"x[1-4](?!\d)"))
     result_fac = getPath(dfg, :x1, :x5; factorLabels = facs_first4)
     @test first(result_fac.path) == :x1
     @test last(result_fac.path) == :x5
 
     # --- Restrict with both variableLabels and factorLabels ---
     vars_1to5 = listVariables(dfg; typeFilter = ==(TestVariableType1()))
-    facs_1to4 = listFactors(dfg; labelFilter = contains(r"x[1-4]"))
+    facs_1to4 = listFactors(dfg; labelFilter = contains(r"x[1-4](?!\d)"))
     result_both =
         getPath(dfg, :x1, :x5; variableLabels = vars_1to5, factorLabels = facs_1to4)
     @test first(result_both.path) == :x1