Simpler toDot tests

So all produce the same output and it is easier to verify.
Removed todot from plottingTest.jl

Author: Affie

Project.toml

@@ -29,6 +29,7 @@ julia = "0.7, 1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
 
 [targets]
-test = ["Test"]
+test = ["Test", "GraphPlot"]

src/MetaGraphsDFG/services/MetaGraphsDFG.jl

@@ -533,11 +533,12 @@ function getAdjacencyMatrixSparse(dfg::MetaGraphsDFG)::Tuple{LightGraphs.SparseM
 	return adjvf, v_labels, f_labels
 end
 
+#FIXME remove _ when issue #86 is resolved, for now force dispach to generic toDot
 """
     $(SIGNATURES)
 Produces a dot-format of the graph for visualization.
 """
-function toDot(dfg::MetaGraphsDFG)::String
+function _toDot(dfg::MetaGraphsDFG)::String
 	@error "toDot(dfg::MetaGraphsDFG) is not sopported yet, see https://github.com/JuliaGraphs/MetaGraphs.jl/issues/86"
     m = PipeBuffer()
     MetaGraphs.savedot(m, dfg.g)
@@ -556,7 +557,7 @@ Note
 - Can be viewed with the `xdot` system application.
 - Based on graphviz.org
 """
-function toDotFile(dfg::MetaGraphsDFG, fileName::String="/tmp/dfg.dot")::Nothing
+function _toDotFile(dfg::MetaGraphsDFG, fileName::String="/tmp/dfg.dot")::Nothing
 	@error "toDotFile(dfg::MetaGraphsDFG,filename) is not supported yet, see https://github.com/JuliaGraphs/MetaGraphs.jl/issues/86"
     open(fileName, "w") do fid
         MetaGraphs.savedot(fid, dfg.g)

test/interfaceTests.jl

@@ -285,14 +285,17 @@ end
 end
 
 @testset "Producing Dot Files" begin
-    if testDFGAPI != GraphsDFG
-        @warn "Skipping non Graphs.jl toDot functions"
-        @test_skip 1==0#toDot(dfg)
-        @test_skip 1==0#toDotFile(dfg, "something.dot")
-    else
-        @test toDot(dfg) == "graph graphname {\n18 [\"label\"=\"x8x9f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n2 [\"label\"=\"x2\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n2 -- 11\n2 -- 12\n16 [\"label\"=\"x6x7f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n11 [\"label\"=\"x1x2f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n7 [\"label\"=\"x7\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n7 -- 16\n7 -- 17\n9 [\"label\"=\"x9\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n9 -- 18\n9 -- 19\n10 [\"label\"=\"x10\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n10 -- 19\n19 [\"label\"=\"x9x10f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n17 [\"label\"=\"x7x8f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n8 [\"label\"=\"x8\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n8 -- 17\n8 -- 18\n6 [\"label\"=\"x6\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n6 -- 15\n6 -- 16\n4 [\"label\"=\"x4\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n4 -- 13\n4 -- 14\n3 [\"label\"=\"x3\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n3 -- 12\n3 -- 13\n5 [\"label\"=\"x5\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n5 -- 14\n5 -- 15\n13 [\"label\"=\"x3x4f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n14 [\"label\"=\"x4x5f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n15 [\"label\"=\"x5x6f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n12 [\"label\"=\"x2x3f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n1 [\"label\"=\"x1\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n1 -- 11\n}\n"
+    # create a simpler graph for dot testing
+    dotdfg = testDFGAPI{NoSolverParams}()
+    v1 = DFGVariable(:a)
+    v2 = DFGVariable(:b)
+    f1 = DFGFactor{Int, :Symbol}(:f1)
+    addVariable!(dotdfg, v1)
+    addVariable!(dotdfg, v2)
+    addFactor!(dotdfg, [v1, v2], f1)
+
+    @test toDot(dotdfg) == "graph graphname {\n2 [\"label\"=\"b\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n2 -- 3\n3 [\"label\"=\"f1\",\"shape\"=\"ellipse\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n1 [\"label\"=\"a\",\"shape\"=\"box\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n1 -- 3\n}\n"
+    @test toDotFile(dotdfg, "something.dot") == nothing
+    Base.rm("something.dot")
 
-        @test toDotFile(dfg, "something.dot") == nothing
-        Base.rm("something.dot")
-    end
 end

test/plottingTest.jl

@@ -1,22 +1,15 @@
-# using GraphPlot
+using GraphPlot
 using DistributedFactorGraphs
-using DistributedFactorGraphs.DFGPlots
+# using DistributedFactorGraphs.DFGPlots
 using Test
 
 # Now make a complex graph for connectivity tests
 numNodes = 10
 dfg = GraphsDFG{NoSolverParams}()
 verts = map(n -> DFGVariable(Symbol("x$n")), 1:numNodes)
-#change ready and backendset for x7,x8 for improved tests on x7x8f1
-verts[7].ready = 1
-verts[8].backendset = 1
 map(v -> addVariable!(dfg, v), verts)
 map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{Int, :Symbol}(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
 
-# Using toDot
-dot = toDot(dfg)
-@test dot != nothing
-
-# Using GraphViz plotting
+# Using GraphPlot plotting
 plot = dfgplot(dfg)
 @test plot != nothing