Skip to content

Commit f125e16

Browse files
committed
Update for latest changes
1 parent aa3d326 commit f125e16

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

test/Nonlinear/ReverseAD.jl

+10-10
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ end
187187
function test_constraint_quadratic_univariate()
188188
x = MOI.VariableIndex(1)
189189
model = Nonlinear.Model()
190-
Nonlinear.add_constraint(model, :($x^2 <= 2.0))
190+
Nonlinear.add_constraint(model, :($x^2), MOI.LessThan(2.0))
191191
evaluator = Nonlinear.Evaluator(model, Nonlinear.SparseReverseMode(), [x])
192192
MOI.initialize(evaluator, [:Grad, :Jac, :Hess])
193193
g = [NaN]
194194
x_val = [1.2]
195195
MOI.eval_constraint(evaluator, g, x_val)
196-
@test g == x_val .^ 2 .- 2
196+
@test g == x_val .^ 2
197197
@test MOI.jacobian_structure(evaluator) == [(1, 1)]
198198
J = [NaN]
199199
MOI.eval_constraint_jacobian(evaluator, J, x_val)
@@ -209,14 +209,14 @@ function test_constraint_quadratic_multivariate()
209209
x = MOI.VariableIndex(1)
210210
y = MOI.VariableIndex(2)
211211
model = Nonlinear.Model()
212-
Nonlinear.add_constraint(model, :($x^2 + $x * $y + $y^2 <= 2.0))
212+
Nonlinear.add_constraint(model, :($x^2 + $x * $y + $y^2), MOI.LessThan(2.0))
213213
evaluator =
214214
Nonlinear.Evaluator(model, Nonlinear.SparseReverseMode(), [x, y])
215215
MOI.initialize(evaluator, [:Grad, :Jac, :Hess])
216216
g = [NaN]
217217
x_val = [1.2, 2.3]
218218
MOI.eval_constraint(evaluator, g, x_val)
219-
@test g == [x_val[1]^2 + x_val[1] * x_val[2] + x_val[2]^2] .- 2
219+
@test g == [x_val[1]^2 + x_val[1] * x_val[2] + x_val[2]^2]
220220
@test MOI.jacobian_structure(evaluator) == [(1, 1), (1, 2)]
221221
J = [NaN, NaN]
222222
MOI.eval_constraint_jacobian(evaluator, J, x_val)
@@ -236,14 +236,14 @@ function test_constraint_quadratic_multivariate_subexpressions()
236236
ex = Nonlinear.add_expression(model, :($x^2))
237237
ey = Nonlinear.add_expression(model, :($y^2))
238238
exy = Nonlinear.add_expression(model, :($ex + $x * $y))
239-
Nonlinear.add_constraint(model, :($exy + $ey <= 2.0))
239+
Nonlinear.add_constraint(model, :($exy + $ey), MOI.LessThan(2.0))
240240
evaluator =
241241
Nonlinear.Evaluator(model, Nonlinear.SparseReverseMode(), [x, y])
242242
MOI.initialize(evaluator, [:Grad, :Jac, :Hess])
243243
g = [NaN]
244244
x_val = [1.2, 2.3]
245245
MOI.eval_constraint(evaluator, g, x_val)
246-
@test g [x_val[1]^2 + x_val[1] * x_val[2] + x_val[2]^2] .- 2
246+
@test g [x_val[1]^2 + x_val[1] * x_val[2] + x_val[2]^2]
247247
# Jacobian
248248
@test MOI.jacobian_structure(evaluator) == [(1, 1), (1, 2)]
249249
J = [NaN, NaN]
@@ -436,10 +436,10 @@ end
436436
function test_NLPBlockData()
437437
model = Nonlinear.Model()
438438
x = MOI.VariableIndex(1)
439-
Nonlinear.add_constraint(model, :($x <= 1))
440-
Nonlinear.add_constraint(model, :($x >= 2))
441-
Nonlinear.add_constraint(model, :($x == 3))
442-
Nonlinear.add_constraint(model, :(4 <= $x <= 5))
439+
Nonlinear.add_constraint(model, :($x - 1), MOI.LessThan(0.0))
440+
Nonlinear.add_constraint(model, :($x - 2), MOI.GreaterThan(0.0))
441+
Nonlinear.add_constraint(model, :($x - 3), MOI.EqualTo(0.0))
442+
Nonlinear.add_constraint(model, :($x), MOI.Interval(4.0, 5.0))
443443
evaluator = Nonlinear.Evaluator(model, Nonlinear.SparseReverseMode(), [x])
444444
block = MOI.NLPBlockData(evaluator)
445445
@test block.constraint_bounds == [

0 commit comments

Comments
 (0)