updated deps

Author: PasoStudio73

Project.toml

@@ -12,5 +12,6 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
 Distributions = "0.25"
+MLJBase = "1.8"
 MLJTuning = "0.8"
 julia = "1"

src/MLJParticleSwarmOptimization.jl

@@ -8,10 +8,9 @@ using MLJTuning
 
 export ParticleSwarm, AdaptiveParticleSwarm
 
-include("swarm.jl")
+include("interface.jl")
 include("parameters.jl")
 include("update.jl")
-include("strategies/abstract.jl")
 include("strategies/basic.jl")
 include("strategies/adaptive.jl")
 

src/interface.jl

@@ -0,0 +1,47 @@
+abstract type AbstractParticleSwarm <: MLJTuning.TuningStrategy end
+
+struct ParticleSwarmState{T, R, P, I}
+    ranges::R
+    parameters::P
+    indices::I
+    X::Matrix{T}
+    V::Matrix{T}
+    pbest_X::Matrix{T}
+    gbest_X::Matrix{T}
+    pbest::Vector{T}
+    gbest::Vector{T}
+end
+
+mutable struct ParticleSwarm <: AbstractParticleSwarm
+    n_particles::Integer
+    w::Float64
+    c1::Float64
+    c2::Float64
+    prob_shift::Float64
+    rng::AbstractRNG
+    # TODO: topology
+end
+
+mutable struct AdaptiveParticleSwarm <: AbstractParticleSwarm
+    n_particles::Integer
+    c1::Float64
+    c2::Float64
+    prob_shift::Float64
+    rng::AbstractRNG
+end
+
+get_n_particles(tuning::AbstractParticleSwarm) = tuning.n_particles
+get_prob_shift(tuning::AbstractParticleSwarm) = tuning.prob_shift
+get_rng(tuning::AbstractParticleSwarm) = tuning.rng
+
+function initialize(r, tuning::AbstractParticleSwarm)
+    return initialize(get_rng(tuning), r, get_n_particles(tuning))
+end
+
+function retrieve!(state::ParticleSwarmState, tuning::AbstractParticleSwarm)
+    return retrieve!(get_rng(tuning), state)
+end
+
+function pbest!(state::ParticleSwarmState, measurements, tuning::AbstractParticleSwarm)
+    return pbest!(state, measurements, get_prob_shift(tuning))
+end

src/strategies/abstract.jl

@@ -40,15 +40,6 @@ copy of `model`. If the corresponding range has a specified `scale` function,
 then the transformation is applied before the hyperparameter is returned. If
 `scale` is a symbol (eg, `:log`), it is ignored.
 """
-mutable struct AdaptiveParticleSwarm{R<:AbstractRNG} <: AbstractParticleSwarm
-    n_particles::Int
-    c1::Float64
-    c2::Float64
-    prob_shift::Float64
-    rng::R
-end
-
-# Constructor
 
 function AdaptiveParticleSwarm(;
     n_particles=3,

src/strategies/adaptive.jl

@@ -103,15 +103,6 @@ where pₛ is the probability of the sampled hyperparameter value. For more
 information, refer to "A New Discrete Particle Swarm Optimization Algorithm" by
 Strasser, Goodman, Sheppard, and Butcher.
 """
-mutable struct ParticleSwarm{R<:AbstractRNG} <: AbstractParticleSwarm
-    n_particles::Int
-    w::Float64
-    c1::Float64
-    c2::Float64
-    prob_shift::Float64
-    rng::R
-    # TODO: topology
-end
 
 function ParticleSwarm(;
     n_particles=3,