Fix some import issues.

Author: michakraus

src/StochasticIntegrators.jl

@@ -17,7 +17,7 @@ module StochasticIntegrators
 
 
     import GeometricIntegrators.Integrators
-    import GeometricIntegrators.Integrators: Integrator, Parameters, equation, equations, parameters, nstages, timestep, tableau
+    import GeometricIntegrators.Integrators: Integrator, Parameters
 
     import GeometricIntegrators.Integrators: integrate!, integrate_common!, get_internal_variables
 

src/integrators/abstract_runge_kutta.jl

@@ -4,13 +4,13 @@ abstract type StochasticIntegratorPRK{dType, tType, D, M, S} <: PSDEIntegrator{d
 
 AbstractStochasticIntegratorRK{DT,TT,D,M,S} = Union{StochasticIntegratorRK{DT,TT,D,M,S}, StochasticIntegratorPRK{DT,TT,D,M,S}}
 
-@inline Integrators.parameters(integrator::AbstractStochasticIntegratorRK) = integrator.params
-@inline Integrators.equation(integrator::AbstractStochasticIntegratorRK, i::Symbol) = integrator.params.equs[i]
-@inline Integrators.equations(integrator::AbstractStochasticIntegratorRK) = integrator.params.equs
-@inline Integrators.timestep(integrator::AbstractStochasticIntegratorRK) = integrator.params.Δt
-@inline Integrators.tableau(integrator::AbstractStochasticIntegratorRK)  = integrator.params.tab
+@inline parameters(integrator::AbstractStochasticIntegratorRK) = integrator.params
+@inline equation(integrator::AbstractStochasticIntegratorRK, i::Symbol) = integrator.params.equs[i]
+@inline equations(integrator::AbstractStochasticIntegratorRK) = integrator.params.equs
+@inline timestep(integrator::AbstractStochasticIntegratorRK) = integrator.params.Δt
+@inline tableau(integrator::AbstractStochasticIntegratorRK)  = integrator.params.tab
 
-@inline Integrators.nstages(::AbstractStochasticIntegratorRK{DT,TT,D,M,S}) where {DT,TT,D,M,S} = S
+@inline nstages(::AbstractStochasticIntegratorRK{DT,TT,D,M,S}) where {DT,TT,D,M,S} = S
 @inline noisedims(::AbstractStochasticIntegratorRK{DT,TT,D,M,S}) where {DT,TT,D,M,S} = M
 @inline Base.ndims(::AbstractStochasticIntegratorRK{DT,TT,D,M,S}) where {DT,TT,D,M,S} = D
 @inline Base.eltype(::AbstractStochasticIntegratorRK{DT}) where {DT} = DT

src/integrators/integrators.jl

@@ -4,32 +4,32 @@
 #*****************************************************************************#
 
 "Create integrator for stochastic explicit Runge-Kutta tableau."
-function Integrator(equation::SDE, tableau::TableauSERK, Δt; kwargs...)
+function Integrators.Integrator(equation::SDE, tableau::TableauSERK, Δt; kwargs...)
     IntegratorSERK(equation, tableau, Δt; kwargs...)
 end
 
 "Create integrator for weak explicit Runge-Kutta tableau."
-function Integrator(equation::SDE, tableau::TableauWERK, Δt; kwargs...)
+function Integrators.Integrator(equation::SDE, tableau::TableauWERK, Δt; kwargs...)
     IntegratorWERK(equation, tableau, Δt; kwargs...)
 end
 
 "Create integrator for stochastic fully implicit Runge-Kutta tableau."
-function Integrator(equation::SDE, tableau::TableauSIRK, Δt; kwargs...)
+function Integrators.Integrator(equation::SDE, tableau::TableauSIRK, Δt; kwargs...)
     IntegratorSIRK(equation, tableau, Δt; kwargs...)
 end
 
 "Create integrator for stochastic fully implicit partitioned Runge-Kutta tableau."
-function Integrator(equation::PSDE, tableau::TableauSIPRK, Δt; kwargs...)
+function Integrators.Integrator(equation::PSDE, tableau::TableauSIPRK, Δt; kwargs...)
     IntegratorSIPRK(equation, tableau, Δt; kwargs...)
 end
 
 "Create integrator for stochastic fully implicit split partitioned Runge-Kutta tableau."
-function Integrator(equation::SPSDE, tableau::TableauSISPRK, Δt; kwargs...)
+function Integrators.Integrator(equation::SPSDE, tableau::TableauSISPRK, Δt; kwargs...)
     IntegratorSISPRK(equation, tableau, Δt; kwargs...)
 end
 
 "Create integrator for weak fully implicit Runge-Kutta tableau."
-function Integrator(equation::SDE, tableau::TableauWIRK, Δt; kwargs...)
+function Integrators.Integrator(equation::SDE, tableau::TableauWIRK, Δt; kwargs...)
     IntegratorWIRK(equation, tableau, Δt; kwargs...)
 end
 
@@ -38,7 +38,7 @@ end
 # Integration functions for stochastic integrators                         #
 #*****************************************************************************#
 
-function integrate!(int::StochasticIntegrator{DT,TT}, sol::Solution{AT,TT}, asol::AtomicSolution{DT,TT}, m::Int, n::Int) where {DT, TT, AT <: AbstractArray{DT}}
+function Integrators.integrate!(int::StochasticIntegrator{DT,TT}, sol::Solution{AT,TT}, asol::AtomicSolution{DT,TT}, m::Int, n::Int) where {DT, TT, AT <: AbstractArray{DT}}
     # copy the increments of the Brownian Process
     get_increments!(sol, asol, n, m)
 

test/stochastic_integrators_tests.jl

@@ -1,5 +1,4 @@
 
-using GeometricIntegrators
 using StochasticIntegrators
 using GeometricProblems.KuboOscillator
 using Test