From e087dc1fe28309406e945028bd141cd715c30fcd Mon Sep 17 00:00:00 2001 From: Mahmoud Bentriou <mahmoud.bentriou@centralesupelec.fr> Date: Mon, 16 Nov 2020 14:13:31 +0100 Subject: [PATCH] Improvement of get_path_module() --- core/MarkovProcesses.jl | 5 +++-- core/model.jl | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/MarkovProcesses.jl b/core/MarkovProcesses.jl index 04ac4c7..faa787c 100644 --- a/core/MarkovProcesses.jl +++ b/core/MarkovProcesses.jl @@ -4,10 +4,11 @@ import Base: +, -, getfield, getindex export Model, ContinuousTimeModel, DiscreteTimeModel export simulate, set_param!, get_param -export load_model +export is_bounded +export load_model, get_module_path include("model.jl") -export Observations, AbstractTrajectory +export Observations, AbstractTrajectory, Trajectory export +,-,δ,get_obs_variables,get_states_number include("observations.jl") diff --git a/core/model.jl b/core/model.jl index 6bea159..60ed622 100644 --- a/core/model.jl +++ b/core/model.jl @@ -84,7 +84,8 @@ function simulate(m::Model, n::Int; bound::Float64 = Inf)::AbstractObservations function set_param!(m::Model, p::Vector{Float64})::Nothing end function get_param(m::Model)::Vector{Float64} end +get_module_path() = dirname(dirname(pathof(@__MODULE__))) function load_model(name_model::String) - include(pathof(@__MODULE__) * "/../../models/" * name_model * ".jl") + include(get_module_path() * "/models/" * name_model * ".jl") end -- GitLab