bsplyne 1.0.0__tar.gz → 1.0.1__tar.gz

{bsplyne-1.0.0/bsplyne.egg-info → bsplyne-1.0.1}/PKG-INFO

@@ -1,30 +1,35 @@
 Metadata-Version: 2.4
 Name: bsplyne
-Version: 1.0.0
-Summary: A package for N dimensions B-splines.
-Home-page: https://github.com/Dorian210/bsplyne
-Author: Dorian Bichet
-Author-email: dbichet@insa-toulouse.fr
+Version: 1.0.1
+Summary: N-dimensional B-spline library for numerical mechanics and geometry
+Author-email: Dorian Bichet <dbichet@insa-toulouse.fr>
+Project-URL: Homepage, https://github.com/Dorian210/bsplyne
+Project-URL: Repository, https://github.com/Dorian210/bsplyne
+Project-URL: Issues, https://github.com/Dorian210/bsplyne/issues
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)
+Classifier: Topic :: Scientific/Engineering
+Classifier: Intended Audience :: Science/Research
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: numpy
-Requires-Dist: numba
-Requires-Dist: scipy
-Requires-Dist: matplotlib
-Requires-Dist: meshio
-Requires-Dist: tqdm
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Requires-Dist: numpy>=1.20
+Requires-Dist: numba>=0.55
+Requires-Dist: scipy>=1.8
+Requires-Dist: matplotlib>=3.5
+Requires-Dist: meshio>=5.0
+Requires-Dist: tqdm>=4.60
+Provides-Extra: viz
+Requires-Dist: pyvista>=0.41; extra == "viz"
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: wkhtmltopdf; extra == "docs"
+Requires-Dist: pdoc>=12.0; extra == "docs"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # bsplyne
 

bsplyne-1.0.1/pyproject.toml

@@ -0,0 +1,58 @@
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "bsplyne"
+version = "1.0.1"
+description = "N-dimensional B-spline library for numerical mechanics and geometry"
+readme = "README.md"
+requires-python = ">=3.9"
+
+authors = [
+    { name = "Dorian Bichet", email = "dbichet@insa-toulouse.fr" }
+]
+
+license = { file = "LICENSE" }
+
+dependencies = [
+    "numpy>=1.20",
+    "numba>=0.55",
+    "scipy>=1.8",
+    "matplotlib>=3.5",
+    "meshio>=5.0",
+    "tqdm>=4.60"
+]
+
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Operating System :: OS Independent",
+    "License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)",
+    "Topic :: Scientific/Engineering",
+    "Intended Audience :: Science/Research"
+]
+
+[project.urls]
+Homepage = "https://github.com/Dorian210/bsplyne"
+Repository = "https://github.com/Dorian210/bsplyne"
+Issues = "https://github.com/Dorian210/bsplyne/issues"
+
+[project.optional-dependencies]
+viz = [
+    "pyvista>=0.41"
+]
+dev = [
+    "build",
+    "twine"
+]
+docs = [
+    "wkhtmltopdf",
+    "pdoc>=12.0"
+]
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]

{bsplyne-1.0.0 → bsplyne-1.0.1/src}/bsplyne/__init__.py

@@ -1,5 +1,5 @@
 """
-.. include:: ../README.md
+.. include:: ../../README.md
 """
 
 from bsplyne.b_spline_basis import BSplineBasis

{bsplyne-1.0.0 → bsplyne-1.0.1/src}/bsplyne/b_spline.py

@@ -1,6 +1,7 @@
 import os
 from typing import Iterable, Literal, Union
 import json, pickle
+import warnings
 
 import numpy as np
 import scipy.sparse as sps
@@ -1943,6 +1944,11 @@ class BSpline:
                 show,
             )
         else:
+            if not _can_visualize_pyvista:
+                warnings.warn(
+                    "Can't use PyVista. Fallback to Matplotlib plotter. "
+                    "For better visualization, install PyVista."
+                )
             return self.plotMPL(
                 ctrl_pts,
                 n_eval_per_elem,

{bsplyne-1.0.0 → bsplyne-1.0.1/src}/bsplyne/b_spline_basis.py

@@ -511,7 +511,7 @@ class BSplineBasis:
             Row index of D.
         j : int
             Column index of D.
-        new_knot : numpy.array of float
+        new_knot : np.ndarray[np.floating]
             New knot vector to use.
         p : int
             Degree of the BSpline.
@@ -547,7 +547,7 @@ class BSplineBasis:
 
         Parameters
         ----------
-        new_knot : numpy.array of float
+        new_knot : np.ndarray[np.floating]
             The new knot vector for the knot insertion.
 
         Returns
@@ -802,7 +802,7 @@ def _funcNElemOneXi(i, p, knot, xi):
         Index of the basis function wanted.
     p : int
         Degree of the BSpline evaluated.
-    knot : numpy.array of float
+    knot : np.ndarray[np.floating]
         Knot vector of the BSpline basis.
     xi : float
         Value in the parametric space at which the BSpline is evaluated.
@@ -846,7 +846,7 @@ def _funcDNElemOneXi(i, p, knot, xi, k):
         Index of the basis function wanted.
     p : int
         Degree of the BSpline evaluated.
-    knot : numpy.array of float
+    knot : np.ndarray[np.floating]
         Knot vector of the BSpline basis.
     xi : float
         Value in the parametric space at which the BSpline is evaluated.
@@ -904,7 +904,7 @@ def _findElem(p, m, n, knot, xi):
         Last index of the knot vector.
     n : int
         Last index of the basis.
-    knot : numpy.array of float
+    knot : np.ndarray[np.floating]
         Knot vector of the BSpline basis.
     xi : float
         Value in the parametric space.
@@ -955,16 +955,16 @@ def _DN(p, m, n, knot, XI, k):
         Last index of the knot vector.
     n : int
         Last index of the basis.
-    knot : numpy.array of float
+    knot : np.ndarray[np.floating]
         Knot vector of the BSpline basis.
-    XI : numpy.array of float
+    XI : np.ndarray[np.floating]
         Values in the parametric space at which the BSpline is evaluated.
     k : int
         `k`-th derivative of the BSpline evaluated. The default is 0.
 
     Returns
     -------
-    (vals, row, col) : (numpy.array of float, numpy.array of int, numpy.array of int)
+    (vals, row, col) : (np.ndarray[np.floating], np.ndarray[np.integer], np.ndarray[np.integer])
         Values and indices of the `k`-th derivative matrix of the BSpline
         basis functions in the columns for each value of `XI` in the rows.
 

{bsplyne-1.0.0 → bsplyne-1.0.1/src}/bsplyne/multi_patch_b_spline.py

@@ -62,9 +62,9 @@ class MultiPatchBSplineConnectivity:
 
     Attributes
     ----------
-    unique_nodes_inds : numpy.ndarray of int
+    unique_nodes_inds : np.ndarray[np.integer]
         The indices of the unique representation needed to create the unpacked one.
-    shape_by_patch : numpy.ndarray of int
+    shape_by_patch : np.ndarray[np.integer]
         The shape of the separated nodes by patch.
     nb_nodes : int
         The total number of unpacked nodes.
@@ -88,9 +88,9 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        unique_nodes_inds : numpy.ndarray of int
+        unique_nodes_inds : np.ndarray[np.integer]
             The indices of the unique representation needed to create the unpacked one.
-        shape_by_patch : numpy.ndarray of int
+        shape_by_patch : np.ndarray[np.integer]
             The shape of the separated nodes by patch.
         nb_unique_nodes : int
             The total number of unique nodes.
@@ -108,10 +108,10 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        nodes_couples : numpy.ndarray of int
+        nodes_couples : np.ndarray[np.integer]
             Couples of indices of unpacked nodes that are considered the same.
             Its shape should be (# of couples, 2)
-        shape_by_patch : numpy.ndarray of int
+        shape_by_patch : np.ndarray[np.integer]
             The shape of the separated nodes by patch.
 
         Returns
@@ -142,7 +142,7 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        separated_ctrlPts : list of numpy.ndarray of float
+        separated_ctrlPts : list of np.ndarray[np.floating]
             Control points of every patch to be compared in the separated
             representation. Every array is of shape :
             (``NPh``, nb elem for dim 1, ..., nb elem for dim ``npa``)
@@ -217,13 +217,13 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        unique_field : numpy.ndarray
+        unique_field : np.ndarray
             The unique representation. Its shape should be :
             (field, shape, ..., `self`.`nb_unique_nodes`)
 
         Returns
         -------
-        unpacked_field : numpy.ndarray
+        unpacked_field : np.ndarray
             The unpacked representation. Its shape is :
             (field, shape, ..., `self`.`nb_nodes`)
         """
@@ -236,7 +236,7 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        unpacked_field : numpy.ndarray
+        unpacked_field : np.ndarray
             The unpacked representation. Its shape should be :
             (field, shape, ..., `self`.`nb_nodes`)
         method: str
@@ -244,7 +244,7 @@ class MultiPatchBSplineConnectivity:
 
         Returns
         -------
-        unique_nodes : numpy.ndarray
+        unique_nodes : np.ndarray
             The unique representation. Its shape is :
             (field, shape, ..., `self`.`nb_unique_nodes`)
         """
@@ -273,13 +273,13 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        unpacked_field : numpy.ndarray
+        unpacked_field : np.ndarray
             The unpacked representation. Its shape is :
             (field, shape, ..., `self`.`nb_nodes`)
 
         Returns
         -------
-        separated_field : list of numpy.ndarray
+        separated_field : list of np.ndarray
             The separated representation. Every array is of shape :
             (field, shape, ..., nb elem for dim 1, ..., nb elem for dim `npa`)
         """
@@ -300,13 +300,13 @@ class MultiPatchBSplineConnectivity:
 
         Parameters
         ----------
-        separated_field : list of numpy.ndarray
+        separated_field : list of np.ndarray
             The separated representation. Every array is of shape :
             (field, shape, ..., nb elem for dim 1, ..., nb elem for dim `npa`)
 
         Returns
         -------
-        unpacked_field : numpy.ndarray
+        unpacked_field : np.ndarray
             The unpacked representation. Its shape is :
             (field, shape, ..., `self`.`nb_nodes`)
         """
@@ -334,7 +334,7 @@ class MultiPatchBSplineConnectivity:
 
         Returns
         -------
-        unique_field_indices : numpy.ndarray of int or list of numpy.ndarray of int
+        unique_field_indices : np.ndarray[np.integer] or list of np.ndarray[np.integer]
             The unique, unpacked or separated representation of a field's unique indices.
             If unique, its shape is (*`field_shape`, `self`.`nb_unique_nodes`).
             If unpacked, its shape is : (*`field_shape`, `self`.`nb_nodes`).
@@ -366,7 +366,7 @@ class MultiPatchBSplineConnectivity:
 
         Returns
         -------
-        duplicate_nodes_mask : numpy.ndarray
+        duplicate_nodes_mask : np.ndarray
             Boolean mask of shape (nb_nodes,) where True indicates a node is duplicated
             across multiple patches and False indicates it appears only once.
         """
@@ -391,7 +391,7 @@ class MultiPatchBSplineConnectivity:
             Connectivity information for the border patches.
         border_splines : list[BSpline]
             Array of B-spline patches representing the borders.
-        border_unique_to_self_unique_connectivity : numpy.ndarray of int
+        border_unique_to_self_unique_connectivity : np.ndarray[np.integer]
             Array mapping border unique nodes to original unique nodes.
 
         Raises
@@ -484,7 +484,7 @@ class MultiPatchBSplineConnectivity:
             Connectivity information for the border patches.
         border_splines : list[BSpline]
             Array of B-spline patches representing the borders.
-        border_unique_to_self_unique_connectivity : numpy.ndarray of int
+        border_unique_to_self_unique_connectivity : np.ndarray[np.integer]
             Array mapping border unique nodes to original unique nodes.
 
         Raises
@@ -649,7 +649,7 @@ class MultiPatchBSplineConnectivity:
         ----------
         splines : list[BSpline]
             Array of B-spline patches to subset.
-        patches_to_keep : numpy.array of int
+        patches_to_keep : np.ndarray[np.integer]
             Indices of patches to keep in the subset.
 
         Returns
@@ -658,7 +658,7 @@ class MultiPatchBSplineConnectivity:
             New connectivity object containing only the selected patches.
         new_splines : list[BSpline]
             Array of B-spline patches for the selected patches.
-        new_unique_to_self_unique_connectivity : numpy.ndarray of int
+        new_unique_to_self_unique_connectivity : np.ndarray[np.integer]
             Array mapping new unique nodes to original unique nodes.
         """
         new_splines = splines[patches_to_keep]

{bsplyne-1.0.0 → bsplyne-1.0.1/src}/bsplyne/save_utils.py

@@ -3,7 +3,7 @@ import meshio as io
 from typing import Iterable
 from functools import reduce
 import os
-import xml
+from xml.dom import minidom
 
 
 def writePVD(fileName: str, groups: dict[str, dict]):
@@ -32,7 +32,7 @@ def writePVD(fileName: str, groups: dict[str, dict]):
     None
     """
     rep, fname = os.path.split(fileName)
-    pvd = xml.dom.minidom.Document()
+    pvd = minidom.Document()
     pvd_root = pvd.createElementNS("VTK", "VTKFile")
     pvd_root.setAttribute("type", "Collection")
     pvd_root.setAttribute("version", "0.1")

{bsplyne-1.0.0 → bsplyne-1.0.1/src/bsplyne.egg-info}/PKG-INFO

@@ -1,30 +1,35 @@
 Metadata-Version: 2.4
 Name: bsplyne
-Version: 1.0.0
-Summary: A package for N dimensions B-splines.
-Home-page: https://github.com/Dorian210/bsplyne
-Author: Dorian Bichet
-Author-email: dbichet@insa-toulouse.fr
+Version: 1.0.1
+Summary: N-dimensional B-spline library for numerical mechanics and geometry
+Author-email: Dorian Bichet <dbichet@insa-toulouse.fr>
+Project-URL: Homepage, https://github.com/Dorian210/bsplyne
+Project-URL: Repository, https://github.com/Dorian210/bsplyne
+Project-URL: Issues, https://github.com/Dorian210/bsplyne/issues
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)
+Classifier: Topic :: Scientific/Engineering
+Classifier: Intended Audience :: Science/Research
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: numpy
-Requires-Dist: numba
-Requires-Dist: scipy
-Requires-Dist: matplotlib
-Requires-Dist: meshio
-Requires-Dist: tqdm
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
+Requires-Dist: numpy>=1.20
+Requires-Dist: numba>=0.55
+Requires-Dist: scipy>=1.8
+Requires-Dist: matplotlib>=3.5
+Requires-Dist: meshio>=5.0
+Requires-Dist: tqdm>=4.60
+Provides-Extra: viz
+Requires-Dist: pyvista>=0.41; extra == "viz"
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: wkhtmltopdf; extra == "docs"
+Requires-Dist: pdoc>=12.0; extra == "docs"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # bsplyne
 

bsplyne-1.0.1/src/bsplyne.egg-info/SOURCES.txt

@@ -0,0 +1,19 @@
+LICENSE.txt
+README.md
+pyproject.toml
+src/bsplyne/__init__.py
+src/bsplyne/b_spline.py
+src/bsplyne/b_spline_basis.py
+src/bsplyne/geometries_in_3D.py
+src/bsplyne/multi_patch_b_spline.py
+src/bsplyne/my_wide_product.py
+src/bsplyne/parallel_utils.py
+src/bsplyne/save_utils.py
+src/bsplyne.egg-info/PKG-INFO
+src/bsplyne.egg-info/SOURCES.txt
+src/bsplyne.egg-info/dependency_links.txt
+src/bsplyne.egg-info/requires.txt
+src/bsplyne.egg-info/top_level.txt
+tests/test_b_spline_advanced.py
+tests/test_b_spline_basis.py
+tests/test_b_spline_basis_advanced.py

bsplyne-1.0.1/src/bsplyne.egg-info/requires.txt

@@ -0,0 +1,17 @@
+numpy>=1.20
+numba>=0.55
+scipy>=1.8
+matplotlib>=3.5
+meshio>=5.0
+tqdm>=4.60
+
+[dev]
+build
+twine
+
+[docs]
+wkhtmltopdf
+pdoc>=12.0
+
+[viz]
+pyvista>=0.41

bsplyne-1.0.0/MANIFEST.in

@@ -1,3 +0,0 @@
-include *.jpg
-include *.txt
-recursive-include tests *.py

bsplyne-1.0.0/bsplyne.egg-info/SOURCES.txt

@@ -1,21 +0,0 @@
-LICENSE.txt
-MANIFEST.in
-README.md
-context.txt
-setup.py
-bsplyne/__init__.py
-bsplyne/b_spline.py
-bsplyne/b_spline_basis.py
-bsplyne/geometries_in_3D.py
-bsplyne/multi_patch_b_spline.py
-bsplyne/my_wide_product.py
-bsplyne/parallel_utils.py
-bsplyne/save_utils.py
-bsplyne.egg-info/PKG-INFO
-bsplyne.egg-info/SOURCES.txt
-bsplyne.egg-info/dependency_links.txt
-bsplyne.egg-info/requires.txt
-bsplyne.egg-info/top_level.txt
-tests/test_b_spline_advanced.py
-tests/test_b_spline_basis.py
-tests/test_b_spline_basis_advanced.py

bsplyne-1.0.0/bsplyne.egg-info/requires.txt

@@ -1,6 +0,0 @@
-numpy
-numba
-scipy
-matplotlib
-meshio
-tqdm

bsplyne-1.0.0/context.txt

@@ -1,77 +0,0 @@
-The parametric space is called the isoparametric space.
-
-In docstrings :
-- the types are the same as in the definition of the function (type hints).
-- except for the types of the parameters in their "introductory" line, the python objects, types, variables and python code must be written between backtick (e.g. `int`).
-- make a clear difference between tuples, displayed with parentheses, and lists, displayed with square brackets.
-- don't forget to talk abaout the optional parameters values (e.g. "n_eval_per_elem : Union[int, Iterable[int]], optional [...] By default, 10.").
-
-I prefer the docstrings to be displayed in the chat, not in a separate file.
-Be careful with the indentation of the docstring : it should match the indentation of the function/method/class.
-
-If a docstring already exists and seems lacking in terms of content compared to the one that follows, enhance it.
-If it is already good enough in your opinion, tell me in plain text your opinion afterwards.
-
-
-Exemple of docstring :
-
-    def gauss_legendre_for_integration(
-        self, 
-        n_eval_per_elem: Union[int, Iterable[int], None]=None, 
-        bounding_box: Union[Iterable, None]=None
-        ) -> tuple[tuple[npt.NDArray[np.floating], ...], tuple[npt.NDArray[np.floating], ...]]:
-        """
-        Generate sets of evaluation points and their Gauss-Legendre integration weights over each basis span.
-
-        This method creates Gauss-Legendre quadrature points and their corresponding integration weights
-        for each isoparametric dimension by calling `gauss_legendre_for_integration` on each
-        `BSplineBasis` instance stored in the `bases` array.
-
-        Parameters
-        ----------
-        n_eval_per_elem : Union[int, Iterable[int], None], optional
-            Number of evaluation points per element for each isoparametric dimension.
-            If an `int` is provided, the same number is used for all dimensions.
-            If an `Iterable` is provided, each value corresponds to a different dimension.
-            If `None`, uses `(p + 2)//2` points per element where `p` is the degree of each basis.
-            This number of points ensures an exact integration of a `p`-th degree polynomial.
-            By default, None.
-
-        bounding_box : Union[Iterable[tuple[float, float]], None], optional
-            Lower and upper bounds for each isoparametric dimension.
-            If `None`, uses the span of each basis.
-            Format: [(`xi_min`, `xi_max`), (`eta_min`, `eta_max`), ...].
-            By default, None.
-
-        Returns
-        -------
-        XI : tuple[npt.NDArray[np.floating], ...]
-            Tuple containing arrays of Gauss-Legendre points for each isoparametric dimension.
-            The tuple has length `NPa` (dimension of isoparametric space).
-
-        dXI : tuple[npt.NDArray[np.floating], ...]
-            Tuple containing arrays of Gauss-Legendre weights for each isoparametric dimension.
-            The tuple has length `NPa` (dimension of isoparametric space).
-
-        Notes
-        -----
-        - For a curve (1D), returns ((`xi` points), (`xi` weights))
-        - For a surface (2D), returns ((`xi` points, `eta` points), (`xi` weights, `eta` weights))
-        - For a volume (3D), returns ((`xi` points, `eta` points, `zeta` points), 
-                                    (`xi` weights, `eta` weights, `zeta` weights))
-        - The points and weights follow the Gauss-Legendre quadrature rule
-        - When `n_eval_per_elem` is `None`, uses `(p + 2)//2` points per element for exact
-        integration of polynomials up to degree `p`
-
-        Examples
-        --------
-        >>> degrees = [2, 2]
-        >>> knots = [np.array([0, 0, 0, 0.5, 1, 1, 1], dtype='float'),
-        ...          np.array([0, 0, 0, 0.5, 1, 1, 1], dtype='float')]
-        >>> spline = BSpline(degrees, knots)
-        >>> (xi, eta), (dxi, deta) = spline.gauss_legendre_for_integration()
-        >>> xi  # xi points
-        array([0.10566243, 0.39433757, 0.60566243, 0.89433757])
-        >>> dxi  # xi weights
-        array([0.25, 0.25, 0.25, 0.25])
-        """

bsplyne-1.0.0/setup.py

@@ -1,21 +0,0 @@
-from setuptools import setup, find_packages
-
-with open('README.md', 'r') as readme:
-    long_description = readme.read()
-
-setup(
-    name='bsplyne', 
-    version='1.0.0', 
-    url='https://github.com/Dorian210/bsplyne', 
-    author='Dorian Bichet', 
-    author_email='dbichet@insa-toulouse.fr', 
-    description='A package for N dimensions B-splines.', 
-    long_description=long_description, 
-    long_description_content_type='text/markdown', 
-    packages=find_packages(), 
-    install_requires=['numpy', 'numba', 'scipy', 'matplotlib', 'meshio', 'tqdm'], 
-    classifiers=['Programming Language :: Python :: 3', 
-                 'Operating System :: OS Independent', 
-                 'License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)'], 
-    
-)