Skip to content

Commit 66bd125

Browse files
amontoisonamontoison
committed
Remove the macro @.
1 parent 11df18c commit 66bd125

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎src/nlp/api.jl‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -678,18 +678,18 @@ function jac_op!(
678678
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
679679
jprod!(nlp, x, v, Jv)
680680
if β == 0
681-
@. res = α * Jv
681+
res .= α .* Jv
682682
else
683-
@. res = α * Jv + β * res
683+
res .= α .* Jv .+ β .* res
684684
end
685685
return res
686686
end
687687
ctprod! = @closure (res, v, α, β) -> begin
688688
jtprod!(nlp, x, v, Jtv)
689689
if β == 0
690-
@. res = α * Jtv
690+
res .= α .* Jtv
691691
else
692-
@. res = α * Jtv + β * res
692+
res .= α .* Jtv .+ β .* res
693693
end
694694
return res
695695
end
@@ -717,18 +717,18 @@ function jac_op!(
717717
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
718718
jprod!(nlp, rows, cols, vals, v, Jv)
719719
if β == 0
720-
@. res = α * Jv
720+
res .= α .* Jv
721721
else
722-
@. res = α * Jv + β * res
722+
res .= α .* Jv .+ β .* res
723723
end
724724
return res
725725
end
726726
ctprod! = @closure (res, v, α, β) -> begin
727727
jtprod!(nlp, rows, cols, vals, v, Jtv)
728728
if β == 0
729-
@. res = α * Jtv
729+
res .= α .* Jtv
730730
else
731-
@. res = α * Jtv + β * res
731+
res .= α .* Jtv .+ β .* res
732732
end
733733
return res
734734
end
@@ -768,18 +768,18 @@ function jac_lin_op!(
768768
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
769769
jprod_lin!(nlp, x, v, Jv)
770770
if β == 0
771-
@. res = α * Jv
771+
res .= α .* Jv
772772
else
773-
@. res = α * Jv + β * res
773+
res .= α .* Jv .+ β .* res
774774
end
775775
return res
776776
end
777777
ctprod! = @closure (res, v, α, β) -> begin
778778
jtprod_lin!(nlp, x, v, Jtv)
779779
if β == 0
780-
@. res = α * Jtv
780+
res .= α .* Jtv
781781
else
782-
@. res = α * Jtv + β * res
782+
res .= α .* Jtv .+ β .* res
783783
end
784784
return res
785785
end
@@ -807,18 +807,18 @@ function jac_lin_op!(
807807
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
808808
jprod_lin!(nlp, rows, cols, vals, v, Jv)
809809
if β == 0
810-
@. res = α * Jv
810+
res .= α .* Jv
811811
else
812-
@. res = α * Jv + β * res
812+
res .= α .* Jv .+ β .* res
813813
end
814814
return res
815815
end
816816
ctprod! = @closure (res, v, α, β) -> begin
817817
jtprod_lin!(nlp, rows, cols, vals, v, Jtv)
818818
if β == 0
819-
@. res = α * Jtv
819+
res .= α .* Jtv
820820
else
821-
@. res = α * Jtv + β * res
821+
res .= α .* Jtv .+ β .* res
822822
end
823823
return res
824824
end
@@ -858,18 +858,18 @@ function jac_nln_op!(
858858
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
859859
jprod_nln!(nlp, x, v, Jv)
860860
if β == 0
861-
@. res = α * Jv
861+
res .= α .* Jv
862862
else
863-
@. res = α * Jv + β * res
863+
res .= α .* Jv .+ β .* res
864864
end
865865
return res
866866
end
867867
ctprod! = @closure (res, v, α, β) -> begin
868868
jtprod_nln!(nlp, x, v, Jtv)
869869
if β == 0
870-
@. res = α * Jtv
870+
res .= α .* Jtv
871871
else
872-
@. res = α * Jtv + β * res
872+
res .= α .* Jtv .+ β .* res
873873
end
874874
return res
875875
end
@@ -897,18 +897,18 @@ function jac_nln_op!(
897897
prod! = @closure (res, v, α, β) -> begin # res = α * J * v + β * res
898898
jprod_nln!(nlp, rows, cols, vals, v, Jv)
899899
if β == 0
900-
@. res = α * Jv
900+
res .= α .* Jv
901901
else
902-
@. res = α * Jv + β * res
902+
res .= α .* Jv .+ β .* res
903903
end
904904
return res
905905
end
906906
ctprod! = @closure (res, v, α, β) -> begin
907907
jtprod_nln!(nlp, rows, cols, vals, v, Jtv)
908908
if β == 0
909-
@. res = α * Jtv
909+
res .= α .* Jtv
910910
else
911-
@. res = α * Jtv + β * res
911+
res .= α .* Jtv .+ β .* res
912912
end
913913
return res
914914
end
@@ -1273,9 +1273,9 @@ function hess_op!(
12731273
prod! = @closure (res, v, α, β) -> begin
12741274
hprod!(nlp, x, v, Hv; obj_weight = obj_weight)
12751275
if β == 0
1276-
@. res = α * Hv
1276+
res .= α .* Hv
12771277
else
1278-
@. res = α * Hv + β * res
1278+
res .= α .* Hv .+ β .* res
12791279
end
12801280
return res
12811281
end
@@ -1304,9 +1304,9 @@ function hess_op!(
13041304
prod! = @closure (res, v, α, β) -> begin
13051305
hprod!(nlp, rows, cols, vals, v, Hv)
13061306
if β == 0
1307-
@. res = α * Hv
1307+
res .= α .* Hv
13081308
else
1309-
@. res = α * Hv + β * res
1309+
res .= α .* Hv .+ β .* res
13101310
end
13111311
return res
13121312
end
@@ -1335,9 +1335,9 @@ function hess_op!(
13351335
prod! = @closure (res, v, α, β) -> begin
13361336
hprod!(nlp, x, y, v, Hv; obj_weight = obj_weight)
13371337
if β == 0
1338-
@. res = α * Hv
1338+
res .= α .* Hv
13391339
else
1340-
@. res = α * Hv + β * res
1340+
res .= α .* Hv .+ β .* res
13411341
end
13421342
return res
13431343
end

‎src/nls/api.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@ function jac_op_residual!(
188188
prod! = @closure (res, v, α, β) -> begin
189189
jprod_residual!(nls, x, v, Jv)
190190
if β == 0
191-
@. res = α * Jv
191+
res .= α .* Jv
192192
else
193-
@. res = α * Jv + β * res
193+
res .= α .* Jv .+ β .* res
194194
end
195195
return res
196196
end
197197
ctprod! = @closure (res, v, α, β) -> begin
198198
jtprod_residual!(nls, x, v, Jtv)
199199
if β == 0
200-
@. res = α * Jtv
200+
res .= α .* Jtv
201201
else
202-
@. res = α * Jtv + β * res
202+
res .= α .* Jtv .+ β .* res
203203
end
204204
return res
205205
end
@@ -234,18 +234,18 @@ function jac_op_residual!(
234234
prod! = @closure (res, v, α, β) -> begin
235235
jprod_residual!(nls, rows, cols, vals, v, Jv)
236236
if β == 0
237-
@. res = α * Jv
237+
res .= α .* Jv
238238
else
239-
@. res = α * Jv + β * res
239+
res .= α .* Jv .+ β .* res
240240
end
241241
return res
242242
end
243243
ctprod! = @closure (res, v, α, β) -> begin
244244
jtprod_residual!(nls, rows, cols, vals, v, Jtv)
245245
if β == 0
246-
@. res = α * Jtv
246+
res .= α .* Jtv
247247
else
248-
@. res = α * Jtv + β * res
248+
res .= α .* Jtv .+ β .* res
249249
end
250250
return res
251251
end
@@ -380,9 +380,9 @@ function hess_op_residual!(
380380
prod! = @closure (res, v, α, β) -> begin
381381
hprod_residual!(nls, x, i, v, Hiv)
382382
if β == 0
383-
@. res = α * Hiv
383+
res .= α .* Hiv
384384
else
385-
@. res = α * Hiv + β * res
385+
res .= α .* Hiv .+ β .* res
386386
end
387387
return res
388388
end

0 commit comments

Comments
 (0)