Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attribute displayXCSP3 correction for model #375

Merged
merged 1 commit into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
attribute displayXCSP3 correction for model
  • Loading branch information
navaxel committed May 23, 2023
commit 561fc6330a988cab2d0289321dfea5ee578b9c17
2 changes: 1 addition & 1 deletion src/CP/core/model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion src/CP/core/search/search.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down