Optimized some imports

Author: mlau154

pymead/analysis/calc_aero_data.py

@@ -1,4 +1,3 @@
-import signal
 import subprocess
 import os
 import typing
@@ -18,7 +17,27 @@
 from pymead.analysis.compressible_flow import calculate_normal_shock_total_pressure_ratio
 from pymead.utils.file_conversion import convert_ps_to_svg
 from pymead.utils.geometry import convert_numpy_array_to_shapely_LineString
-from pymead.utils.read_write_files import write_tuple_tuple_to_file, save_data
+from pymead.utils.read_write_files import save_data
+import os
+import subprocess
+import time
+import typing
+from collections import namedtuple
+from copy import deepcopy
+
+import numpy as np
+from matplotlib import pyplot as plt
+from scipy.interpolate import CloughTocher2DInterpolator
+from shapely.geometry import MultiPoint
+
+from pymead.analysis.compressible_flow import calculate_normal_shock_total_pressure_ratio
+from pymead.analysis.read_aero_data import read_aero_data_from_xfoil, read_Cp_from_file_xfoil, read_bl_data_from_mses, \
+    read_forces_from_mses, read_grid_stats_from_mses, read_field_from_mses, read_streamline_grid_from_mses, \
+    flow_var_idx, convert_blade_file_to_3d_array, read_actuator_disk_data_mses, read_Mach_from_mses_file
+from pymead.core.mea import MEA
+from pymead.utils.file_conversion import convert_ps_to_svg
+from pymead.utils.geometry import convert_numpy_array_to_shapely_LineString
+from pymead.utils.read_write_files import save_data
 
 SVG_PLOTS = ['Mach_contours', 'grid', 'grid_zoom']
 SVG_SETTINGS_TR = {

pymead/gui/gui.py

@@ -21,7 +21,7 @@
 from pymoo.factory import get_decomposition
 from pyqtgraph.exporters import CSVExporter, SVGExporter
 
-from pymead import ICON_DIR, GUI_SETTINGS_DIR, GUI_THEMES_DIR, GUI_DEFAULT_AIRFOIL_DIR, q_settings
+from pymead import ICON_DIR, GUI_SETTINGS_DIR, GUI_THEMES_DIR, q_settings
 from pymead import RESOURCE_DIR
 from pymead.analysis.calc_aero_data import SVG_PLOTS, SVG_SETTINGS_TR
 from pymead.analysis.calc_aero_data import calculate_aero_data
@@ -62,12 +62,11 @@
 from pymead.utils.airfoil_matching import match_airfoil
 from pymead.utils.dict_recursion import compare_dicts_floating_precision
 from pymead.utils.get_airfoil import extract_data_from_airfoiltools
-from pymead.utils.misc import count_func_strs, get_setting
+from pymead.utils.misc import get_setting
 from pymead.utils.misc import make_ga_opt_dir
 from pymead.utils.read_write_files import load_data, save_data
 from pymead.utils.version_check import using_latest
 
-
 # Suppress the following DeprecationWarning: sipPyTypeDict() is deprecated, the extension module
 # should use sipPyTypeDictRef() instead
 warnings.filterwarnings("ignore", category=DeprecationWarning)

pymead/optimization/opt_callback.py

@@ -1,15 +1,13 @@
 import typing
 from abc import abstractmethod
+
+import numpy as np
+import pyqtgraph as pg
 from PyQt5.QtCore import QObject
-from PyQt5.QtGui import QFontDatabase
 
-from pymead.core.mea import MEA
+from pymead.gui.aero_forces_graphs import DragGraph, CpGraph
 from pymead.gui.opt_airfoil_graph import OptAirfoilGraph
 from pymead.gui.parallel_coords_graph import ParallelCoordsGraph
-from pymead.gui.aero_forces_graphs import DragGraph, CpGraph
-import pyqtgraph as pg
-import numpy as np
-from copy import deepcopy
 
 
 class OptCallback(QObject):

pymead/optimization/opt_setup.py

@@ -1,17 +1,17 @@
 
+import os
+import re
+from copy import deepcopy
+
+import numpy as np
 from pymoo.core.problem import Problem
-from pymoo.util.termination.f_tol import MultiObjectiveSpaceToleranceTermination
-from pymoo.util.termination.default import MultiObjectiveDefaultTermination
-from pymoo.util.display import Display
 from pymoo.factory import get_decomposition
-from copy import deepcopy
+from pymoo.util.display import Display
+from pymoo.util.termination.default import MultiObjectiveDefaultTermination
+from pymoo.util.termination.f_tol import MultiObjectiveSpaceToleranceTermination
 
 from pymead.gui.input_dialog import convert_dialog_to_mset_settings, convert_dialog_to_mses_settings, \
     convert_dialog_to_mplot_settings
-import os
-import numpy as np
-import re
-
 
 multi_point_keys_mses = {
     0: 'MACHIN',

pymead/optimization/pop_chrom.py

@@ -1,14 +1,13 @@
 import typing
+from copy import deepcopy
 from multiprocessing import Pool, active_children
 from multiprocessing.connection import Connection
-from copy import deepcopy
 
 import numpy as np
 
+from pymead.analysis.calc_aero_data import calculate_aero_data
 from pymead.core.airfoil import Airfoil
 from pymead.core.geometry_collection import GeometryCollection
-
-from pymead.analysis.calc_aero_data import calculate_aero_data
 from pymead.utils.pymead_mp import kill_child_processes
 
 

pymead/utils/pymead_mp.py

@@ -1,4 +1,5 @@
 import signal
+
 import psutil