fix MMAP constructor, add printing function for UAIInstance

Author: GiggleLiu

src/Core.jl

@@ -12,6 +12,7 @@ struct Factor{T, N}
     vars::NTuple{N, Int64}
     vals::Array{T, N}
 end
+summary(f::Factor) = "Factor($(join(f.vars, ", "))), size = $(size(f.vals))"
 
 """
 $(TYPEDEF)
@@ -39,6 +40,20 @@ struct UAIInstance{ET, FT <: Factor{ET}}
     reference_solution::Union{Vector{Vector{ET}}, Vector{Int}, Float64}
 end
 
+Base.show(io::IO, ::MIME"text/plain", uai::UAIInstance) = Base.show(io, uai)
+function Base.show(io::IO, uai::UAIInstance)
+    println(io, "UAIInstance(nvars = $(uai.nvars), nclique = $(uai.nclique))")
+    println(io, " variables :")
+    for (var, card) in zip(1:uai.nvars, uai.cards)
+        println(io, string_var("  $var of size $card", var ∈ uai.queryvars, Dict(zip(uai.obsvars, uai.obsvals))))
+    end
+    println(io, " factors : ")
+    for f in uai.factors
+        println(io, "  $(summary(f))")
+    end
+    print(io, " reference_solution : $(uai.reference_solution)")
+end
+
 """
 $TYPEDSIGNATURES
 

src/mmap.jl

@@ -60,14 +60,14 @@ $(TYPEDSIGNATURES)
 """
 function MMAPModel(instance::UAIInstance; marginalized, openvertices = (), optimizer = GreedyMethod(), simplifier = nothing)::MMAPModel
     return MMAPModel(
-        1:(instance.nvars), instance.factors; marginalized, fixedvertices = Dict(zip(instance.obsvars, instance.obsvals)), optimizer, simplifier, openvertices
+        1:(instance.nvars), instance.cards, instance.factors; marginalized, fixedvertices = Dict(zip(instance.obsvars, instance.obsvals)), optimizer, simplifier, openvertices
     )
 end
 
 """
 $(TYPEDSIGNATURES)
 """
-function MMAPModel(vars::AbstractVector{LT}, factors::Vector{<:Factor{T}}; marginalized, openvertices = (),
+function MMAPModel(vars::AbstractVector{LT}, cards::AbstractVector{Int}, factors::Vector{<:Factor{T}}; marginalized, openvertices = (),
     fixedvertices = Dict{LT, Int}(),
     optimizer = GreedyMethod(), simplifier = nothing,
     marginalize_optimizer = GreedyMethod(), marginalize_simplifier = nothing
@@ -77,7 +77,7 @@ function MMAPModel(vars::AbstractVector{LT}, factors::Vector{<:Factor{T}}; margi
     if !isempty(setdiff(iy, vars))
         error("Marginalized variables should not contain any output variable.")
     end
-    all_tensors = [[ones(T, 2) for _ in 1:length(vars)]..., getfield.(factors, :vals)...]
+    all_tensors = [[ones(T, cards[i]) for i in 1:length(vars)]..., getfield.(factors, :vals)...]
     size_dict = OMEinsum.get_size_dict(all_ixs, all_tensors)
 
     # detect clusters for marginalize variables

test/mmap.jl

@@ -47,3 +47,12 @@ end
       @test solution == instance.reference_solution
     end
 end
+
+using Artifacts
+include("utils.jl")
+model_filepath, evidence_filepath, query_filepath, solution_filepath = get_instance_filepaths("Segmentation_11", "MMAP")
+instance = read_instance(model_filepath; evidence_filepath, query_filepath, solution_filepath)
+ref_sol = read_solution_file(solution_filepath)[2:end]
+
+optimizer = TreeSA(ntrials=1, niters=2, βs=1:0.1:40)
+mmap = MMAPModel(instance; marginalized=setdiff(1:instance.nvars, instance.queryvars), optimizer)