Skip to content

Commit d68df1f

Browse files
rabii-chaaranirabii-chaarani
committed
Replace wildcard imports with explicit imports
1 parent 7b05ff2 commit d68df1f

13 files changed

Lines changed: 131 additions & 18 deletions

File tree

‎FoldOptLib/fold_modelling/engine.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
import numpy as np
33
import pandas as pd
44
from LoopStructural import GeologicalModel
5-
from ..helper._helper import *
6-
from ..helper.utils import *
5+
from ..helper.utils import (
6+
fourier_series,
7+
create_dataset,
8+
rotate_vector,
9+
calculate_intersection_lineation,
10+
)
711
# from
812
from ..input.input_data_processor import InputDataProcessor
913
from ..from_loopstructural._fold import FoldEvent

‎FoldOptLib/fold_modelling_plugin/helper/__init__.py‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,45 @@
1-
from .utils import * # noqa: F401,F403 - re-export utilities
1+
from .utils import (
2+
calculate_semivariogram,
3+
get_predicted_rotation_angle,
4+
fourier_series,
5+
fourier_series_x_intercepts,
6+
save_load_object,
7+
strike_dip_to_vectors,
8+
strike_dip_to_vector,
9+
normal_vector_to_strike_and_dip,
10+
rotate_vector,
11+
get_fold_curves,
12+
create_dict,
13+
create_gradient_dict,
14+
create_fold_frame_dataset,
15+
create_dataset,
16+
make_dataset,
17+
get_wavelength_guesses,
18+
objective_wrapper,
19+
calculate_intersection_lineation,
20+
axial_plane_stereonet,
21+
clean_knowledge_dict,
22+
)
23+
24+
__all__ = [
25+
"calculate_semivariogram",
26+
"get_predicted_rotation_angle",
27+
"fourier_series",
28+
"fourier_series_x_intercepts",
29+
"save_load_object",
30+
"strike_dip_to_vectors",
31+
"strike_dip_to_vector",
32+
"normal_vector_to_strike_and_dip",
33+
"rotate_vector",
34+
"get_fold_curves",
35+
"create_dict",
36+
"create_gradient_dict",
37+
"create_fold_frame_dataset",
38+
"create_dataset",
39+
"make_dataset",
40+
"get_wavelength_guesses",
41+
"objective_wrapper",
42+
"calculate_intersection_lineation",
43+
"axial_plane_stereonet",
44+
"clean_knowledge_dict",
45+
]

‎FoldOptLib/helper/__init__.py‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,55 @@
1-
from ._helper import *
2-
from .utils import *
1+
from ._helper import (
2+
gaussian_func,
3+
fourier_series_2,
4+
get_fold_curves as _helper_get_fold_curves,
5+
create_dict as _helper_create_dict,
6+
create_gradient_dict as _helper_create_gradient_dict,
7+
make_dataset,
8+
)
9+
10+
from .utils import (
11+
calculate_semivariogram,
12+
get_predicted_rotation_angle,
13+
fourier_series,
14+
fourier_series_x_intercepts,
15+
save_load_object,
16+
strike_dip_to_vectors,
17+
strike_dip_to_vector,
18+
normal_vector_to_strike_and_dip,
19+
rotate_vector,
20+
get_fold_curves,
21+
create_dict,
22+
create_gradient_dict,
23+
create_fold_frame_dataset,
24+
create_dataset,
25+
get_wavelength_guesses,
26+
objective_wrapper,
27+
calculate_intersection_lineation,
28+
axial_plane_stereonet,
29+
clean_knowledge_dict,
30+
)
31+
32+
__all__ = [
33+
"gaussian_func",
34+
"fourier_series_2",
35+
"get_fold_curves",
36+
"create_dict",
37+
"create_gradient_dict",
38+
"make_dataset",
39+
"calculate_semivariogram",
40+
"get_predicted_rotation_angle",
41+
"fourier_series",
42+
"fourier_series_x_intercepts",
43+
"save_load_object",
44+
"strike_dip_to_vectors",
45+
"strike_dip_to_vector",
46+
"normal_vector_to_strike_and_dip",
47+
"rotate_vector",
48+
"create_fold_frame_dataset",
49+
"create_dataset",
50+
"get_wavelength_guesses",
51+
"objective_wrapper",
52+
"calculate_intersection_lineation",
53+
"axial_plane_stereonet",
54+
"clean_knowledge_dict",
55+
]

‎FoldOptLib/input/input_data_processor.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from typing import List, Optional, Dict
33
import numpy as np
44
from .input_data_checker import CheckInputData
5-
from ..helper._helper import *
6-
from ..helper.utils import *
5+
from ..helper.utils import strike_dip_to_vectors
76

87

98
def _normalise_gradient(gradient: np.ndarray) -> np.ndarray:

‎FoldOptLib/objective_functions/geological_knowledge.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from scipy.optimize import NonlinearConstraint, BFGS
33
# from LoopStructural.modelling.features.fold import fourier_series
44
from typing import Union, Dict, List
5-
from ..helper._helper import *
6-
from ..helper.utils import *
5+
76
from ..splot.splot_processor import SPlotProcessor
87
from .von_mises_fisher import VonMisesFisher
98
from .gaussian import gaussian_log_likelihood

‎FoldOptLib/optimisers/fold_optimiser.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import numpy as np
44
# from ..input.input_data_checker import CheckInputData
55
# from ..helper._helper import *
6-
from ..helper.utils import *
76
# from .base_optimiser import BaseOptimiser
87
from abc import ABC, abstractmethod
98
from scipy.optimize import minimize, differential_evolution, NonlinearConstraint

‎FoldOptLib/optimisers/fourier_optimiser.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
from ..objective_functions.geological_knowledge import GeologicalKnowledgeFunctions
1212
from .fold_optimiser import FoldOptimiser
1313
from ..objective_functions.gaussian import loglikelihood_fourier_series
14-
from ..helper.utils import *
14+
from ..helper.utils import (
15+
calculate_semivariogram,
16+
get_wavelength_guesses,
17+
objective_wrapper,
18+
)
1519

1620

1721
# from ..helper._helper import *

‎FoldOptLib/splot/splot_processor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ..helper.utils import *
1+
from ..helper.utils import fourier_series_x_intercepts
22
import numpy as np
33
from LoopStructural.modelling.features.fold import fourier_series
44

‎tests/unit/fold_model/test_engine.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import sys
55

66
# sys.path.append("/FoldModellingPlugin/FoldModellingPlugin/fold_modelling")
7-
from FoldOptLib.FoldModellingPlugin.fold_modelling.engine import FoldModel
7+
from FoldOptLib.fold_modelling.engine import FoldModel
88

99

1010
class TestFoldModel(unittest.TestCase):

‎tests/unit/input/input_processor.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import unittest
22
import pandas as pd
33
import numpy as np
4-
from FoldOptLib.fold_modelling_plugin.helper.utils import *
54
from FoldOptLib.fold_modelling_plugin.input.input_data_processor import InputDataProcessor
65

76

0 commit comments

Comments
 (0)