FiberFusing 1.9.2__tar.gz → 1.9.3__tar.gz

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/FiberFusing/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.9.2'
-__version_tuple__ = version_tuple = (1, 9, 2)
+__version__ = version = '1.9.3'
+__version_tuple__ = version_tuple = (1, 9, 3)
 
-__commit_id__ = commit_id = 'gf65944ebc'
+__commit_id__ = commit_id = 'g2364e1c6d'

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/FiberFusing/geometry.py

@@ -345,6 +345,14 @@ class Geometry():
         for structure in self.structure_list:
             if isinstance(structure, FiberFusing.background.BackGround):
                 continue
+
+            if isinstance(structure, FiberFusing.fiber.GenericFiber):
+                continue
+
+            if isinstance(structure, FiberFusing.profile.Profile):
+                structure.plot(ax=ax, show=False, show_added=False, show_removed=False, show_centers=False, show_fibers=True)
+                continue
+
             structure.plot(ax=ax, show=False)
 
         ax.set(title='Fiber structure', xlabel=r'x-distance [m]', ylabel=r'y-distance [m]')

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/FiberFusing/profile.py

@@ -219,10 +219,9 @@ class Profile(OverlayStructureBaseClass):
     def _add_structure_to_instance_(
         self,
         structure: Union[FiberRing, FiberLine],
-        fusion_degree: float = 0.0,
+        fusion_degree: float | None = None,
         scale_position: float = 1.0,
-        position_shift: List[float] = [0, 0],
-        compute_fusing: bool = False
+        position_shift: List[float] = [0, 0]
     ) -> "Profile":
         """
         Internal method to add a fiber structure to the instance.
@@ -231,21 +230,19 @@ class Profile(OverlayStructureBaseClass):
         ----------
         structure : Union[FiberRing, FiberLine]
             The fiber structure to add.
-        fusion_degree : float, optional
-            The degree of fusion. Default is 0.0.
+        fusion_degree : float | None, optional
+            The degree of fusion. Default is None which means no fusion is applied.
         scale_position : float, optional
             Factor to scale the position. Default is 1.0.
         position_shift : list of float, optional
             Shift vector for the position. Default is [0, 0].
-        compute_fusing : bool, optional
-            Whether to compute the fusing operation. Default is False.
 
         Returns
         -------
         Profile
             The updated Profile instance.
         """
-        if compute_fusing:
+        if fusion_degree is not None:
             structure.set_fusion_degree(fusion_degree=fusion_degree)
 
         structure.scale_position(factor=scale_position)
@@ -254,7 +251,7 @@ class Profile(OverlayStructureBaseClass):
 
         self.fiber_list.extend(structure.fiber_list)
 
-        if compute_fusing:
+        if fusion_degree is not None:
             structure.init_connected_fibers()
             structure.compute_optimal_structure()
             self.removed_section_list.append(structure.removed_section)
@@ -273,7 +270,6 @@ class Profile(OverlayStructureBaseClass):
         fusion_degree: float = 0.0,
         scale_position: float = 1.0,
         position_shift: List[float] = [0, 0],
-        compute_fusing: bool = False,
         angle_shift: float = 0.0
     ) -> "Profile":
         """
@@ -293,8 +289,6 @@ class Profile(OverlayStructureBaseClass):
             Factor to scale the position of each fiber. Default is 1.0.
         position_shift : list of float, optional
             A 2D vector [x, y] to shift the entire structure. Default is [0, 0].
-        compute_fusing : bool, optional
-            Whether to compute the fusing operation for the structure. Default is False.
         angle_shift : float, optional
             The angle by which to rotate the structure. Default is 0.0.
 
@@ -323,8 +317,7 @@ class Profile(OverlayStructureBaseClass):
             structure=structure,
             fusion_degree=fusion_degree,
             scale_position=scale_position,
-            position_shift=position_shift,
-            compute_fusing=compute_fusing
+            position_shift=position_shift
         )
 
     def add_custom_fiber(self, *fibers) -> None:
@@ -454,6 +447,7 @@ class Profile(OverlayStructureBaseClass):
             show_centers: bool = False,
             show_cores: bool = True,
             show_added: bool = True,
+            show_fibers: bool = False,
             show_removed: bool = True) -> None:
         """
         Plot the structure using matplotlib.
@@ -476,6 +470,10 @@ class Profile(OverlayStructureBaseClass):
         if show_structure:
             self.clad_structure.plot(ax, show=False)
 
+        if show_fibers:
+            for fiber in self.fiber_list:
+                fiber.plot(ax, show=False)
+
         if show_added:
             self.added_section.plot(ax=ax, facecolor='green', show=False)
 
@@ -489,6 +487,3 @@ class Profile(OverlayStructureBaseClass):
         if show_centers:
             for idx, fiber in enumerate(self.fiber_list):
                 fiber.center.plot(ax, marker='o', size=40, label=f'Center$_{idx}$', show=False)
-
-        for fiber in self.fiber_list:
-            fiber.plot(ax, show=False)

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/FiberFusing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FiberFusing
-Version: 1.9.2
+Version: 1.9.3
 Summary: A package fiber fusing configuration simulating the transverse fusion of fiber optics.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -51,7 +51,7 @@ Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"
 Requires-Dist: pytest-cov<7,>=2; extra == "testing"
 Requires-Dist: pytest-json-report~=1.5; extra == "testing"
-Requires-Dist: flake8==7.2.0; extra == "testing"
+Requires-Dist: flake8==7.3.0; extra == "testing"
 Requires-Dist: coverage~=7.6; extra == "testing"
 Provides-Extra: documentation
 Requires-Dist: numpydoc~=1.8; extra == "documentation"

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/FiberFusing.egg-info/requires.txt

@@ -16,5 +16,5 @@ pydata-sphinx-theme~=0.15
 pytest<9.0,>=7.4
 pytest-cov<7,>=2
 pytest-json-report~=1.5
-flake8==7.2.0
+flake8==7.3.0
 coverage~=7.6

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FiberFusing
-Version: 1.9.2
+Version: 1.9.3
 Summary: A package fiber fusing configuration simulating the transverse fusion of fiber optics.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -51,7 +51,7 @@ Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"
 Requires-Dist: pytest-cov<7,>=2; extra == "testing"
 Requires-Dist: pytest-json-report~=1.5; extra == "testing"
-Requires-Dist: flake8==7.2.0; extra == "testing"
+Requires-Dist: flake8==7.3.0; extra == "testing"
 Requires-Dist: coverage~=7.6; extra == "testing"
 Provides-Extra: documentation
 Requires-Dist: numpydoc~=1.8; extra == "documentation"

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/extra/randomize_core.py

@@ -11,8 +11,7 @@ profile.add_structure(
     structure_type=StructureType.LINEAR,
     number_of_fibers=2,
     fusion_degree=0.3,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/extra/structure_shift.py

@@ -11,8 +11,7 @@ profile.add_structure(
     structure_type=StructureType.LINEAR,
     number_of_fibers=3,
     fusion_degree=0.3,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.plot(show_cores=True, show_centers=True)

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_line_3.py

@@ -22,8 +22,7 @@ profile.add_structure(
     structure_type=StructureType.LINEAR,
     number_of_fibers=3,
     fusion_degree=0.3,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_line_4.py

@@ -19,8 +19,7 @@ profile.add_structure(
     structure_type=StructureType.LINEAR,
     number_of_fibers=4,
     fusion_degree=0.3,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_line_5.py

@@ -18,8 +18,7 @@ profile.add_structure(
     structure_type=StructureType.LINEAR,
     number_of_fibers=5,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_10.py

@@ -18,8 +18,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=10,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_2.py

@@ -19,8 +19,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=2,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_3.py

@@ -18,8 +18,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=3,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_4.py

@@ -19,8 +19,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=4,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_5.py

@@ -19,8 +19,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=5,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/docs/examples/geometry/plot_ring_7.py

@@ -19,8 +19,7 @@ profile.add_structure(
     structure_type=StructureType.CIRCULAR,
     number_of_fibers=7,
     fusion_degree=0.4,
-    fiber_radius=62.5e-6,
-    compute_fusing=True
+    fiber_radius=62.5e-6
 )
 
 profile.refractive_index = 1.4444  # Refractive index of silica at the specified wavelength

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/pyproject.toml

@@ -51,7 +51,7 @@ testing = [
     "pytest >=7.4,<9.0",
     "pytest-cov >=2,<7",
     "pytest-json-report ~=1.5",
-    "flake8 ==7.2.0",
+    "flake8 ==7.3.0",
     "coverage ~=7.6"
 ]
 

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/tests/test_boundaries.py

@@ -37,8 +37,7 @@ def test_building_geometry(mock_show, boundaries):
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=5,
         fusion_degree=0.4,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.refractive_index = 1.4444

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/tests/test_fused_structure.py

@@ -18,8 +18,7 @@ def test_building_structure(mock_show, number_of_fibers, fusion_degree, structur
         structure_type=structure_type,
         number_of_fibers=number_of_fibers,
         fusion_degree=fusion_degree,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.plot()
@@ -36,8 +35,7 @@ def test_randomize_core_position():
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=5,
         fusion_degree=0.4,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.randomize_core_positions(random_factor=4e-6)
@@ -56,8 +54,7 @@ def test_rotate_profile():
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=5,
         fusion_degree=0.4,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     initial_fiber_list = profile.fiber_list.copy()
@@ -74,8 +71,7 @@ def test_translate_profile():
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=5,
         fusion_degree=0.4,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     initial_fiber_list = profile.fiber_list.copy()
@@ -92,8 +88,7 @@ def test_scale_profile():
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=5,
         fusion_degree=0.4,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     initial_fiber_list = profile.fiber_list.copy()

{fiberfusing-1.9.2 → fiberfusing-1.9.3}/tests/test_geometries.py

@@ -30,8 +30,7 @@ def test_building_geometry(mock_show, fusion_degree, number_of_fibers, structure
         structure_type=structure_type,
         number_of_fibers=number_of_fibers,
         fusion_degree=fusion_degree,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.refractive_index = 1.4444
@@ -71,8 +70,7 @@ def test_building_geometry_with_capillary(mock_show, fusion_degree, number_of_fi
         structure_type=structure_type,
         number_of_fibers=number_of_fibers,
         fusion_degree=fusion_degree,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.refractive_index=1.4444
@@ -120,8 +118,7 @@ def test_building_geometry_with_capillary_and_fibers(mock_show, fusion_degree, n
         structure_type=structure_type,
         number_of_fibers=number_of_fibers,
         fusion_degree=fusion_degree,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.refractive_index = 1.4444
@@ -162,8 +159,7 @@ def test_geometry_api():
         structure_type=StructureType.CIRCULAR,
         number_of_fibers=2,
         fusion_degree=0.3,
-        fiber_radius=62.5e-6,
-        compute_fusing=True
+        fiber_radius=62.5e-6
     )
 
     profile.refractive_index = 1.4444