Merge pull request #310 from JuliaRobotics/feature/20Q1/VNDCondition

Add event::Threads.Condition to VND

Author: dehann

.travis.yml

@@ -12,7 +12,7 @@ services:
     - neo4j
 
 julia:
-    - 1.0
+    - 1.2
     - 1.4
     - nightly
 

Project.toml

@@ -31,7 +31,7 @@ Neo4j = "2"
 Reexport = "0.2, 0.3, 0.4, 0.5, 1"
 Requires = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 1"
 Unmarshal = "0.3"
-julia = "0.7, 1"
+julia = "1.2"
 
 [extras]
 GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"

src/entities/DFGVariable.jl

@@ -32,8 +32,9 @@ mutable struct VariableNodeData{T<:InferenceVariable}
     dontmargin::Bool
     solveInProgress::Int
     solvedCount::Int
+    events::Dict{Symbol,Threads.Condition}
     VariableNodeData{T}() where {T <:InferenceVariable} =
-    new{T}(zeros(1,1), zeros(1,1), Symbol[], Int[], 0, false, :NOTHING, Symbol[], T(), false, 0.0, false, false, 0, 0)
+    new{T}(zeros(1,1), zeros(1,1), Symbol[], Int[], 0, false, :NOTHING, Symbol[], T(), false, 0.0, false, false, 0, 0, Dict{Symbol,Threads.Condition}())
     VariableNodeData{T}(val::Array{Float64,2},
                         bw::Array{Float64,2},
                         BayesNetOutVertIDs::Array{Symbol,1},
@@ -47,11 +48,12 @@ mutable struct VariableNodeData{T<:InferenceVariable}
                         ismargin::Bool,
                         dontmargin::Bool,
                         solveInProgress::Int=0,
-                        solvedCount::Int=0) where T <: InferenceVariable =
+                        solvedCount::Int=0,
+                        events::Dict{Symbol,Threads.Condition}=Dict{Symbol,Threads.Condition}()) where T <: InferenceVariable =
                             new{T}(val,bw,BayesNetOutVertIDs,dimIDs,dims,
                                    eliminated,BayesNetVertID,separator,
                                    softtype::T,initialized,inferdim,ismargin,
-                                   dontmargin, solveInProgress, solvedCount)
+                                   dontmargin, solveInProgress, solvedCount, events)
 end
 
 ##------------------------------------------------------------------------------