Skip to content

Commit d968695

Browse files
authored
Merge pull request #744 from JuliaRobotics/21Q1/up/printing
better print variable
2 parents bd293d8 + 0833640 commit d968695

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- neo4j
1212

1313
julia:
14-
- 1.5
14+
- 1.6
1515
- nightly
1616

1717
env:
@@ -26,16 +26,17 @@ branches:
2626

2727
jobs:
2828
include:
29-
- julia: 1.4
29+
- julia: 1.6
3030
env:
3131
- IIF_TEST=true
3232
- DO_CGDFG_TESTS=true
33+
- DFG_USE_CGDFG=true
3334
if: NOT branch =~ /(^v\d+\.\d+(\.\d+)?([-+]\S*)?$)|(^release.*$)/
3435
- arch: arm64
3536
env: DO_CGDFG_TESTS=false
3637
before_script:
3738
- stage: "Documentation"
38-
julia: 1.4
39+
julia: 1.6
3940
os: linux
4041
script:
4142
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'

src/services/CustomPrinting.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ function printVariable( io::IO, vert::DFGVariable;
2020
# printstyled(ioc, summary(vert),"\n", bold=true)
2121

2222
vnd = getSolverData(vert)
23-
println(ioc, " timestamp: ", vert.timestamp)
24-
println(ioc, " label: ", vert.label)
25-
println(ioc, " solvable: ", getSolvable(vert))
23+
println(ioc, " timestamp: ", vert.timestamp)
24+
println(ioc, " label: ", vert.label)
25+
println(ioc, " solvable: ", getSolvable(vert))
26+
println(ioc, " initilized: ", isInitialized(vert))
2627
println(ioc, " tags: ", getTags(vert))
2728
try
2829
println(ioc, " manifold: ", getManifolds(vert))

test/data/0_12_0.tar.gz

1.58 KB
Binary file not shown.
File renamed without changes.

test/fileDFGTests.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
using DistributedFactorGraphs
22
using IncrementalInference
33
using Test
4+
using TimeZones
5+
6+
##
47

58
@testset "FileDFG Tests" begin
69
for filename in ["/tmp/fileDFG", "/tmp/FileDFGExtension.tar.gz"]
@@ -83,6 +86,8 @@ using Test
8386
end
8487
end
8588

89+
##
90+
8691
@testset "FileDFG Regression Tests" begin
8792
@info "If any of these tests fail, we have breaking changes"
8893
for file in filter(f -> endswith(f, ".tar.gz"), readdir(joinpath(@__DIR__, "data")))
@@ -96,3 +101,5 @@ end
96101
@test issetequal(lsf(retDFG), [:x3x4f1, :x4x5f1, :x1x2f1, :x2x3f1])
97102
end
98103
end
104+
105+
##

test/iifInterfaceTests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ end
2929
todotc = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box];\na -- abf1\nb -- abf1\n}\n"
3030
todotd = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box];\nb -- abf1\na -- abf1\n}\n"
3131
todote = todotstr == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box, fontsize=8, fixedsize=false, height=0.1, width=0.1];\na -- abf1\nb -- abf1\n}\n"
32+
@show todota, todotb, todotc, todotd, todote
3233
@test (todota || todotb || todotc || todotd || todote)
3334
@test toDotFile(dfg, "something.dot") === nothing
3435
Base.rm("something.dot")

0 commit comments

Comments
 (0)