From 9c967aab7e388ebbe017762c6ebaf4b7b0c5b119 Mon Sep 17 00:00:00 2001
From: Mahmoud Bentriou <mahmoud.bentriou@centralesupelec.fr>
Date: Sat, 22 May 2021 00:13:15 +0200
Subject: [PATCH] Move of imports in abc_smc
---
algorithms/abc_smc.jl | 13 -------------
core/MarkovProcesses.jl | 12 ++++++++++--
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/algorithms/abc_smc.jl b/algorithms/abc_smc.jl
index fe74b14..9d5b830 100644
--- a/algorithms/abc_smc.jl
+++ b/algorithms/abc_smc.jl
@@ -1,17 +1,4 @@
-import StatsBase: mean, median, std, cov, ProbabilityWeights
-import Statistics: quantile
-import NearestNeighbors: KDTree, knn
-import Distributions: MvNormal, Categorical
-import Random: rand!
-
-import Distributed: @sync, @async, nworkers, nprocs, workers
-import DistributedArrays: DArray, dzeros, convert, localpart
-using Distributed
-using LinearAlgebra
-using DelimitedFiles
-using Logging
-
include("_utils_abc.jl")
struct ResultAbc
diff --git a/core/MarkovProcesses.jl b/core/MarkovProcesses.jl
index 11893c4..33ac30a 100644
--- a/core/MarkovProcesses.jl
+++ b/core/MarkovProcesses.jl
@@ -6,19 +6,27 @@ import Base: copy, getfield, getindex, getproperty, lastindex
import Base: setindex!, setproperty!, fill!, copyto!
import Dates
-import Distributed: @everywhere, @distributed
-import Distributions: Product, Uniform, Normal
+import DelimitedFiles: readdlm, writedlm
+import Distributed: @everywhere, @distributed, @sync, @async, nworkers, nprocs, workers
+import Distributed: nworkers, nprocs, workers, remotecall_fetch
+import DistributedArrays: DArray, dzeros, convert, localpart
+import Distributions: Product, Uniform, Normal, MvNormal, Categorical
import Distributions: Distribution, Univariate, Continuous,
UnivariateDistribution, DiscreteUnivariateDistribution,
MultivariateDistribution, product_distribution
import Distributions: insupport, isbounded, ncategories, pdf
import FunctionWrappers: FunctionWrapper
+import Logging: @info
+using LinearAlgebra
+import NearestNeighbors: KDTree, knn
import Random: rand, rand!
import ScikitLearn
import ScikitLearn: fit!, predict, get_params
import ScikitLearn.GridSearch: GridSearchCV
import SharedArrays: SharedVector, SharedMatrix, sdata
import StaticArrays: SVector, @SVector
+import Statistics: quantile
+import StatsBase: mean, median, std, cov, ProbabilityWeights
# Python objects import
import PyCall: PyNULL
const RandomForestClassifier = PyNULL()
--
GitLab