Merge pull request #723 from JuliaRobotics/21Q1/maint/general

general maintenance
JuliaRobotics · Jan 7, 2021 · b2ae67e · b2ae67e
2 parents ffcd9ca + 3781bf5
commit b2ae67e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.11.2"
+version = "0.11.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

diff --git a/src/LightDFG/services/LightDFG.jl b/src/LightDFG/services/LightDFG.jl
@@ -336,7 +336,7 @@ function savedot_attributes(io::IO, dfg::LightDFG)
         write(io, "$vl [color=red, shape=ellipse];\n")
     end
     for fl in listFactors(dfg)
-        write(io, "$fl [color=blue, shape=box];\n")
+        write(io, "$fl [color=blue, shape=box, fontsize=8, fixedsize=false, height=0.1, width=0.1];\n")
     end
 
     for e in edges(dfg.g)

diff --git a/src/entities/DFGFactor.jl b/src/entities/DFGFactor.jl
@@ -31,8 +31,8 @@ Notes
 Designing (WIP)
 - T <: Union{FactorOperationalMemory, PackedInferenceType}
 - in IIF.CCW{T <: DFG.FunctorInferenceType}
-- in DFG.AbstractRelativeFactorMinimize <: FunctorInferenceType
-- in Main.SomeFactor <: AbstractRelativeFactorMinimize
+- in DFG.AbstractRelativeMinimize <: FunctorInferenceType
+- in Main.SomeFactor <: AbstractRelativeMinimize
 """
 mutable struct GenericFunctionNodeData{T<:Union{PackedInferenceType, FunctorInferenceType, FactorOperationalMemory}}
     eliminated::Bool

diff --git a/test/iifCompareTests.jl b/test/iifCompareTests.jl
@@ -56,7 +56,7 @@ using Test
     # fg2 has been solved, so it should fail on the estimate dictionary
     @test !compareSimilarVariables(fg, fg2, skipsamples=true, skip=Symbol[:initialized;:inferdim])
 
-    tree = resetBuildTree!(fg2)
+    tree = buildTreeReset!(fg2)
 
     @test compareSimilarFactors(fg, fg2, skipsamples=true, skipcompute=true)
 

diff --git a/test/testBlocks.jl b/test/testBlocks.jl
@@ -24,8 +24,8 @@ struct TestFunctorInferenceType1 <: AbstractRelative end
 struct TestFunctorInferenceType2 <: AbstractRelative end
 
 struct TestAbstractPrior <: AbstractPrior end
-struct TestAbstractRelativeFactor <: AbstractRelativeFactor end
-struct TestAbstractRelativeFactorMinimize <: AbstractRelativeFactorMinimize end
+struct TestAbstractRelativeFactor <: AbstractRelativeRoots end
+struct TestAbstractRelativeFactorMinimize <: AbstractRelativeMinimize end
 
 struct PackedTestFunctorInferenceType1 <: PackedInferenceType
     s::String