Skip to content
Snippets Groups Projects
Commit ae3cba0a authored by Mahmoud Bentriou's avatar Mahmoud Bentriou
Browse files

Changed Product() to product_distribution() because it was deprecated.

parent e754d4db
No related branches found
No related tags found
No related merge requests found
Pipeline #29046 failed
...@@ -10,11 +10,11 @@ import DelimitedFiles: readdlm, writedlm ...@@ -10,11 +10,11 @@ import DelimitedFiles: readdlm, writedlm
import Distributed: @everywhere, @distributed, @sync, @async, nworkers, nprocs, workers import Distributed: @everywhere, @distributed, @sync, @async, nworkers, nprocs, workers
import Distributed: nworkers, nprocs, workers, remotecall_fetch import Distributed: nworkers, nprocs, workers, remotecall_fetch
import DistributedArrays: DArray, dzeros, convert, localpart import DistributedArrays: DArray, dzeros, convert, localpart
import Distributions: Product, Uniform, Normal, MvNormal, Categorical import Distributions: Uniform, Normal, MvNormal, Categorical
import Distributions: Distribution, Univariate, Continuous, import Distributions: Distribution, Univariate, Continuous,
UnivariateDistribution, DiscreteUnivariateDistribution, UnivariateDistribution, DiscreteUnivariateDistribution,
MultivariateDistribution, product_distribution MultivariateDistribution, product_distribution
import Distributions: insupport, isbounded, ncategories, pdf import Distributions: insupport, isbounded, ncategories, pdf, product_distribution
import FunctionWrappers: FunctionWrapper import FunctionWrappers: FunctionWrapper
import Logging: @info import Logging: @info
using LinearAlgebra using LinearAlgebra
...@@ -39,8 +39,8 @@ function __init__() ...@@ -39,8 +39,8 @@ function __init__()
end end
## Exports ## Exports
export Distribution, Product, Uniform, Normal export Distribution, Uniform, Normal
export @everywhere export product_distribution, @everywhere
# Common types and constructors # Common types and constructors
export SVector, @SVector export SVector, @SVector
......
...@@ -3,7 +3,7 @@ using MarkovProcesses ...@@ -3,7 +3,7 @@ using MarkovProcesses
load_model("ER") load_model("ER")
k1 = ER[:k1] k1 = ER[:k1]
dist_mv_unif = Product(Uniform.([2.5,6.0], [3.5,7.0])) dist_mv_unif = product_distribution(Uniform.([2.5,6.0], [3.5,7.0]))
pm = ParametricModel(ER, [:k3,:k2], dist_mv_unif) pm = ParametricModel(ER, [:k3,:k2], dist_mv_unif)
draw_model!(pm) draw_model!(pm)
test1 = 2.5 <= ER[:k3] <= 3.5 && 6.0 <= ER[:k2] <= 7.0 && pm.df == 2 test1 = 2.5 <= ER[:k3] <= 3.5 && 6.0 <= ER[:k2] <= 7.0 && pm.df == 2
......
...@@ -9,7 +9,7 @@ pm1 = ParametricModel(ER, (:k2, Uniform(2.0, 4.0))) ...@@ -9,7 +9,7 @@ pm1 = ParametricModel(ER, (:k2, Uniform(2.0, 4.0)))
draw_model!(pm1) draw_model!(pm1)
test_all = test_all && 2.0 <= ER[:k2] <= 4.0 && pm1.df == 1 test_all = test_all && 2.0 <= ER[:k2] <= 4.0 && pm1.df == 1
pm2 = ParametricModel(ER, [:k3,:k2], Product(Uniform.([2.5,6.0], [3.5,7.0]))) pm2 = ParametricModel(ER, [:k3,:k2], product_distribution(Uniform.([2.5,6.0], [3.5,7.0])))
draw_model!(pm2) draw_model!(pm2)
test_all = test_all && 2.5 <= ER[:k3] <= 3.5 && 6.0 <= ER[:k2] <= 7.0 && pm2.df == 2 test_all = test_all && 2.5 <= ER[:k3] <= 3.5 && 6.0 <= ER[:k2] <= 7.0 && pm2.df == 2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment