Skip to content

Fixed ideal point in KS and nadir point in TV #106

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.

Sign up for GitHub

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

Closed
kofgokhan wants to merge 1 commit into from
Closed

Fixed ideal point in KS and nadir point in TV #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/algorithms/KirlikSayin.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function optimize_multiobjective!(algorithm::KirlikSayin, model::Optimizer)
return status, nothing
end
_, Y = _compute_point(model, variables, f_i)
yI[i] = Y + 1
yI[i] = Y
model.ideal_point[i] = Y
MOI.set(
model.inner,
Expand All @@ -125,7 +125,7 @@ function optimize_multiobjective!(algorithm::KirlikSayin, model::Optimizer)
return status, nothing
end
_, Y = _compute_point(model, variables, f_i)
yN[i] = Y
yN[i] = Y + 1
end
# Reset the sense after modifying it.
MOI.set(model.inner, MOI.ObjectiveSense(), sense)
Expand Down
15 changes: 3 additions & 12 deletions src/algorithms/TambyVanderpooten.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,9 @@ function optimize_multiobjective!(
warm_start_supported = true
end
solutions = Dict{Vector{Float64},Dict{MOI.VariableIndex,Float64}}()
YN = Vector{Float64}[]
variables = MOI.get(model.inner, MOI.ListOfVariableIndices())
n = MOI.output_dimension(model.f)
yI, yN = zeros(n), zeros(n)
yI = zeros(n)
scalars = MOI.Utilities.scalarize(model.f)
for (i, f_i) in enumerate(scalars)
MOI.set(model.inner, MOI.ObjectiveFunction{typeof(f_i)}(), f_i)
Expand All @@ -114,18 +113,10 @@ function optimize_multiobjective!(
return status, nothing
end
_, Y = _compute_point(model, variables, f_i)
yI[i] = Y + 1
yI[i] = Y
model.ideal_point[i] = Y
MOI.set(model.inner, MOI.ObjectiveSense(), MOI.MAX_SENSE)
MOI.optimize!(model.inner)
status = MOI.get(model.inner, MOI.TerminationStatus())
if !_is_scalar_status_optimal(status)
_warn_on_nonfinite_anti_ideal(algorithm, sense, i)
return status, nothing
end
_, Y = _compute_point(model, variables, f_i)
yN[i] = Y
end
yN = fill(typemax(Float64), n)
MOI.set(model.inner, MOI.ObjectiveSense(), MOI.MIN_SENSE)
U_N = Dict{Vector{Float64},Vector{Vector{Vector{Float64}}}}()
V = [Tuple{Vector{Float64},Vector{Float64}}[] for k in 1:n]
Expand Down
Loading