param factorID

Author: wouterwln

src/graph_engine.jl

@@ -191,16 +191,16 @@ NodeBehaviour(backend, fform) = error("Backend $backend must implement a method
 
 A unique identifier for a factor node in a probabilistic graphical model.
 """
-mutable struct FactorID
-    const fform::Any
+mutable struct FactorID{F}
+    const fform::F
     const index::Int64
 end
 
 fform(id::FactorID) = id.fform
 index(id::FactorID) = id.index
 
 Base.show(io::IO, id::FactorID) = print(io, "(", fform(id), ", ", index(id), ")")
-Base.:(==)(id1::FactorID, id2::FactorID) = id1.fform == id2.fform && id1.index == id2.index
+Base.:(==)(id1::FactorID{F}, id2::FactorID{T}) where {F, T} = id1.fform == id2.fform && id1.index == id2.index
 Base.hash(id::FactorID, h::UInt) = hash(id.fform, hash(id.index, h))
 
 """
@@ -258,7 +258,8 @@ getname(labels::ResizableArray{T, V, N} where {T <: NodeLabel, V, N}) = getname(
 iterate(label::NodeLabel) = (label, nothing)
 iterate(label::NodeLabel, any) = nothing
 
-to_symbol(label::NodeLabel) = Symbol(String(label.name) * "_" * string(label.global_counter))
+to_symbol(label::NodeLabel) = to_symbol(label.name, label.global_counter)
+to_symbol(name::D, index::Int) where {D} = Symbol(String(name) * "_" * string(index))
 
 Base.show(io::IO, label::NodeLabel) = print(io, label.name, "_", label.global_counter)
 Base.:(==)(label1::NodeLabel, label2::NodeLabel) = label1.name == label2.name && label1.global_counter == label2.global_counter
@@ -1481,7 +1482,7 @@ end
 
 function add_constant_node!(model::Model, context::Context, options::NodeCreationOptions, name::Symbol, index)
     label = __add_variable_node!(model, context, options, name, index)
-    context[Symbol(String(name) * "_" * string(label.global_counter)), index] = label
+    context[to_symbol(name, label.global_counter), index] = label   # to_symbol(label) is type unstable and we know the type of label.name here from name
     return label
 end