|
12 | 12 | x0 = @SArray zeros(Float32, N) |
13 | 13 | p = @SArray Float32[1.0, 100.0] |
14 | 14 |
|
| 15 | +array_prob = OptimizationProblem(rosenbrock, |
| 16 | + zeros(Float32, N), |
| 17 | + Float32[1.0, 100.0]; |
| 18 | + lb = lb, |
| 19 | + ub = ub) |
| 20 | + |
15 | 21 | prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub) |
16 | 22 |
|
17 | 23 | n_particles = 1000 |
18 | 24 |
|
19 | | -sol = solve(prob, |
20 | | - ParallelPSOKernel(n_particles; threaded = true), |
| 25 | +sol = solve(array_prob, |
| 26 | + ParallelPSOArray(n_particles), |
21 | 27 | maxiters = 500) |
22 | 28 |
|
23 | 29 | @test sol.objective < 1e-4 |
24 | 30 |
|
25 | 31 | sol = solve(prob, |
26 | | - ParallelPSOKernel(n_particles; threaded = false), |
| 32 | + SerialPSO(n_particles), |
27 | 33 | maxiters = 500) |
28 | 34 |
|
29 | 35 | @test sol.objective < 1e-4 |
30 | 36 |
|
31 | 37 | lb = @SVector fill(Float32(-Inf), N) |
32 | 38 | ub = @SVector fill(Float32(Inf), N) |
33 | | -prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub, N) |
| 39 | + |
| 40 | +array_prob = remake(array_prob; lb = lb, ub = ub) |
| 41 | +prob = remake(prob; lb = lb, ub = ub) |
34 | 42 |
|
35 | 43 | n_particles = 2000 |
36 | 44 |
|
37 | | -sol = solve(prob, |
38 | | - ParallelPSOKernel(n_particles; threaded = true), |
| 45 | +sol = solve(array_prob, |
| 46 | + ParallelPSOArray(n_particles), |
39 | 47 | maxiters = 500) |
40 | 48 |
|
41 | 49 | @test sol.objective < 1e-4 |
42 | 50 |
|
43 | 51 | sol = solve(prob, |
44 | | - ParallelPSOKernel(n_particles; threaded = false), |
| 52 | + SerialPSO(n_particles), |
45 | 53 | maxiters = 500) |
46 | 54 |
|
47 | 55 | @test sol.objective < 1e-4 |
48 | 56 |
|
49 | | -prob = OptimizationProblem(rosenbrock, x0, p) |
| 57 | +array_prob = remake(array_prob; lb = nothing, ub = nothing) |
| 58 | +prob = remake(prob; lb = nothing, ub = nothing) |
50 | 59 |
|
51 | 60 | n_particles = 2000 |
52 | 61 |
|
53 | | -sol = solve(prob, |
54 | | - ParallelPSOKernel(n_particles; threaded = true), |
| 62 | +sol = solve(array_prob, |
| 63 | + ParallelPSOArray(n_particles), |
55 | 64 | maxiters = 500) |
56 | 65 |
|
57 | 66 | @test sol.objective < 1e-4 |
58 | 67 |
|
59 | 68 | sol = solve(prob, |
60 | | - ParallelPSOKernel(n_particles; threaded = false), |
| 69 | + SerialPSO(n_particles), |
61 | 70 | maxiters = 500) |
62 | 71 |
|
63 | 72 | @test sol.objective < 1e-4 |
0 commit comments