From 108fdb53e15f3266f96f0aad825293893de4bf29 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Mon, 3 Jun 2024 20:57:58 +0100 Subject: [PATCH] Fixed check_averaging circular import and sorted import ordering --- gprMax/cmds_geometry/box.py | 4 ++-- gprMax/cmds_geometry/cmds_geometry.py | 21 +++++++++++++++++++++ gprMax/cmds_geometry/cone.py | 3 +-- gprMax/cmds_geometry/cylinder.py | 3 +-- gprMax/cmds_geometry/cylindrical_sector.py | 3 +-- gprMax/cmds_geometry/edge.py | 3 ++- gprMax/cmds_geometry/ellipsoid.py | 3 +-- gprMax/cmds_geometry/fractal_box.py | 6 ++++-- gprMax/cmds_geometry/plate.py | 3 ++- gprMax/cmds_geometry/sphere.py | 3 +-- gprMax/cmds_geometry/triangle.py | 3 +-- gprMax/hash_cmds_geometry.py | 22 +--------------------- 12 files changed, 38 insertions(+), 39 deletions(-) diff --git a/gprMax/cmds_geometry/box.py b/gprMax/cmds_geometry/box.py index e9d1cf7a..a0c0cee3 100644 --- a/gprMax/cmds_geometry/box.py +++ b/gprMax/cmds_geometry/box.py @@ -23,9 +23,9 @@ import numpy as np import gprMax.config as config from ..cython.geometry_primitives import build_box -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry, rotate_2point_object +from .cmds_geometry import (UserObjectGeometry, check_averaging, + rotate_2point_object) logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/cmds_geometry.py b/gprMax/cmds_geometry/cmds_geometry.py index 00c19529..41b6b778 100644 --- a/gprMax/cmds_geometry/cmds_geometry.py +++ b/gprMax/cmds_geometry/cmds_geometry.py @@ -64,6 +64,27 @@ class UserObjectGeometry: return "" +def check_averaging(averaging): + """Check and set material averaging value. + + Args: + averaging: string for input value from hash command - should be 'y' + or 'n'. + + Returns: + averaging: boolean for geometry object material averaging. + """ + + if averaging == "y": + averaging = True + elif averaging == "n": + averaging = False + else: + logger.exception("Averaging should be either y or n") + + return averaging + + def rotate_point(p, axis, angle, origin=(0, 0, 0)): """Rotates a point. diff --git a/gprMax/cmds_geometry/cone.py b/gprMax/cmds_geometry/cone.py index c1a6ee2c..60f464e0 100644 --- a/gprMax/cmds_geometry/cone.py +++ b/gprMax/cmds_geometry/cone.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_cone -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry +from .cmds_geometry import UserObjectGeometry, check_averaging logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/cylinder.py b/gprMax/cmds_geometry/cylinder.py index d96dd7fa..cc53c4ea 100644 --- a/gprMax/cmds_geometry/cylinder.py +++ b/gprMax/cmds_geometry/cylinder.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_cylinder -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry +from .cmds_geometry import UserObjectGeometry, check_averaging logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/cylindrical_sector.py b/gprMax/cmds_geometry/cylindrical_sector.py index 13142783..42e040d0 100644 --- a/gprMax/cmds_geometry/cylindrical_sector.py +++ b/gprMax/cmds_geometry/cylindrical_sector.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_cylindrical_sector -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry +from .cmds_geometry import UserObjectGeometry, check_averaging logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/edge.py b/gprMax/cmds_geometry/edge.py index e6a0ca88..45acca04 100644 --- a/gprMax/cmds_geometry/edge.py +++ b/gprMax/cmds_geometry/edge.py @@ -20,7 +20,8 @@ import logging import numpy as np -from ..cython.geometry_primitives import build_edge_x, build_edge_y, build_edge_z +from ..cython.geometry_primitives import (build_edge_x, build_edge_y, + build_edge_z) from .cmds_geometry import UserObjectGeometry, rotate_2point_object logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/ellipsoid.py b/gprMax/cmds_geometry/ellipsoid.py index fa5e825e..4c616472 100644 --- a/gprMax/cmds_geometry/ellipsoid.py +++ b/gprMax/cmds_geometry/ellipsoid.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_ellipsoid -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry +from .cmds_geometry import UserObjectGeometry, check_averaging logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/fractal_box.py b/gprMax/cmds_geometry/fractal_box.py index d89bd346..d33d3fe4 100644 --- a/gprMax/cmds_geometry/fractal_box.py +++ b/gprMax/cmds_geometry/fractal_box.py @@ -21,11 +21,13 @@ import logging import numpy as np import gprMax.config as config -from gprMax.cmds_geometry.cmds_geometry import UserObjectGeometry, rotate_2point_object +from gprMax.cmds_geometry.cmds_geometry import (UserObjectGeometry, + rotate_2point_object) from gprMax.fractals import FractalVolume from gprMax.materials import ListMaterial -from ..cython.geometry_primitives import build_voxels_from_array, build_voxels_from_array_mask +from ..cython.geometry_primitives import (build_voxels_from_array, + build_voxels_from_array_mask) logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/plate.py b/gprMax/cmds_geometry/plate.py index 8ac92cb2..90557b0e 100644 --- a/gprMax/cmds_geometry/plate.py +++ b/gprMax/cmds_geometry/plate.py @@ -20,7 +20,8 @@ import logging import numpy as np -from ..cython.geometry_primitives import build_face_xy, build_face_xz, build_face_yz +from ..cython.geometry_primitives import (build_face_xy, build_face_xz, + build_face_yz) from .cmds_geometry import UserObjectGeometry, rotate_2point_object logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/sphere.py b/gprMax/cmds_geometry/sphere.py index b4e0e607..494acc2e 100644 --- a/gprMax/cmds_geometry/sphere.py +++ b/gprMax/cmds_geometry/sphere.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_sphere -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry +from .cmds_geometry import UserObjectGeometry, check_averaging logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/triangle.py b/gprMax/cmds_geometry/triangle.py index 29919de9..898c2362 100644 --- a/gprMax/cmds_geometry/triangle.py +++ b/gprMax/cmds_geometry/triangle.py @@ -21,9 +21,8 @@ import logging import numpy as np from ..cython.geometry_primitives import build_triangle -from ..hash_cmds_geometry import check_averaging from ..materials import Material -from .cmds_geometry import UserObjectGeometry, rotate_point +from .cmds_geometry import UserObjectGeometry, check_averaging, rotate_point logger = logging.getLogger(__name__) diff --git a/gprMax/hash_cmds_geometry.py b/gprMax/hash_cmds_geometry.py index 1b3c5e90..089cc2ae 100644 --- a/gprMax/hash_cmds_geometry.py +++ b/gprMax/hash_cmds_geometry.py @@ -33,32 +33,12 @@ from .cmds_geometry.fractal_box import FractalBox from .cmds_geometry.plate import Plate from .cmds_geometry.sphere import Sphere from .cmds_geometry.triangle import Triangle +from .cmds_geometry.cmds_geometry import check_averaging from .utilities.utilities import round_value logger = logging.getLogger(__name__) -def check_averaging(averaging): - """Check and set material averaging value. - - Args: - averaging: string for input value from hash command - should be 'y' - or 'n'. - - Returns: - averaging: boolean for geometry object material averaging. - """ - - if averaging == "y": - averaging = True - elif averaging == "n": - averaging = False - else: - logger.exception("Averaging should be either y or n") - - return averaging - - def process_geometrycmds(geometry): """Checks the validity of command parameters, creates instances of classes of parameters, and calls functions to directly set arrays solid, rigid