chemotools 0.0.10__tar.gz → 0.0.12__tar.gz

chemotools-0.0.12/PKG-INFO

@@ -0,0 +1,118 @@
+Metadata-Version: 2.1
+Name: chemotools
+Version: 0.0.12
+Summary: Package to integrate chemometrics in scikit-learn pipelines
+Home-page: https://github.com/paucablop/chemotools
+Author: Pau Cabaneros Lopez
+Author-email: pau.cabaneros@gmail.com
+Project-URL: Bug Tracker, https://github.com/paucablop/chemotools/issues/
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+[![pypi](https://img.shields.io/pypi/v/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/pyversions/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/l/chemotools)](https://github.com/paucablop/chemotools/blob/main/LICENSE)
+[![codecov](https://codecov.io/github/paucablop/chemotools/branch/main/graph/badge.svg?token=D7JUJM89LN)](https://codecov.io/github/paucablop/chemotools)
+
+# __chemotools__
+
+Welcome to Chemotools, a Python package that integrates chemometrics with Scikit-learn.
+
+👉 Check the [documentation](https://paucablop.github.io/chemotools/) for a full description on how to use chemotools.
+
+## Description
+
+Chemotools is a Python package that provides a collection of preprocessing tools and utilities for working with spectral data. It is built on top of popular scientific libraries and is designed to be highly modular, easy to use, and compatible with Scikit-learn transformers.
+
+If you are interested in learning more about chemotools, please visit the [documentation](https://paucablop.github.io/chemotools/) page.
+
+Benefits:
+- Provides a collection of preprocessing tools and utilities for working with spectral data
+- Highly modular and compatible with Scikit-learn transformers
+- Can perform popular preprocessing tasks such as baseline correction, smoothing, scaling, derivatization, and scattering correction
+- Open source and available on PyPI
+
+Applications:
+- Analyzing and processing spectral data in chemistry, biology, and other fields
+- Developing machine learning models for predicting properties or classifying samples based on spectral data
+- Teaching and learning about chemometrics and data preprocessing in Python
+
+## Installation
+
+Chemotools is distributed via PyPI and can be easily installed using pip:
+
+```bash
+pip install chemotools
+```
+
+## Usage
+
+Chemotools is designed to be used in conjunction with Scikit-learn. It follows the same API as other Scikit-learn transformers, so you can easily integrate it into your existing workflow. For example, you can use chemotools to build pipelines that include transformers from chemotools and Scikit-learn:
+
+```python
+from sklearn.preprocessing import StandardScaler
+from sklearn.pipeline import make_pipeline
+
+from chemotools.baseline import AirPls
+from chemotools.scatter import MultiplicativeScatterCorrection
+
+preprocessing = make_pipeline(AirPls(), MultiplicativeScatterCorrection(), StandardScaler(with_std=False)) 
+spectra_transformed = preprocessing.fit_transform(spectra)
+```
+
+Check the [documentation](https://paucablop.github.io/chemotools/) for more information on how to use chemotools.
+
+
+## Contributing
+
+We welcome contributions to Chemotools from anyone interested in improving the package. Whether you have ideas for new features, bug reports, or just want to help improve the code, we appreciate your contributions! You are also welcome to see the [Project Board](https://github.com/users/paucablop/projects/4) to see what we are currently working on.
+
+To contribute to Chemotools, please follow these guidelines:
+
+#### Reporting Bugs
+
+If you encounter a bug or unexpected behavior in Chemotools, please open an issue on the GitHub repository with a detailed description of the problem, including any error messages and steps to reproduce the issue. If possible, include sample code or data that demonstrates the problem.
+
+#### Suggesting Enhancements
+
+If you have an idea for a new feature or enhancement for Chemotools, please open an issue on the GitHub repository with a detailed description of the proposed feature and its benefits. If possible, include example code or use cases that illustrate how the feature would be used.
+
+#### Submitting Changes
+
+If you'd like to contribute code changes to Chemotools, please follow these steps:
+
+- Create a new branch for your changes. We follow trunk-based development, so all changes should be made on a new branch and branches should be short-lived and merged into main.
+
+- Write your code and tests, making sure to follow the Chemotools coding style and conventions. It is fundamental to include tests for both, the Scikit-learn API and the functionality of the transformers.
+
+- Run the tests using the provided testing framework to ensure that your changes do not introduce any new errors or regressions.
+
+- Submit a pull request to the main Chemotools repository with a detailed description of your changes and the problem they solve.
+
+We will review your changes and provide feedback as soon as possible. If we request changes, please make them as quickly as possible to keep the review process moving.
+
+#### Code Style
+
+Please follow the Chemotools code style and conventions when contributing code changes. Specifically:
+
+- Use four spaces for indentation
+- Use descriptive variable names
+- Avoid using magic numbers or hard-coded strings
+- Format your code using Black
+
+#### Codecov
+
+We use Codecov to track the test coverage of Chemotools. Please make sure that your changes do not reduce the test coverage of the package.
+
+
+## License
+
+This package is distributed under the MIT license. See the [LICENSE](LICENSE) file for more information. When contributing code to Chemotools, you are agreeing to release your code under the MIT license.
+
+## Credits
+
+AirPLS baseline correction is based on the implementation by [Zhang et al.](https://pubs.rsc.org/is/content/articlelanding/2010/an/b922045c). The current implementation is based on the Python implementation by [zmzhang](https://github.com/zmzhang/airPLS).

chemotools-0.0.12/README.md

@@ -0,0 +1,103 @@
+[![pypi](https://img.shields.io/pypi/v/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/pyversions/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/l/chemotools)](https://github.com/paucablop/chemotools/blob/main/LICENSE)
+[![codecov](https://codecov.io/github/paucablop/chemotools/branch/main/graph/badge.svg?token=D7JUJM89LN)](https://codecov.io/github/paucablop/chemotools)
+
+# __chemotools__
+
+Welcome to Chemotools, a Python package that integrates chemometrics with Scikit-learn.
+
+👉 Check the [documentation](https://paucablop.github.io/chemotools/) for a full description on how to use chemotools.
+
+## Description
+
+Chemotools is a Python package that provides a collection of preprocessing tools and utilities for working with spectral data. It is built on top of popular scientific libraries and is designed to be highly modular, easy to use, and compatible with Scikit-learn transformers.
+
+If you are interested in learning more about chemotools, please visit the [documentation](https://paucablop.github.io/chemotools/) page.
+
+Benefits:
+- Provides a collection of preprocessing tools and utilities for working with spectral data
+- Highly modular and compatible with Scikit-learn transformers
+- Can perform popular preprocessing tasks such as baseline correction, smoothing, scaling, derivatization, and scattering correction
+- Open source and available on PyPI
+
+Applications:
+- Analyzing and processing spectral data in chemistry, biology, and other fields
+- Developing machine learning models for predicting properties or classifying samples based on spectral data
+- Teaching and learning about chemometrics and data preprocessing in Python
+
+## Installation
+
+Chemotools is distributed via PyPI and can be easily installed using pip:
+
+```bash
+pip install chemotools
+```
+
+## Usage
+
+Chemotools is designed to be used in conjunction with Scikit-learn. It follows the same API as other Scikit-learn transformers, so you can easily integrate it into your existing workflow. For example, you can use chemotools to build pipelines that include transformers from chemotools and Scikit-learn:
+
+```python
+from sklearn.preprocessing import StandardScaler
+from sklearn.pipeline import make_pipeline
+
+from chemotools.baseline import AirPls
+from chemotools.scatter import MultiplicativeScatterCorrection
+
+preprocessing = make_pipeline(AirPls(), MultiplicativeScatterCorrection(), StandardScaler(with_std=False)) 
+spectra_transformed = preprocessing.fit_transform(spectra)
+```
+
+Check the [documentation](https://paucablop.github.io/chemotools/) for more information on how to use chemotools.
+
+
+## Contributing
+
+We welcome contributions to Chemotools from anyone interested in improving the package. Whether you have ideas for new features, bug reports, or just want to help improve the code, we appreciate your contributions! You are also welcome to see the [Project Board](https://github.com/users/paucablop/projects/4) to see what we are currently working on.
+
+To contribute to Chemotools, please follow these guidelines:
+
+#### Reporting Bugs
+
+If you encounter a bug or unexpected behavior in Chemotools, please open an issue on the GitHub repository with a detailed description of the problem, including any error messages and steps to reproduce the issue. If possible, include sample code or data that demonstrates the problem.
+
+#### Suggesting Enhancements
+
+If you have an idea for a new feature or enhancement for Chemotools, please open an issue on the GitHub repository with a detailed description of the proposed feature and its benefits. If possible, include example code or use cases that illustrate how the feature would be used.
+
+#### Submitting Changes
+
+If you'd like to contribute code changes to Chemotools, please follow these steps:
+
+- Create a new branch for your changes. We follow trunk-based development, so all changes should be made on a new branch and branches should be short-lived and merged into main.
+
+- Write your code and tests, making sure to follow the Chemotools coding style and conventions. It is fundamental to include tests for both, the Scikit-learn API and the functionality of the transformers.
+
+- Run the tests using the provided testing framework to ensure that your changes do not introduce any new errors or regressions.
+
+- Submit a pull request to the main Chemotools repository with a detailed description of your changes and the problem they solve.
+
+We will review your changes and provide feedback as soon as possible. If we request changes, please make them as quickly as possible to keep the review process moving.
+
+#### Code Style
+
+Please follow the Chemotools code style and conventions when contributing code changes. Specifically:
+
+- Use four spaces for indentation
+- Use descriptive variable names
+- Avoid using magic numbers or hard-coded strings
+- Format your code using Black
+
+#### Codecov
+
+We use Codecov to track the test coverage of Chemotools. Please make sure that your changes do not reduce the test coverage of the package.
+
+
+## License
+
+This package is distributed under the MIT license. See the [LICENSE](LICENSE) file for more information. When contributing code to Chemotools, you are agreeing to release your code under the MIT license.
+
+## Credits
+
+AirPLS baseline correction is based on the implementation by [Zhang et al.](https://pubs.rsc.org/is/content/articlelanding/2010/an/b922045c). The current implementation is based on the Python implementation by [zmzhang](https://github.com/zmzhang/airPLS).

{chemotools-0.0.10 → chemotools-0.0.12}/chemotools/baseline/__init__.py

@@ -2,4 +2,5 @@ from .air_pls import AirPls
 from .cubic_spline_correction import CubicSplineCorrection
 from .linear_correction import LinearCorrection
 from .non_negative import NonNegative
-from .polynomial_correction import PolynomialCorrection
+from .polynomial_correction import PolynomialCorrection
+from .subtract_reference import SubtractReference

{chemotools-0.0.10 → chemotools-0.0.12}/chemotools/baseline/cubic_spline_correction.py

@@ -6,10 +6,10 @@ from sklearn.utils.validation import check_is_fitted
 from chemotools.utils.check_inputs import check_input
 
 class CubicSplineCorrection(BaseEstimator, TransformerMixin):
-    def __init__(self, indices: tuple = None) -> None:
+    def __init__(self, indices: np.ndarray = None) -> None:
         self.indices = indices
 
-    def fit(self, X: np.ndarray, y=None) -> "CubicSplineCorrection":
+    def fit(self, X: list, y=None) -> "CubicSplineCorrection":
         # Check that X is a 2D array and has only finite values
         X = check_input(X)
 
@@ -19,6 +19,11 @@ class CubicSplineCorrection(BaseEstimator, TransformerMixin):
         # Set the fitted attribute to True
         self._is_fitted = True
 
+        if self.indices is None:
+            self.indices_ = [0, len(X[0]) - 1]
+        else:
+            self.indices_ = self.indices
+
         return self
 
     def transform(self, X: np.ndarray, y=None, copy=True):
@@ -39,11 +44,7 @@ class CubicSplineCorrection(BaseEstimator, TransformerMixin):
         return X_.reshape(-1, 1) if X_.ndim == 1 else X_
 
     def _spline_baseline_correct(self, x: np.ndarray) -> np.ndarray:
-        if self.indices is None:
-            indices = [0, len(x) - 1]
-        else:
-            indices = list(self.indices)
-
+        indices = self.indices_
         intensity = x[indices]  
         spl = CubicSpline(indices, intensity)
         baseline = spl(range(len(x)))      

{chemotools-0.0.10 → chemotools-0.0.12}/chemotools/baseline/polynomial_correction.py

@@ -5,7 +5,7 @@ from sklearn.utils.validation import check_is_fitted
 from chemotools.utils.check_inputs import check_input
 
 class PolynomialCorrection(BaseEstimator, TransformerMixin):
-    def __init__(self, order: int = 1, indices: tuple = (0, -1)) -> None:
+    def __init__(self, order: int = 1, indices: list = None) -> None:
         self.order = order
         self.indices = indices
 
@@ -19,6 +19,11 @@ class PolynomialCorrection(BaseEstimator, TransformerMixin):
         # Set the fitted attribute to True
         self._is_fitted = True
 
+        if self.indices is None:
+            self.indices_ = range(0, len(X[0]))
+        else:
+            self.indices_ = self.indices
+
         return self
     
     def transform(self, X: np.ndarray, y=0, copy=True) -> np.ndarray:
@@ -39,7 +44,7 @@ class PolynomialCorrection(BaseEstimator, TransformerMixin):
         return X_.reshape(-1, 1) if X_.ndim == 1 else X_
     
     def _baseline_correct_spectrum(self, x: np.ndarray) -> np.ndarray:
-        intensity = x[list(self.indices)]
-        poly = np.polyfit(self.indices, intensity, self.order)
+        intensity = x[self.indices_]
+        poly = np.polyfit(self.indices_, intensity, self.order)
         baseline = [np.polyval(poly, i) for i in range(0, len(x))]      
         return x - baseline

chemotools-0.0.12/chemotools/baseline/subtract_reference.py

@@ -0,0 +1,54 @@
+import numpy as np
+from sklearn.base import BaseEstimator, TransformerMixin
+from sklearn.utils.validation import check_is_fitted
+
+from chemotools.utils.check_inputs import check_input
+
+
+class SubtractReference(BaseEstimator, TransformerMixin):
+    def __init__(
+        self,
+        reference: np.ndarray = None,
+    ):
+        self.reference = reference
+
+    def fit(self, X: np.ndarray, y=None) -> "SubtractReference":
+        # Check that X is a 2D array and has only finite values
+        X = check_input(X)
+
+        # Set the number of features
+        self.n_features_in_ = X.shape[1]
+
+        # Set the fitted attribute to True
+        self._is_fitted = True
+
+        # Set the reference
+
+        if self.reference is not None:
+            self.reference_ = self.reference.copy()
+            return self
+        
+        return self
+
+    def transform(self, X: np.ndarray, y=None) -> np.ndarray:
+        # Check that the estimator is fitted
+        check_is_fitted(self, "_is_fitted")
+
+        # Check that X is a 2D array and has only finite values
+        X = check_input(X)
+        X_ = X.copy()
+
+        # Check that the number of features is the same as the fitted data
+        if X_.shape[1] != self.n_features_in_:
+            raise ValueError(f"Expected {self.n_features_in_} features but got {X_.shape[1]}")
+
+        if self.reference is None:
+            return X_.reshape(-1, 1) if X_.ndim == 1 else X_
+
+        # Subtract the reference
+        for i, x in enumerate(X_):
+            X_[i] = self._subtract_reference(x)
+        return X_.reshape(-1, 1) if X_.ndim == 1 else X_
+
+    def _subtract_reference(self, x) -> np.ndarray:
+        return x - self.reference_

{chemotools-0.0.10 → chemotools-0.0.12}/chemotools/derivative/norris_william.py

@@ -50,7 +50,7 @@ class NorrisWilliams(BaseEstimator, TransformerMixin):
                 X_[i] = derivative
             return X_.reshape(-1, 1) if X_.ndim == 1 else X_
 
-        if self.derivative_order == 1:
+        if self.derivative_order == 2:
             for i, x in enumerate(X_):
                 derivative = self._spectrum_second_derivative(x)
                 X_[i] = derivative

chemotools-0.0.12/chemotools.egg-info/PKG-INFO

@@ -0,0 +1,118 @@
+Metadata-Version: 2.1
+Name: chemotools
+Version: 0.0.12
+Summary: Package to integrate chemometrics in scikit-learn pipelines
+Home-page: https://github.com/paucablop/chemotools
+Author: Pau Cabaneros Lopez
+Author-email: pau.cabaneros@gmail.com
+Project-URL: Bug Tracker, https://github.com/paucablop/chemotools/issues/
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+[![pypi](https://img.shields.io/pypi/v/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/pyversions/chemotools)](https://pypi.org/project/chemotools)
+[![pypi](https://img.shields.io/pypi/l/chemotools)](https://github.com/paucablop/chemotools/blob/main/LICENSE)
+[![codecov](https://codecov.io/github/paucablop/chemotools/branch/main/graph/badge.svg?token=D7JUJM89LN)](https://codecov.io/github/paucablop/chemotools)
+
+# __chemotools__
+
+Welcome to Chemotools, a Python package that integrates chemometrics with Scikit-learn.
+
+👉 Check the [documentation](https://paucablop.github.io/chemotools/) for a full description on how to use chemotools.
+
+## Description
+
+Chemotools is a Python package that provides a collection of preprocessing tools and utilities for working with spectral data. It is built on top of popular scientific libraries and is designed to be highly modular, easy to use, and compatible with Scikit-learn transformers.
+
+If you are interested in learning more about chemotools, please visit the [documentation](https://paucablop.github.io/chemotools/) page.
+
+Benefits:
+- Provides a collection of preprocessing tools and utilities for working with spectral data
+- Highly modular and compatible with Scikit-learn transformers
+- Can perform popular preprocessing tasks such as baseline correction, smoothing, scaling, derivatization, and scattering correction
+- Open source and available on PyPI
+
+Applications:
+- Analyzing and processing spectral data in chemistry, biology, and other fields
+- Developing machine learning models for predicting properties or classifying samples based on spectral data
+- Teaching and learning about chemometrics and data preprocessing in Python
+
+## Installation
+
+Chemotools is distributed via PyPI and can be easily installed using pip:
+
+```bash
+pip install chemotools
+```
+
+## Usage
+
+Chemotools is designed to be used in conjunction with Scikit-learn. It follows the same API as other Scikit-learn transformers, so you can easily integrate it into your existing workflow. For example, you can use chemotools to build pipelines that include transformers from chemotools and Scikit-learn:
+
+```python
+from sklearn.preprocessing import StandardScaler
+from sklearn.pipeline import make_pipeline
+
+from chemotools.baseline import AirPls
+from chemotools.scatter import MultiplicativeScatterCorrection
+
+preprocessing = make_pipeline(AirPls(), MultiplicativeScatterCorrection(), StandardScaler(with_std=False)) 
+spectra_transformed = preprocessing.fit_transform(spectra)
+```
+
+Check the [documentation](https://paucablop.github.io/chemotools/) for more information on how to use chemotools.
+
+
+## Contributing
+
+We welcome contributions to Chemotools from anyone interested in improving the package. Whether you have ideas for new features, bug reports, or just want to help improve the code, we appreciate your contributions! You are also welcome to see the [Project Board](https://github.com/users/paucablop/projects/4) to see what we are currently working on.
+
+To contribute to Chemotools, please follow these guidelines:
+
+#### Reporting Bugs
+
+If you encounter a bug or unexpected behavior in Chemotools, please open an issue on the GitHub repository with a detailed description of the problem, including any error messages and steps to reproduce the issue. If possible, include sample code or data that demonstrates the problem.
+
+#### Suggesting Enhancements
+
+If you have an idea for a new feature or enhancement for Chemotools, please open an issue on the GitHub repository with a detailed description of the proposed feature and its benefits. If possible, include example code or use cases that illustrate how the feature would be used.
+
+#### Submitting Changes
+
+If you'd like to contribute code changes to Chemotools, please follow these steps:
+
+- Create a new branch for your changes. We follow trunk-based development, so all changes should be made on a new branch and branches should be short-lived and merged into main.
+
+- Write your code and tests, making sure to follow the Chemotools coding style and conventions. It is fundamental to include tests for both, the Scikit-learn API and the functionality of the transformers.
+
+- Run the tests using the provided testing framework to ensure that your changes do not introduce any new errors or regressions.
+
+- Submit a pull request to the main Chemotools repository with a detailed description of your changes and the problem they solve.
+
+We will review your changes and provide feedback as soon as possible. If we request changes, please make them as quickly as possible to keep the review process moving.
+
+#### Code Style
+
+Please follow the Chemotools code style and conventions when contributing code changes. Specifically:
+
+- Use four spaces for indentation
+- Use descriptive variable names
+- Avoid using magic numbers or hard-coded strings
+- Format your code using Black
+
+#### Codecov
+
+We use Codecov to track the test coverage of Chemotools. Please make sure that your changes do not reduce the test coverage of the package.
+
+
+## License
+
+This package is distributed under the MIT license. See the [LICENSE](LICENSE) file for more information. When contributing code to Chemotools, you are agreeing to release your code under the MIT license.
+
+## Credits
+
+AirPLS baseline correction is based on the implementation by [Zhang et al.](https://pubs.rsc.org/is/content/articlelanding/2010/an/b922045c). The current implementation is based on the Python implementation by [zmzhang](https://github.com/zmzhang/airPLS).

{chemotools-0.0.10 → chemotools-0.0.12}/chemotools.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ setup.py
 ./chemotools/baseline/linear_correction.py
 ./chemotools/baseline/non_negative.py
 ./chemotools/baseline/polynomial_correction.py
+./chemotools/baseline/subtract_reference.py
 ./chemotools/derivative/__init__.py
 ./chemotools/derivative/norris_william.py
 ./chemotools/derivative/savitzky_golay.py

{chemotools-0.0.10 → chemotools-0.0.12}/tests/test_functionality.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from chemotools.baseline import AirPls, LinearCorrection, NonNegative
+from chemotools.baseline import AirPls, LinearCorrection, NonNegative, SubtractReference
 from chemotools.derivative import NorrisWilliams, SavitzkyGolay
 from chemotools.scale import LNormalize, MinMaxScaler
 from chemotools.scatter import MultiplicativeScatterCorrection, StandardNormalVariate
@@ -238,6 +238,7 @@ def test_saviszky_golay_filter_3():
     # Assert
     assert np.allclose(spectrum_corrected[0], np.ones((1, 10)), atol=1e-2)
 
+
 def test_standard_normal_variate(spectrum, reference_snv):
     # Arrange
     snv = StandardNormalVariate()
@@ -248,6 +249,25 @@ def test_standard_normal_variate(spectrum, reference_snv):
     # Assert
     assert np.allclose(spectrum_corrected[0], reference_snv[0], atol=1e-2)
 
+def test_subtract_reference(spectrum):
+    # Arrange
+    baseline = SubtractReference(reference=spectrum)
+
+    # Act
+    spectrum_corrected = baseline.fit_transform(spectrum)
+
+    # Assert
+    assert np.allclose(spectrum_corrected[0], np.zeros(len(spectrum)), atol=1e-8)
+
+def test_subtract_reference_without_reference(spectrum):
+    # Arrange
+    baseline = SubtractReference()
+
+    # Act
+    spectrum_corrected = baseline.fit_transform(spectrum)
+
+    # Assert
+    assert np.allclose(spectrum_corrected[0], spectrum, atol=1e-8)
 
 def test_whitakker_smooth(spectrum, reference_whitakker):
     # Arrange

{chemotools-0.0.10 → chemotools-0.0.12}/tests/test_sklearn_compliance.py

@@ -1,11 +1,13 @@
 from sklearn.utils.estimator_checks import check_estimator
 
-from chemotools.baseline import AirPls, CubicSplineCorrection, LinearCorrection, NonNegative, PolynomialCorrection
+from chemotools.baseline import AirPls, CubicSplineCorrection, LinearCorrection, NonNegative, PolynomialCorrection, SubtractReference
 from chemotools.derivative import NorrisWilliams, SavitzkyGolay
 from chemotools.scale import MinMaxScaler, LNormalize
 from chemotools.scatter import MultiplicativeScatterCorrection, StandardNormalVariate
 from chemotools.smooth import MeanFilter, MedianFilter, SavitzkyGolayFilter, WhittakerSmooth
 
+from tests.fixtures import spectrum
+
 
 # AirPls
 def test_compliance_air_pls():
@@ -77,6 +79,14 @@ def test_compliance_norris_williams():
     # Act & Assert
     check_estimator(transformer)
 
+# NorrisWilliams
+def test_compliance_norris_williams_2():
+    # Arrange
+    transformer = NorrisWilliams(derivative_order=2)
+    # Act & Assert
+    check_estimator(transformer)
+
+
 # PolynomialCorrection
 def test_compliance_polynomial_correction():
     # Arrange
@@ -105,6 +115,13 @@ def test_compliance_standard_normal_variate():
     # Act & Assert
     check_estimator(transformer)
 
+# SubtractReference
+def test_compliance_subtract_reference():
+    # Arrange
+    transformer = SubtractReference()
+    # Act & Assert
+    check_estimator(transformer)
+
 # WhittakerSmooth
 def test_compliance_whittaker_smooth():
     # Arrange