From 561fc6330a988cab2d0289321dfea5ee578b9c17 Mon Sep 17 00:00:00 2001 From: navaxel Date: Tue, 23 May 2023 16:53:46 -0400 Subject: [PATCH] attribute displayXCSP3 correction for model --- src/CP/core/model.jl | 2 +- src/CP/core/search/search.jl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CP/core/model.jl b/src/CP/core/model.jl index e516c4dda..07147e268 100644 --- a/src/CP/core/model.jl +++ b/src/CP/core/model.jl @@ -100,7 +100,7 @@ mutable struct CPModel - CPModel(trailer) = new(Dict{String, AbstractVar}(), Dict{String, Bool}(), Dict{String, AbstractVar}(), Constraint[], trailer, nothing, nothing, Statistics(Dict{String, Int}(), 0, 0, 0, 0, 0, 0, 0, 0, Solution[], Int[], Float32[], nothing, nothing, nothing, nothing, nothing, nothing, nothing, Dict{Constraint, Int}()), Limit(nothing, nothing, nothing, nothing), nothing, Dict{Tuple{AbstractIntVar,Int}, Float32}(), false) + CPModel(trailer) = new(Dict{String, AbstractVar}(), Dict{String, Bool}(), Dict{String, AbstractVar}(), Constraint[], trailer, nothing, nothing, Statistics(Dict{String, Int}(), 0, 0, 0, 0, 0, 0, 0, 0, Solution[], Int[], Float32[], nothing, nothing, nothing, nothing, nothing, nothing, nothing, Dict{Constraint, Int}()), Limit(nothing, nothing, nothing, nothing), nothing, Dict{Tuple{AbstractIntVar,Int}, Float32}(), nothing, false) end diff --git a/src/CP/core/search/search.jl b/src/CP/core/search/search.jl index f5d859dd3..6ae97892c 100644 --- a/src/CP/core/search/search.jl +++ b/src/CP/core/search/search.jl @@ -70,7 +70,9 @@ function search!(model::CPModel, strategy::S, variableHeuristic::AbstractVariabl return :Optimal elseif !all(map(x->isnothing(x),model.statistics.solutions)) == 1 - println("s SATISTFIABLE") + if model.displayXCSP3 + println("s SATISTFIABLE") + end return :NonOptimal end