From c7ec64fe2b063cb9771b817162ff94338fe7e06e Mon Sep 17 00:00:00 2001
From: Hu Zhao <zhao@mbd.rwth-aachen.de>
Date: Wed, 2 Nov 2022 17:24:46 +0100
Subject: [PATCH] refactor: use flatter import

---
 src/psimpy/inference/active_learning.py   | 10 +++++-----
 src/psimpy/inference/bayes_inference.py   |  6 +++---
 src/psimpy/sampler/latin.py               |  2 +-
 src/psimpy/sampler/metropolis_hastings.py |  4 ++--
 src/psimpy/sampler/saltelli.py            |  2 +-
 src/psimpy/simulator/mass_point_model.py  |  6 +++---
 src/psimpy/simulator/ravaflow24.py        |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/psimpy/inference/active_learning.py b/src/psimpy/inference/active_learning.py
index 5d58c7f..c989344 100644
--- a/src/psimpy/inference/active_learning.py
+++ b/src/psimpy/inference/active_learning.py
@@ -1,13 +1,13 @@
-import numpy as np
 import sys
+import numpy as np
 from scipy import optimize
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
-from psimpy.simulator.run_simulator import RunSimulator
-from psimpy.sampler.latin import LHS
-from psimpy.emulator.robustgasp import ScalarGaSP
-from psimpy.utility.util_funcs import check_bounds
+from psimpy.simulator import RunSimulator
+from psimpy.sampler import LHS
+from psimpy.emulator import ScalarGaSP
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 
diff --git a/src/psimpy/inference/bayes_inference.py b/src/psimpy/inference/bayes_inference.py
index 68095dd..183025f 100644
--- a/src/psimpy/inference/bayes_inference.py
+++ b/src/psimpy/inference/bayes_inference.py
@@ -1,12 +1,12 @@
-import numpy as np
 import sys
+import numpy as np
 from abc import ABC
 from abc import abstractmethod
-from psimpy.sampler.metropolis_hastings import MetropolisHastings
-from psimpy.utility.util_funcs import check_bounds
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
+from psimpy.sampler import MetropolisHastings
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 _max_float = 10**(sys.float_info.max_10_exp)
diff --git a/src/psimpy/sampler/latin.py b/src/psimpy/sampler/latin.py
index 3804d80..05a4da4 100644
--- a/src/psimpy/sampler/latin.py
+++ b/src/psimpy/sampler/latin.py
@@ -1,8 +1,8 @@
 import numpy as np
 from scipy.spatial.distance import pdist
-from psimpy.utility.util_funcs import check_bounds, scale_samples
 from typing import Union
 from beartype import beartype
+from psimpy.utility import check_bounds, scale_samples
 
 class LHS:
     
diff --git a/src/psimpy/sampler/metropolis_hastings.py b/src/psimpy/sampler/metropolis_hastings.py
index dfb2d23..c19438e 100644
--- a/src/psimpy/sampler/metropolis_hastings.py
+++ b/src/psimpy/sampler/metropolis_hastings.py
@@ -1,9 +1,9 @@
-import numpy as np
 import sys
-from psimpy.utility.util_funcs import check_bounds
+import numpy as np
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 
diff --git a/src/psimpy/sampler/saltelli.py b/src/psimpy/sampler/saltelli.py
index f7e1de7..5d53486 100644
--- a/src/psimpy/sampler/saltelli.py
+++ b/src/psimpy/sampler/saltelli.py
@@ -1,8 +1,8 @@
 from SALib.sample import saltelli
 import numpy as np
-from psimpy.utility.util_funcs import check_bounds
 from typing import Union
 from beartype import beartype
+from psimpy.utility import check_bounds
 
 class Saltelli:
     
diff --git a/src/psimpy/simulator/mass_point_model.py b/src/psimpy/simulator/mass_point_model.py
index 4946421..77fbd5c 100644
--- a/src/psimpy/simulator/mass_point_model.py
+++ b/src/psimpy/simulator/mass_point_model.py
@@ -1,9 +1,9 @@
-import numpy as np
-import linecache
+import os
 import math
+import linecache
+import numpy as np
 from scipy.integrate import ode
 from scipy.interpolate import interp2d
-import os
 from typing import Union
 from beartype import beartype
 
diff --git a/src/psimpy/simulator/ravaflow24.py b/src/psimpy/simulator/ravaflow24.py
index 8262421..f7106fa 100755
--- a/src/psimpy/simulator/ravaflow24.py
+++ b/src/psimpy/simulator/ravaflow24.py
@@ -1,6 +1,6 @@
-import numpy as np
 import os
 import linecache
+import numpy as np
 from scipy.interpolate import interp2d
 from typing import Union
 from beartype import beartype
-- 
GitLab