diff --git a/FoldOptLib/fold_modelling/engine.py b/FoldOptLib/fold_modelling/engine.py index 86b9cfe..962c71e 100644 --- a/FoldOptLib/fold_modelling/engine.py +++ b/FoldOptLib/fold_modelling/engine.py @@ -2,8 +2,12 @@ import numpy as np import pandas as pd from LoopStructural import GeologicalModel -from ..helper._helper import * -from ..helper.utils import * +from ..helper.utils import ( + fourier_series, + create_dataset, + rotate_vector, + calculate_intersection_lineation, +) # from from ..input.input_data_processor import InputDataProcessor from ..from_loopstructural._fold import FoldEvent diff --git a/FoldOptLib/fold_modelling_plugin/helper/__init__.py b/FoldOptLib/fold_modelling_plugin/helper/__init__.py index c641c6b..c88eef0 100644 --- a/FoldOptLib/fold_modelling_plugin/helper/__init__.py +++ b/FoldOptLib/fold_modelling_plugin/helper/__init__.py @@ -1 +1,45 @@ -from .utils import * # noqa: F401,F403 - re-export utilities +from .utils import ( + calculate_semivariogram, + get_predicted_rotation_angle, + fourier_series, + fourier_series_x_intercepts, + save_load_object, + strike_dip_to_vectors, + strike_dip_to_vector, + normal_vector_to_strike_and_dip, + rotate_vector, + get_fold_curves, + create_dict, + create_gradient_dict, + create_fold_frame_dataset, + create_dataset, + make_dataset, + get_wavelength_guesses, + objective_wrapper, + calculate_intersection_lineation, + axial_plane_stereonet, + clean_knowledge_dict, +) + +__all__ = [ + "calculate_semivariogram", + "get_predicted_rotation_angle", + "fourier_series", + "fourier_series_x_intercepts", + "save_load_object", + "strike_dip_to_vectors", + "strike_dip_to_vector", + "normal_vector_to_strike_and_dip", + "rotate_vector", + "get_fold_curves", + "create_dict", + "create_gradient_dict", + "create_fold_frame_dataset", + "create_dataset", + "make_dataset", + "get_wavelength_guesses", + "objective_wrapper", + "calculate_intersection_lineation", + "axial_plane_stereonet", + "clean_knowledge_dict", +] diff --git a/FoldOptLib/helper/__init__.py b/FoldOptLib/helper/__init__.py index c6872dd..1defda8 100644 --- a/FoldOptLib/helper/__init__.py +++ b/FoldOptLib/helper/__init__.py @@ -1,2 +1,55 @@ -from ._helper import * -from .utils import * +from ._helper import ( + gaussian_func, + fourier_series_2, + get_fold_curves as _helper_get_fold_curves, + create_dict as _helper_create_dict, + create_gradient_dict as _helper_create_gradient_dict, + make_dataset, +) + +from .utils import ( + calculate_semivariogram, + get_predicted_rotation_angle, + fourier_series, + fourier_series_x_intercepts, + save_load_object, + strike_dip_to_vectors, + strike_dip_to_vector, + normal_vector_to_strike_and_dip, + rotate_vector, + get_fold_curves, + create_dict, + create_gradient_dict, + create_fold_frame_dataset, + create_dataset, + get_wavelength_guesses, + objective_wrapper, + calculate_intersection_lineation, + axial_plane_stereonet, + clean_knowledge_dict, +) + +__all__ = [ + "gaussian_func", + "fourier_series_2", + "get_fold_curves", + "create_dict", + "create_gradient_dict", + "make_dataset", + "calculate_semivariogram", + "get_predicted_rotation_angle", + "fourier_series", + "fourier_series_x_intercepts", + "save_load_object", + "strike_dip_to_vectors", + "strike_dip_to_vector", + "normal_vector_to_strike_and_dip", + "rotate_vector", + "create_fold_frame_dataset", + "create_dataset", + "get_wavelength_guesses", + "objective_wrapper", + "calculate_intersection_lineation", + "axial_plane_stereonet", + "clean_knowledge_dict", +] diff --git a/FoldOptLib/input/input_data_processor.py b/FoldOptLib/input/input_data_processor.py index dcb4ded..ee51a9e 100644 --- a/FoldOptLib/input/input_data_processor.py +++ b/FoldOptLib/input/input_data_processor.py @@ -2,8 +2,7 @@ from typing import List, Optional, Dict import numpy as np from .input_data_checker import CheckInputData -from ..helper._helper import * -from ..helper.utils import * +from ..helper.utils import strike_dip_to_vectors def _normalise_gradient(gradient: np.ndarray) -> np.ndarray: diff --git a/FoldOptLib/objective_functions/geological_knowledge.py b/FoldOptLib/objective_functions/geological_knowledge.py index c51eda0..12c081d 100644 --- a/FoldOptLib/objective_functions/geological_knowledge.py +++ b/FoldOptLib/objective_functions/geological_knowledge.py @@ -2,8 +2,7 @@ from scipy.optimize import NonlinearConstraint, BFGS # from LoopStructural.modelling.features.fold import fourier_series from typing import Union, Dict, List -from ..helper._helper import * -from ..helper.utils import * + from ..splot.splot_processor import SPlotProcessor from .von_mises_fisher import VonMisesFisher from .gaussian import gaussian_log_likelihood diff --git a/FoldOptLib/optimisers/fold_optimiser.py b/FoldOptLib/optimisers/fold_optimiser.py index 8ed4207..b47686a 100644 --- a/FoldOptLib/optimisers/fold_optimiser.py +++ b/FoldOptLib/optimisers/fold_optimiser.py @@ -3,7 +3,6 @@ import numpy as np # from ..input.input_data_checker import CheckInputData # from ..helper._helper import * -from ..helper.utils import * # from .base_optimiser import BaseOptimiser from abc import ABC, abstractmethod from scipy.optimize import minimize, differential_evolution, NonlinearConstraint diff --git a/FoldOptLib/optimisers/fourier_optimiser.py b/FoldOptLib/optimisers/fourier_optimiser.py index 146e84b..5e9abca 100644 --- a/FoldOptLib/optimisers/fourier_optimiser.py +++ b/FoldOptLib/optimisers/fourier_optimiser.py @@ -11,7 +11,11 @@ from ..objective_functions.geological_knowledge import GeologicalKnowledgeFunctions from .fold_optimiser import FoldOptimiser from ..objective_functions.gaussian import loglikelihood_fourier_series -from ..helper.utils import * +from ..helper.utils import ( + calculate_semivariogram, + get_wavelength_guesses, + objective_wrapper, +) # from ..helper._helper import * diff --git a/FoldOptLib/splot/splot_processor.py b/FoldOptLib/splot/splot_processor.py index 4101518..3ba27ad 100644 --- a/FoldOptLib/splot/splot_processor.py +++ b/FoldOptLib/splot/splot_processor.py @@ -1,4 +1,4 @@ -from ..helper.utils import * +from ..helper.utils import fourier_series_x_intercepts import numpy as np from LoopStructural.modelling.features.fold import fourier_series diff --git a/tests/unit/fold_model/test_engine.py b/tests/unit/fold_model/test_engine.py index 7cdd1c3..8e47fcf 100644 --- a/tests/unit/fold_model/test_engine.py +++ b/tests/unit/fold_model/test_engine.py @@ -4,7 +4,7 @@ import sys # sys.path.append("/FoldModellingPlugin/FoldModellingPlugin/fold_modelling") -from FoldOptLib.FoldModellingPlugin.fold_modelling.engine import FoldModel +from FoldOptLib.fold_modelling.engine import FoldModel class TestFoldModel(unittest.TestCase): diff --git a/tests/unit/input/input_processor.py b/tests/unit/input/input_processor.py index 14b7be1..dfaa01b 100644 --- a/tests/unit/input/input_processor.py +++ b/tests/unit/input/input_processor.py @@ -1,7 +1,6 @@ import unittest import pandas as pd import numpy as np -from FoldOptLib.fold_modelling_plugin.helper.utils import * from FoldOptLib.fold_modelling_plugin.input.input_data_processor import InputDataProcessor diff --git a/tests/unit/optimisers/test_fold_optimiser.py b/tests/unit/optimisers/test_fold_optimiser.py index c528843..1779eb9 100644 --- a/tests/unit/optimisers/test_fold_optimiser.py +++ b/tests/unit/optimisers/test_fold_optimiser.py @@ -1,7 +1,7 @@ import unittest import numpy as np -from FoldOptLib.FoldModellingPlugin.optimisers.fold_optimiser import FoldOptimiser +from FoldOptLib.optimisers.fold_optimiser import FoldOptimiser class TestFoldOptimiser(unittest.TestCase): diff --git a/tests/unit/optimisers/test_fourier_optimiser.py b/tests/unit/optimisers/test_fourier_optimiser.py index 33b4e93..7a7f5bb 100644 --- a/tests/unit/optimisers/test_fourier_optimiser.py +++ b/tests/unit/optimisers/test_fourier_optimiser.py @@ -1,8 +1,9 @@ import unittest import numpy as np from sklearn.preprocessing import StandardScaler, MinMaxScaler, MaxAbsScaler, normalize -from FoldOptLib.FoldModellingPlugin.optimisers.fourier_optimiser import FourierSeriesOptimiser -from FoldOptLib.FoldModellingPlugin.helper.utils import * +from FoldOptLib.fold_modelling_plugin.optimisers.fourier_optimiser import ( + FourierSeriesOptimiser, +) class TestFourierSeriesOptimiser(unittest.TestCase): diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py index 2b1af0b..74c6098 100644 --- a/tests/unit/utils/test_utils.py +++ b/tests/unit/utils/test_utils.py @@ -5,7 +5,18 @@ import os # from FoldModellingPlugin.FoldModellingPlugin.from_loopstructural._svariogram import SVariogram -from FoldOptLib.fold_modelling_plugin.helper.utils import * +from FoldOptLib.fold_modelling_plugin.helper.utils import ( + get_predicted_rotation_angle, + fourier_series, + fourier_series_x_intercepts, + save_load_object, + strike_dip_to_vectors, + strike_dip_to_vector, + rotate_vector, + create_dict, + create_gradient_dict, + make_dataset, +) class TestGeologicalFunctions(unittest.TestCase):