Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Provide overoading point for arrays with custom axes #883

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide overoading point for arrays with custom axes #883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/multivariate/solvers/zeroth_order/particle_swarm.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ function initial_state(method::ParticleSwarm, options, d, initial_x::AbstractArr
c2 = T(2)
w = T(1)

X = Array{T,2}(undef, n, n_particles)
V = Array{T,2}(undef, n, n_particles)
X_best = Array{T,2}(undef, n, n_particles)
X = similar_axis(initial_x, n_particles)
V = similar_axis(initial_x, n_particles)
X_best = similar_axis(initial_x, n_particles)
dx = zeros(T, n)
score = zeros(T, n_particles)
x = copy(initial_x)
Expand Down Expand Up @@ -465,11 +465,20 @@ end

function compute_cost!(f,
n_particles::Int,
X::Matrix,
X::AbstractMatrix,
score::Vector)

for i in 1:n_particles
score[i] = value(f, X[:, i])
end
nothing
end

"""
similar_axis(x, n_particles)

Equivalent to `Base.similar(x, length(x), n_particles)` for `x::Array`. Provide a method of this function to preserve a special axis for subtypes of `AbstractArray`.
"""
function similar_axis(x, n_particles)
similar(x, length(x), n_particles)
end