diff --git a/docs/src/tutorials/gpu.md b/docs/src/tutorials/gpu.md index 8741f9ec9..4771e76ff 100644 --- a/docs/src/tutorials/gpu.md +++ b/docs/src/tutorials/gpu.md @@ -51,13 +51,13 @@ function airport_model(T, backend) IJ = [(i, j) for i in 1:N-1 for j in i+1:N] # Write model using ExaModels core = ExaModels.ExaCore(T; backend=backend) - x = ExaModels.variable(core, 1:N, lvar = -10.0, uvar=10.0) - y = ExaModels.variable(core, 1:N, lvar = -10.0, uvar=10.0) - ExaModels.objective( + ExaModels.@add_var(core, x, 1:N; lvar = -10.0, uvar = 10.0) + ExaModels.@add_var(core, y, 1:N; lvar = -10.0, uvar = 10.0) + ExaModels.@add_obj( core, ((x[i] - x[j])^2 + (y[i] - y[j])^2) for (i, j) in IJ ) - ExaModels.constraint(core, (x[i]-dcx)^2 + (y[i] - dcy)^2 - dr for (i, dcx, dcy, dr) in data; lcon=-Inf) + ExaModels.@add_con(core, (x[i]-dcx)^2 + (y[i] - dcy)^2 - dr for (i, dcx, dcy, dr) in data; lcon=-Inf) return ExaModels.ExaModel(core) end ``` diff --git a/docs/src/tutorials/multiprecision.md b/docs/src/tutorials/multiprecision.md index fa5ceedb3..6dcf401ea 100644 --- a/docs/src/tutorials/multiprecision.md +++ b/docs/src/tutorials/multiprecision.md @@ -42,13 +42,13 @@ function airport_model(T) IJ = [(i, j) for i in 1:N-1 for j in i+1:N] # Write model using ExaModels core = ExaModels.ExaCore(T) - x = ExaModels.variable(core, 1:N, lvar = -10.0, uvar=10.0) - y = ExaModels.variable(core, 1:N, lvar = -10.0, uvar=10.0) - ExaModels.objective( + ExaModels.@add_var(core, x, 1:N; lvar = -10.0, uvar = 10.0) + ExaModels.@add_var(core, y, 1:N; lvar = -10.0, uvar = 10.0) + ExaModels.@add_obj( core, ((x[i] - x[j])^2 + (y[i] - y[j])^2) for (i, j) in IJ ) - ExaModels.constraint(core, (x[i]-dcx)^2 + (y[i] - dcy)^2 - dr for (i, dcx, dcy, dr) in data; lcon=-Inf) + ExaModels.@add_con(core, (x[i]-dcx)^2 + (y[i] - dcy)^2 - dr for (i, dcx, dcy, dr) in data; lcon=-Inf) return ExaModels.ExaModel(core) end ``` diff --git a/docs/src/tutorials/quasi_newton.md b/docs/src/tutorials/quasi_newton.md index acd6f3722..1af1ac92f 100644 --- a/docs/src/tutorials/quasi_newton.md +++ b/docs/src/tutorials/quasi_newton.md @@ -36,14 +36,14 @@ function elec_model(np) phi = pi .* rand(np) core = ExaModels.ExaCore(Float64) - x = ExaModels.variable(core, 1:np; start = [cos(theta[i])*sin(phi[i]) for i=1:np]) - y = ExaModels.variable(core, 1:np; start = [sin(theta[i])*sin(phi[i]) for i=1:np]) - z = ExaModels.variable(core, 1:np; start = [cos(phi[i]) for i=1:np]) + ExaModels.@add_var(core, x, 1:np; start = [cos(theta[i])*sin(phi[i]) for i=1:np]) + ExaModels.@add_var(core, y, 1:np; start = [sin(theta[i])*sin(phi[i]) for i=1:np]) + ExaModels.@add_var(core, z, 1:np; start = [cos(phi[i]) for i=1:np]) # Coulomb potential itr = [(i,j) for i in 1:np-1 for j in i+1:np] - ExaModels.objective(core, 1.0 / sqrt((x[i] - x[j])^2 + (y[i] - y[j])^2 + (z[i] - z[j])^2) for (i,j) in itr) + ExaModels.@add_obj(core, 1.0 / sqrt((x[i] - x[j])^2 + (y[i] - y[j])^2 + (z[i] - z[j])^2) for (i,j) in itr) # Unit-ball - ExaModels.constraint(core, x[i]^2 + y[i]^2 + z[i]^2 - 1 for i=1:np) + ExaModels.@add_con(core, x[i]^2 + y[i]^2 + z[i]^2 - 1 for i=1:np) return ExaModels.ExaModel(core) end