update CellularAutomata

Author: MartinuzziFrancesco

Project.toml

@@ -26,7 +26,7 @@ RCSparseArraysExt = "SparseArrays"
 [compat]
 Adapt = "4.1.1"
 Aqua = "0.8"
-CellularAutomata = "0.0.2"
+CellularAutomata = "0.0.6"
 Compat = "4.16.0"
 DifferentialEquations = "7.15.0"
 JET = "0.9.18"

src/ReservoirComputing.jl

@@ -1,7 +1,7 @@
 module ReservoirComputing
 
 using Adapt: adapt
-using CellularAutomata: CellularAutomaton
+using CellularAutomata: CellularAutomaton, AbstractCA
 using Compat: @compat
 using LinearAlgebra: eigvals, mul!, I, qr, Diagonal
 using NNlib: fast_act, sigmoid

src/esn/esn_reservoir_drivers.jl

@@ -22,8 +22,8 @@ specified reservoir driver.
     update.
 """
 function create_states(reservoir_driver::AbstractReservoirDriver,
-        train_data::AbstractArray, washout::Int, reservoir_matrix::AbstractMatrix,
-        input_matrix::AbstractMatrix, bias_vector::AbstractArray)
+        train_data::AbstractArray{T,2}, washout::Int, reservoir_matrix::AbstractMatrix,
+        input_matrix::AbstractMatrix, bias_vector::AbstractArray) where {T<:Number}
     train_len = size(train_data, 2) - washout
     res_size = size(reservoir_matrix, 1)
     states = adapt(typeof(train_data), zeros(res_size, train_len))
@@ -32,6 +32,7 @@ function create_states(reservoir_driver::AbstractReservoirDriver,
 
     for i in 1:washout
         yv = @view train_data[:, i]
+        @show typeof(yv)
         _state = next_state!(_state, reservoir_driver, _state, yv, reservoir_matrix,
             input_matrix, bias_vector, tmp_array)
     end
@@ -47,8 +48,8 @@ function create_states(reservoir_driver::AbstractReservoirDriver,
 end
 
 function create_states(reservoir_driver::AbstractReservoirDriver,
-        train_data::AbstractArray, washout::Int, reservoir_matrix::Vector,
-        input_matrix::AbstractArray, bias_vector::AbstractArray)
+        train_data::AbstractArray{T,2}, washout::Int, reservoir_matrix::Vector,
+        input_matrix::AbstractArray, bias_vector::AbstractArray) where {T<:Number}
     train_len = size(train_data, 2) - washout
     res_size = sum([size(reservoir_matrix[i], 1) for i in 1:length(reservoir_matrix)])
     states = adapt(typeof(train_data), zeros(res_size, train_len))
@@ -357,14 +358,19 @@ function obtain_gru_state!(out, variant::FullyGated, gru, x, y, W, W_in, b, tmp_
 end
 
 #minimal
+#=
 function obtain_gru_state!(out, variant::Minimal, gru, x, y, W, W_in, b, tmp_array)
     mul!(tmp_array[1], gru.Wz_in, y)
     mul!(tmp_array[2], gru.Wz, x)
     @. tmp_array[3] = gru.activation_function[1](tmp_array[1] + tmp_array[2] + gru.bz)
 
+    mul!(tmp_array[4], gru.Wr_in, y)
+    mul!(tmp_array[5], gru.Wr, x)
+    @. tmp_array[6] = gru.activation_function[2](tmp_array[4] + tmp_array[5] + gru.br)
+
     mul!(tmp_array[7], W_in, y)
     mul!(tmp_array[8], W, tmp_array[6] .* x)
-    @. tmp_array[9] = gru.activation_function[2](tmp_array[7] + tmp_array[8] + b)
-
-    return @. out = (1 - tmp_array[3]) * x + tmp_array[3] * tmp_array[6]
+    @. tmp_array[9] = gru.activation_function[3](tmp_array[7] + tmp_array[8] + b)
+    return @. out = (1 - tmp_array[3]) * x + tmp_array[3] * tmp_array[9]
 end
+=#

src/reca/reca.jl

@@ -25,8 +25,8 @@ arXiv preprint arXiv:1410.0162 (2014).
 automata._” arXiv preprint arXiv:1703.02806 (2017).
 """
 function RECA(train_data,
-        automata;
-        generations=8,
+        automata::AbstractCA;
+        generations::Int=8,
         input_encoding=RandomMapping(),
         nla_type=NLADefault(),
         states_type=StandardStates())

src/reca/reca_input_encodings.jl

@@ -36,7 +36,7 @@ struct RandomMaps{T, E, G, M, S} <: AbstractEncodingData
     ca_size::S
 end
 
-function create_encoding(rm::RandomMapping, input_data, generations)
+function create_encoding(rm::RandomMapping, input_data::Int, generations::Int)
     maps = init_maps(size(input_data, 1), rm.permutations, rm.expansion_size)
     states_size = generations * rm.expansion_size * rm.permutations
     ca_size = rm.expansion_size * rm.permutations