Definitions completed

Author: GearsAD

REQUIRE

@@ -7,3 +7,4 @@ JSON2
 Graphs
 # Caesar/IIF specific imports
 Distributions
+Dates

src/services/GraphsDFG.jl

@@ -22,9 +22,9 @@ import Graphs: attributes, vertex_index
 function attributes(v::GraphsNode, g::T)::AttributeDict where T <:GenericIncidenceList
     AttributeDict(
         "label" => v.dfgNode.label,
-        "color" => typeof(v.dfgNode) == DFGVariable ? "red" : "blue",
-        "shape" => typeof(v.dfgNode) == DFGVariable ? "box" : "ellipse",
-        "fillcolor" => typeof(v.dfgNode) == DFGVariable ? "red" : "blue"
+        "color" => v.dfgNode isa DFGVariable ? "red" : "blue",
+        "shape" => v.dfgNode isa DFGVariable ? "box" : "ellipse",
+        "fillcolor" => v.dfgNode isa DFGVariable ? "red" : "blue"
         )
 end
 
@@ -226,7 +226,7 @@ List the DFGVariables in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the variables.
 """
 function ls(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{DFGVariable}
-    variables = map(v -> v.dfgNode, filter(n -> typeof(n.dfgNode) == DFGVariable, collect(values(dfg.g.vertices))))
+    variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, vertices(dfg.g)))
     if regexFilter != nothing
         variables = filter(v -> occursin(regexFilter, String(v.label)), variables)
     end
@@ -247,7 +247,7 @@ List the DFGFactors in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the factors.
 """
 function lsf(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{DFGFactor}
-    factors = map(v -> v.dfgNode, filter(n -> typeof(n.dfgNode) == DFGFactor, collect(values(dfg.g.vertices))))
+    factors = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGFactor, vertices(dfg.g)))
     if regexFilter != nothing
         factors = filter(f -> occursin(regexFilter, String(f.label)), factors)
     end
@@ -321,8 +321,8 @@ end
 function _copyIntoGraph!(sourceDFG::GraphsDFG, destDFG::GraphsDFG, variableFactorLabels::Vector{Symbol}, includeOrphanFactors::Bool=false)::Nothing
     # Split into variables and factors
     verts = map(id -> sourceDFG.g.vertices[sourceDFG.labelDict[id]], variableFactorLabels)
-    sourceVariables = filter(n -> typeof(n.dfgNode) == DFGVariable, verts)
-    sourceFactors = filter(n -> typeof(n.dfgNode) == DFGFactor, verts)
+    sourceVariables = filter(n -> n.dfgNode isa DFGVariable, verts)
+    sourceFactors = filter(n -> n.dfgNode isa DFGFactor, verts)
 
     # Now we have to add all variables first,
     for variable in sourceVariables

test/interfaceTests.jl

@@ -8,7 +8,7 @@ f1 = DFGFactor{Int, :Symbol}(:f1)
     @test_throws Exception addVariable!(dfg, v1)
     addVariable!(dfg, v2)
     addFactor!(dfg, [v1, v2], f1)
-    @test_throws Exception addFactor!(dfg, DFGFactor("f2"), [v1, DFGVariable("Nope")])
+    @test_throws Exception addFactor!(dfg, DFGFactor{Int, :Symbol}("f2"), [v1, DFGVariable("Nope")])
 end
 
 @testset "Listing Nodes" begin
@@ -71,7 +71,7 @@ numNodes = 10
 dfg = testDFGAPI()
 verts = map(n -> DFGVariable(Symbol("x$n")), 1:numNodes)
 map(v -> addVariable!(dfg, v), verts)
-map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
+map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{Int, :Symbol}(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
 # map(n -> addFactor!(dfg, [verts[n], verts[n+2]], DFGFactor(Symbol("x$(n)x$(n+2)f2"))), 1:2:(numNodes-2))
 
 @testset "Getting Neighbors" begin