Skip to content

Commit 830e982

Browse files
committed
Update
1 parent ce83083 commit 830e982

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/MOI_wrapper/MOI_multi_objective.jl

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ function MOI.set(
135135
for (i, fi) in enumerate(MOI.Utilities.eachscalar(f))
136136
MOI.set(model, MultiObjectiveFunction(i), fi)
137137
end
138+
model.objective_type = _VECTOR_AFFINE
138139
return
139140
end
140141

src/MOI_wrapper/MOI_wrapper.jl

+12-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ const CleverDicts = MOI.Utilities.CleverDicts
1818
_INTERVAL,
1919
_EQUAL_TO
2020
)
21-
@enum(_ObjectiveType, _SINGLE_VARIABLE, _SCALAR_AFFINE, _SCALAR_QUADRATIC)
21+
@enum(
22+
_ObjectiveType,
23+
_SINGLE_VARIABLE,
24+
_SCALAR_AFFINE,
25+
_SCALAR_QUADRATIC,
26+
_VECTOR_AFFINE,
27+
)
28+
2229
@enum(
2330
_CallbackState,
2431
_CB_NONE,
@@ -3419,9 +3426,11 @@ function MOI.get(model::Optimizer, ::MOI.ObjectiveFunctionType)
34193426
return MOI.VariableIndex
34203427
elseif model.objective_type == _SCALAR_AFFINE
34213428
return MOI.ScalarAffineFunction{Float64}
3422-
else
3423-
@assert model.objective_type == _SCALAR_QUADRATIC
3429+
elseif model.objective_type == _SCALAR_QUADRATIC
34243430
return MOI.ScalarQuadraticFunction{Float64}
3431+
else
3432+
@assert model.objective_type == _VECTOR_AFFINE
3433+
return MOI.VectorAffineFunction{Float64}
34253434
end
34263435
end
34273436

0 commit comments

Comments
 (0)