More metadata for FileDFG and restore as saved #1038

Affie · 2023-08-18T07:42:04Z

No description provided.

fast forward

github-actions · 2023-08-18T07:44:11Z

src/DataBlobs/services/BlobEntry.jl

+function getBlobEntryFirst(var::Variable, key::Regex)   
+    firstIdx = findfirst(x->contains(string(x.label), key), var.blobEntries)
+    if isnothing(firstIdx)
+        throw(KeyError("$key"))
+    end
+    return var.blobEntries[firstIdx]


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

function getBlobEntryFirst(var::Variable, key::Regex)

firstIdx = findfirst(x->contains(string(x.label), key), var.blobEntries)

if isnothing(firstIdx)

throw(KeyError("$key"))

end

return var.blobEntries[firstIdx]

function getBlobEntryFirst(var::Variable, key::Regex)

firstIdx = findfirst(x -> contains(string(x.label), key), var.blobEntries)

if isnothing(firstIdx)

throw(KeyError("$key"))

end

return var.blobEntries[firstIdx]

github-actions · 2023-08-18T07:44:11Z

src/DataBlobs/services/BlobEntry.jl

+    end
+    return var.blobEntries[firstIdx]
+end
+
 getBlobEntry(var::AbstractDFGVariable, key::AbstractString) = getBlobEntry(var,Regex(key))


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

getBlobEntry(var::AbstractDFGVariable, key::AbstractString) = getBlobEntry(var,Regex(key))

getBlobEntry(var::AbstractDFGVariable, key::AbstractString) = getBlobEntry(var, Regex(key))

github-actions · 2023-08-18T07:44:12Z

src/FileDFG/services/FileDFG.jl

    varFiles = sort(readdir(varFolder; sort=false); lt=natural_lt)
    factorFiles = sort(readdir(factorFolder; sort=false); lt=natural_lt)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

varFiles = sort(readdir(varFolder; sort=false); lt=natural_lt)

factorFiles = sort(readdir(factorFolder; sort=false); lt=natural_lt)

varFiles = sort(readdir(varFolder; sort = false); lt = natural_lt)

factorFiles = sort(readdir(factorFolder; sort = false); lt = natural_lt)

github-actions · 2023-08-18T07:44:12Z

src/FileDFG/services/FileDFG.jl

+    if isa(dfgLoadInto, GraphsDFG) && GraphsDFGs._variablestype(dfgLoadInto) == Variable
+        variables = @showprogress 1 "loading variables" map(varFiles) do varFile
+            jstr = read("$varFolder/$varFile", String)
+            return JSON3.read(jstr, PackedVariable)
+        end
+    else
+        variables = DFGVariable[]
+        @showprogress 1 "loading variables" for varFile in varFiles
+            jstr = read("$varFolder/$varFile", String)
+            try
+                packedData = JSON3.read(jstr, PackedVariable)
+                push!(variables, unpackVariable(packedData))
+            catch ex
+                @error("JSON3 is having trouble reading $varFolder/$varFile into a PackedVariable")
+                @show jstr
+                throw(ex)
+            end
        end


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

if isa(dfgLoadInto, GraphsDFG) && GraphsDFGs._variablestype(dfgLoadInto) == Variable

variables = @showprogress 1 "loading variables" map(varFiles) do varFile

jstr = read("$varFolder/$varFile", String)

return JSON3.read(jstr, PackedVariable)

end

else

variables = DFGVariable[]

@showprogress 1 "loading variables" for varFile in varFiles

jstr = read("$varFolder/$varFile", String)

try

packedData = JSON3.read(jstr, PackedVariable)

push!(variables, unpackVariable(packedData))

catch ex

@error("JSON3 is having trouble reading $varFolder/$varFile into a PackedVariable")

@show jstr

throw(ex)

end

end

if isa(dfgLoadInto, GraphsDFG) && GraphsDFGs._variablestype(dfgLoadInto) == Variable

variables = @showprogress 1 "loading variables" map(varFiles) do varFile

jstr = read("$varFolder/$varFile", String)

return JSON3.read(jstr, PackedVariable)

end

else

variables = DFGVariable[]

@showprogress 1 "loading variables" for varFile in varFiles

jstr = read("$varFolder/$varFile", String)

try

packedData = JSON3.read(jstr, PackedVariable)

push!(variables, unpackVariable(packedData))

catch ex

@error("JSON3 is having trouble reading $varFolder/$varFile into a PackedVariable")

@show jstr

throw(ex)

end

github-actions · 2023-08-18T07:44:12Z

src/FileDFG/services/FileDFG.jl

        end
    end
-    @info "Loaded $(length(variables)) variables - $(map(v->v.label, variables))"
+


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

end

github-actions · 2023-08-18T07:44:13Z

src/GraphsDFG/services/GraphsDFGSerialization.jl

    commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))
+
+    #FIXME Deprecate remove in DFG v0.24
+    setdiff!(commonfields, [:blobStores])
+    blobStores = Dict{Symbol, AbstractBlobStore}()
+    !isnothing(packed.blobStores) && merge!(blobStores, packed.blobStores)
+
    props = (k => getproperty(packed, k) for k in commonfields)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))

#FIXME Deprecate remove in DFG v0.24

setdiff!(commonfields, [:blobStores])

blobStores = Dict{Symbol, AbstractBlobStore}()

!isnothing(packed.blobStores) && merge!(blobStores, packed.blobStores)

props = (k => getproperty(packed, k) for k in commonfields)

commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))

#FIXME Deprecate remove in DFG v0.24

setdiff!(commonfields, [:blobStores])

blobStores = Dict{Symbol, AbstractBlobStore}()

!isnothing(packed.blobStores) && merge!(blobStores, packed.blobStores)

github-actions · 2023-08-18T07:44:13Z

src/GraphsDFG/services/GraphsDFGSerialization.jl

+    VT = isnothing(packed.typePackedVariable) || !packed.typePackedVariable ? DFGVariable : Variable
+    FT = isnothing(packed.typePackedFactor) || !packed.typePackedFactor ? DFGFactor : PackedFactor
+    # VT = isnothing(packed.typePackedVariable) || packed.typePackedVariable ? Variable : DFGVariable 
+    # FT = isnothing(packed.typePackedFactor) || packed.typePackedFactor ? PackedFactor : DFGFactor
+    GraphsDFG{typeof(packed.solverParams), VT, FT}(;blobStores, props...)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

VT = isnothing(packed.typePackedVariable) || !packed.typePackedVariable ? DFGVariable : Variable

FT = isnothing(packed.typePackedFactor) || !packed.typePackedFactor ? DFGFactor : PackedFactor

# VT = isnothing(packed.typePackedVariable) || packed.typePackedVariable ? Variable : DFGVariable

# FT = isnothing(packed.typePackedFactor) || packed.typePackedFactor ? PackedFactor : DFGFactor

GraphsDFG{typeof(packed.solverParams), VT, FT}(;blobStores, props...)

props = (k => getproperty(packed, k) for k in commonfields)

VT = if isnothing(packed.typePackedVariable) || !packed.typePackedVariable

DFGVariable

else

Variable

end

FT = if isnothing(packed.typePackedFactor) || !packed.typePackedFactor

DFGFactor

else

PackedFactor

end

# VT = isnothing(packed.typePackedVariable) || packed.typePackedVariable ? Variable : DFGVariable

# FT = isnothing(packed.typePackedFactor) || packed.typePackedFactor ? PackedFactor : DFGFactor

return GraphsDFG{typeof(packed.solverParams), VT, FT}(; blobStores, props...)

github-actions · 2023-08-18T07:44:13Z

src/GraphsDFG/services/GraphsDFGSerialization.jl

+    FT = isnothing(packed.typePackedFactor) || !packed.typePackedFactor ? DFGFactor : PackedFactor
+    # VT = isnothing(packed.typePackedVariable) || packed.typePackedVariable ? Variable : DFGVariable 
+    # FT = isnothing(packed.typePackedFactor) || packed.typePackedFactor ? PackedFactor : DFGFactor
+    GraphsDFG{typeof(packed.solverParams), VT, FT}(;blobStores, props...)
 end

 function unpackDFGMetadata!(dfg::GraphsDFG, packed::PackedGraphsDFG)
    commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))

commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))

github-actions · 2023-08-18T07:44:13Z

src/GraphsDFG/services/GraphsDFGSerialization.jl

+    #FIXME Deprecate remove Nothing union in DFG v0.24
+    setdiff!(commonfields, [:blobStores])
+    !isnothing(packed.blobStores) && merge!(dfg.blobStores, packed.blobStores)


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

#FIXME Deprecate remove Nothing union in DFG v0.24

setdiff!(commonfields, [:blobStores])

!isnothing(packed.blobStores) && merge!(dfg.blobStores, packed.blobStores)

#FIXME Deprecate remove Nothing union in DFG v0.24

setdiff!(commonfields, [:blobStores])

!isnothing(packed.blobStores) && merge!(dfg.blobStores, packed.blobStores)

github-actions · 2023-08-18T07:44:13Z

src/services/Serialization.jl

+function packVariable(v::Variable; includePPEs::Bool=true, includeSolveData::Bool=true, includeDataEntries::Bool=true)
+    return v


[JuliaFormatter] _{reported by reviewdog 🐶}

Suggested change

function packVariable(v::Variable; includePPEs::Bool=true, includeSolveData::Bool=true, includeDataEntries::Bool=true)

return v

function packVariable(

v::Variable;

includePPEs::Bool = true,

includeSolveData::Bool = true,

includeDataEntries::Bool = true,

)

return v

codecov · 2023-08-18T07:51:00Z

Codecov Report

Merging #1038 (e57eac3) into master (17f63da) will decrease coverage by 0.15%.
Report is 4 commits behind head on master.
The diff coverage is 47.45%.

@@            Coverage Diff             @@
##           master    #1038      +/-   ##
==========================================
- Coverage   78.09%   77.94%   -0.15%     
==========================================
  Files          26       26              
  Lines        2524     2181     -343     
==========================================
- Hits         1971     1700     -271     
+ Misses        553      481      -72

Files Changed	Coverage Δ
src/DataBlobs/services/BlobEntry.jl	`50.98% <0.00%> (-4.63%)`	⬇️
src/DistributedFactorGraphs.jl	`100.00% <ø> (ø)`
src/GraphsDFG/entities/GraphsDFG.jl	`100.00% <ø> (ø)`
src/GraphsDFG/services/GraphsDFG.jl	`71.23% <0.00%> (-1.52%)`	⬇️
src/services/AbstractDFG.jl	`83.29% <ø> (-0.20%)`	⬇️
src/services/DFGFactor.jl	`73.07% <0.00%> (-7.57%)`	⬇️
src/services/DFGVariable.jl	`85.06% <0.00%> (-0.27%)`	⬇️
src/services/Serialization.jl	`70.62% <20.00%> (-3.24%)`	⬇️
src/GraphsDFG/services/GraphsDFGSerialization.jl	`72.72% <57.14%> (-6.00%)`	⬇️
src/FileDFG/services/FileDFG.jl	`77.69% <67.85%> (-0.23%)`	⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Affie and others added 5 commits August 2, 2023 14:49

More metadata support for file dfg

6257e6b

Restore nothing to full default

fb029fd

Merge branch 'master' into 23Q3/enh/packed_filedfg

8bfd648

getBlobEntryFirst for Variable

9b5aba8

Merge pull request #1034 from JuliaRobotics/master

e57eac3

fast forward

github-actions bot reviewed Aug 18, 2023

View reviewed changes

Affie merged commit c0f1719 into master Aug 18, 2023
3 of 6 checks passed

Affie added the FileDFG label Aug 18, 2023

Affie added this to the v0.23.2 milestone Aug 18, 2023

Affie deleted the 23Q3/enh/packed_filedfg branch October 30, 2024 13:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More metadata for FileDFG and restore as saved #1038

More metadata for FileDFG and restore as saved #1038

Affie commented Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

github-actions bot Aug 18, 2023

codecov bot commented Aug 18, 2023 •

edited

Loading

	getBlobEntry(var::AbstractDFGVariable, key::AbstractString) = getBlobEntry(var,Regex(key))
	getBlobEntry(var::AbstractDFGVariable, key::AbstractString) = getBlobEntry(var, Regex(key))

		varFiles = sort(readdir(varFolder; sort=false); lt=natural_lt)
		factorFiles = sort(readdir(factorFolder; sort=false); lt=natural_lt)

	commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))
	commonfields = intersect(fieldnames(GraphsDFG), fieldnames(PackedGraphsDFG))

		function packVariable(v::Variable; includePPEs::Bool=true, includeSolveData::Bool=true, includeDataEntries::Bool=true)
		return v

More metadata for FileDFG and restore as saved #1038

More metadata for FileDFG and restore as saved #1038

Conversation

Affie commented Aug 18, 2023

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

github-actions bot Aug 18, 2023

Choose a reason for hiding this comment

codecov bot commented Aug 18, 2023 • edited Loading

Codecov Report

codecov bot commented Aug 18, 2023 •

edited

Loading