From 4783915f479980eed54d081c9b183b675719a1bc Mon Sep 17 00:00:00 2001 From: Francesco Martinuzzi Date: Tue, 3 Mar 2020 17:33:13 +0100 Subject: [PATCH] new version --- Project.toml | 2 +- README.md | 3 ++- src/echostatenetwork.jl | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 0b6b6476..949a3ad7 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ReservoirComputing" uuid = "7c2d2b1e-3dd4-11ea-355a-8f6a8116e294" authors = ["Francesco Martinuzzi"] -version = "0.2.1" +version = "0.3.0" [deps] LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" diff --git a/README.md b/README.md index 9aeb216b..283bbeb8 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ esn = ESN(approx_res_size, sigma, #default = 0.1 alpha, #default = 1.0 beta, #default = 0.0 - nonlin_alg #default = "None") + nonlin_alg #default = "None" + ) ``` The echo state network can now be trained and tested: ```julia diff --git a/src/echostatenetwork.jl b/src/echostatenetwork.jl index b2b28d27..c0f9c15b 100644 --- a/src/echostatenetwork.jl +++ b/src/echostatenetwork.jl @@ -2,7 +2,7 @@ struct ESN{T<:AbstractFloat} res_size::Integer in_size::Integer out_size::Integer - train_data::Matrix{T} + train_data::Array{T} degree::Integer sigma::T alpha::T @@ -15,7 +15,7 @@ struct ESN{T<:AbstractFloat} states::Matrix{T} function ESN(approx_res_size::Integer, - train_data::Matrix{T}, + train_data::Array{T}, degree::Integer, radius::T, activation::Function = tanh, @@ -65,7 +65,7 @@ end function states_matrix(W::Matrix{Float64}, W_in::Matrix{Float64}, - train_data::Matrix{Float64}, + train_data::Array{Float64}, alpha::Float64, activation::Function)