Skip to content

Commit bc0e0a0

Browse files
authored
Merge pull request #143 from JuliaRobotics/feature/IIFTest2
Some fixes and running tests
2 parents 274f156 + 705d88e commit bc0e0a0

File tree

4 files changed

+329
-279
lines changed

4 files changed

+329
-279
lines changed

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ MetaGraphs = "≥ 0.6.4"
2525
Reexport = "≥ 0.2"
2626
Requires = "≥ 0.5"
2727
julia = "0.7, 1"
28+
IncrementalInference = "0.7.7"
2829

2930
[extras]
3031
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Add a DFGFactor to a DFG.
190190
"""
191191
function addFactor!(dfg::CloudGraphsDFG, variables::Vector{DFGVariable}, factor::DFGFactor)::Bool
192192
if exists(dfg, factor)
193-
error("Factor '$(variable.label)' already exists in the factor graph")
193+
error("Factor '$(factor.label)' already exists in the factor graph")
194194
end
195195

196196
# Update the variable ordering
@@ -653,10 +653,10 @@ function getNeighbors(dfg::CloudGraphsDFG, node::T; ready::Union{Nothing, Int}=n
653653
query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))--(node) where node:VARIABLE or node:FACTOR "
654654
if ready != nothing || backendset != nothing
655655
if ready != nothing
656-
query = query + "and node.ready = $(ready)"
656+
query = query * "and node.ready = $(ready)"
657657
end
658658
if backendset != nothing
659-
query = query + "and node.backendset = $(backendset)"
659+
query = query * "and node.backendset = $(backendset)"
660660
end
661661
end
662662
neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)
@@ -675,10 +675,10 @@ function getNeighbors(dfg::CloudGraphsDFG, label::Symbol; ready::Union{Nothing,
675675
query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(label))--(node) where node:VARIABLE or node:FACTOR "
676676
if ready != nothing || backendset != nothing
677677
if ready != nothing
678-
query = query + "and node.ready = $(ready)"
678+
query = query * "and node.ready = $(ready)"
679679
end
680680
if backendset != nothing
681-
query = query + "and node.backendset = $(backendset)"
681+
query = query * "and node.backendset = $(backendset)"
682682
end
683683
end
684684
neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)

0 commit comments

Comments
 (0)