Merge pull request #310 from ReactiveBayes/graphppl-lazylabels

Minor changes for GraphPPL 4.2.0

Author: bvdmitri

Project.toml

@@ -1,7 +1,7 @@
 name = "RxInfer"
 uuid = "86711068-29c9-4ff7-b620-ae75d7495b3d"
 authors = ["Bagaev Dmitry <d.v.bagaev@tue.nl> and contributors"]
-version = "3.2.0"
+version = "3.3.0"
 
 [deps]
 BayesBase = "b4ee3484-f114-42fe-b91c-797d54a0c67e"
@@ -28,7 +28,7 @@ Distributions = "0.25"
 DomainSets = "0.5.2, 0.6, 0.7"
 ExponentialFamily = "1.2"
 FastCholesky = "1.3.0"
-GraphPPL = "~4.1.0"
+GraphPPL = "~4.2.0"
 LinearAlgebra = "1.9"
 MacroTools = "0.5.6"
 Optim = "1.0.0"

codemeta.json

@@ -9,12 +9,12 @@
     "downloadUrl": "https://github.com/reactivebayes/RxInfer.jl/releases",
     "issueTracker": "https://github.com/reactivebayes/RxInfer.jl/issues",
     "name": "RxInfer.jl",
-    "version": "3.2.0",
+    "version": "3.3.0",
     "description": "Julia package for automated, scalable and efficient Bayesian inference on factor graphs with reactive message passing. ",
     "applicationCategory": "Statistics",
     "developmentStatus": "active",
     "readme": "https://reactivebayes.github.io/RxInfer.jl/stable/",
-    "softwareVersion": "3.2.0",
+    "softwareVersion": "3.3.0",
     "keywords": [
         "Bayesian inference",
         "message passing",

src/model/model.jl

@@ -139,15 +139,15 @@ function Base.show(io::IO, ::DeferredDataHandler)
     print(io, "[ deffered data ]")
 end
 
-# We use the `LazyIndex` to instantiate the data interface for the model, in case of `DeferredDataHandler`
+# We use the `datalabel` to instantiate the data interface for the model, in case of `DeferredDataHandler`
 # the data is not known at the time of the model creation
 function __infer_create_data_interface(model, context, key::Symbol, ::DeferredDataHandler)
-    return GraphPPL.getorcreate!(model, context, GraphPPL.NodeCreationOptions(kind = :data, factorized = true), key, GraphPPL.LazyIndex())
+    return GraphPPL.datalabel(model, context, GraphPPL.NodeCreationOptions(kind = :data, factorized = true), key, GraphPPL.MissingCollection())
 end
 
-# In all other cases we use the `LazyIndex` to instantiate the data interface for the model and the data is known at the time of the model creation
+# In all other cases we use the `datalabel` to instantiate the data interface for the model and the data is known at the time of the model creation
 function __infer_create_data_interface(model, context, key::Symbol, data)
-    return GraphPPL.getorcreate!(model, context, GraphPPL.NodeCreationOptions(kind = :data, factorized = true), key, GraphPPL.LazyIndex(data))
+    return GraphPPL.datalabel(model, context, GraphPPL.NodeCreationOptions(kind = :data, factorized = true), key, data)
 end
 
 merge_data_handlers(data::Dict, newdata::Dict) = merge(data, newdata)