Merge branch 'dev' into main

.coveragerc

@@ -0,0 +1,10 @@
+[report]
+exclude_lines =
+    # Skip any pass lines such as may be used for @abstractmethod
+    pass
+
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise NotImplementedError

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "compmec-nurbs"
-version = "1.0.2"
+version = "1.0.3"
 description = ""
 readme = "README.md"
 authors = ["Carlos Adir <carlos.adir@gmail.com>"]

src/compmec/nurbs/__classes__.py

@@ -4,7 +4,7 @@
 import numpy as np
 
 
-class Interface_KnotVector(abc.ABC):
+class Intface_KnotVector(abc.ABC):
     @abc.abstractproperty
     def degree(self) -> int:
         raise NotImplementedError
@@ -22,7 +22,7 @@ def verify_valid_span(self, u: Tuple[float]):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def span(self, u: Union[float, np.ndarray]) -> Union[int, np.ndarray]:
+    def span(self, knot: np.ndarray) -> np.ndarray:
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -37,31 +37,32 @@ def remove_knot(self, knot: float, times: Optional[int] = 1):
     def __eq__(self, obj: object) -> bool:
         raise NotImplementedError
 
+    @abc.abstractmethod
     def __ne__(self, obj: object) -> bool:
-        return not self.__eq__(obj)
+        raise NotImplementedError
 
 
-class Interface_BaseFunction_Evaluator_BaseCurve(abc.ABC):
+class Intface_BaseFunction_Evaluator_BaseCurve(abc.ABC):
     @abc.abstractproperty
-    def knotvector(self) -> Interface_KnotVector:
+    def knotvector(self) -> Intface_KnotVector:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def __call__(self, u: Union[float, np.ndarray]) -> Union[float, np.ndarray]:
+    def __call__(self, u: np.ndarray) -> np.ndarray:
         raise NotImplementedError
 
 
-class Interface_Evaluator(Interface_BaseFunction_Evaluator_BaseCurve):
+class Intface_Evaluator(Intface_BaseFunction_Evaluator_BaseCurve):
     @abc.abstractproperty
     def first_index(self) -> Union[int, slice]:
         raise NotImplementedError
 
     @abc.abstractproperty
-    def first_index(self) -> Union[int, slice]:
+    def second_index(self) -> Union[int, slice]:
         raise NotImplementedError
 
 
-class Interface_BaseFunction_BaseCurve(Interface_BaseFunction_Evaluator_BaseCurve):
+class Intface_BaseFunction_BaseCurve(Intface_BaseFunction_Evaluator_BaseCurve):
     @abc.abstractproperty
     def degree(self) -> int:
         raise NotImplementedError
@@ -78,28 +79,24 @@ def knot_insert(self, knot: float, times: Optional[int] = 1):
     def knot_remove(self, knot: float, times: Optional[int] = 1):
         raise NotImplementedError
 
-    @abc.abstractmethod
-    def derivate(self):
-        raise NotImplementedError
-
 
-class Interface_BaseFunction(Interface_BaseFunction_BaseCurve):
+class Intface_BaseFunction(Intface_BaseFunction_BaseCurve):
     @abc.abstractmethod
-    def __init__(self, knotvector: Interface_KnotVector):
+    def __init__(self, knotvector: Intface_KnotVector):
         raise NotImplementedError
 
     @abc.abstractmethod
     def __getitem__(self, tup: Any) -> Union[float, np.ndarray]:
         raise NotImplementedError
 
 
-class Interface_BaseCurve(Interface_BaseFunction_BaseCurve):
+class Intface_BaseCurve(Intface_BaseFunction_BaseCurve):
     @abc.abstractmethod
-    def __init__(self, knotvector: Interface_KnotVector, ctrlpoints: np.ndarray):
+    def __init__(self, knotvector: Intface_KnotVector, ctrlpoints: np.ndarray):
         raise NotImplementedError
 
     @abc.abstractproperty
-    def F(self) -> Interface_BaseFunction:
+    def F(self) -> Intface_BaseFunction:
         raise NotImplementedError
 
     @abc.abstractproperty
@@ -110,5 +107,6 @@ def ctrlpoints(self) -> np.ndarray:
     def __eq__(self, obj: object) -> bool:
         raise NotImplementedError
 
+    @abc.abstractmethod
     def __ne__(self, obj: object) -> bool:
-        return not self.__eq__(obj)
+        raise NotImplementedError

src/compmec/nurbs/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 
-from compmec.nurbs.basefunctions import RationalBaseFunction, SplineBaseFunction
 from compmec.nurbs.curves import RationalCurve, SplineCurve
+from compmec.nurbs.functions import RationalFunction, SplineFunction
 from compmec.nurbs.knotspace import GeneratorKnotVector, KnotVector