Skip to content

Commit c70b7ef

Browse files
committed
update diffopt usage
1 parent c8fe1d7 commit c70b7ef

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/jump.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ JuMP.object_dictionary(model::Model) = model.obj_dict
117117

118118
function JuMP.set_optimizer(model::Model, builder, evaluate_duals::Bool = true)
119119
# set diffopt optimizer for plan model
120-
new_diff_optimizer = DiffOpt.diff_optimizer(builder)
120+
new_diff_optimizer = DiffOpt.diff_optimizer(
121+
builder;
122+
with_parametric_opt_interface = true,
123+
)
121124
JuMP.set_optimizer(
122125
model.plan,
123-
() ->
124-
POI.Optimizer(new_diff_optimizer; evaluate_duals = evaluate_duals),
126+
() -> new_diff_optimizer,
125127
)
126128

127129
# basic setting for assess model
@@ -133,10 +135,6 @@ function JuMP.set_silent(model::Model)
133135
return MOI.set(model.assess, MOI.Silent(), true)
134136
end
135137

136-
function JuMP.num_variables(model::Model)
137-
return JuMP.num_variables(model.plan) + JuMP.num_variables(model.assess)
138-
end
139-
140138
function JuMP.num_constraints(model::Model)
141139
return JuMP.num_constraints(model.plan) + JuMP.num_constraints(model.assess)
142140
end

src/simulation.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function compute_single_step_gradient(
2525
dCdy::Vector{<:Real},
2626
)
2727
dCdz .= dual.(model.assess[:assess_policy_fix])
28+
DiffOpt.empty_input_sensitivities!(model.plan)
2829
for i = 1:size(model.policy_vars, 1)
2930
MOI.set(
3031
model.plan,
@@ -37,9 +38,9 @@ function compute_single_step_gradient(
3738
for j = 1:size(model.forecast_vars, 1)
3839
dCdy[j] = MOI.get(
3940
model.plan,
40-
POI.ReverseParameter(),
41-
model.plan_forecast_params[j],
42-
)
41+
DiffOpt.ReverseConstraintSet(),
42+
ParameterRef(model.plan_forecast_params[j]),
43+
).value
4344
end
4445

4546
return dCdy

0 commit comments

Comments
 (0)