feat/NCH and MDM

Dockerfile

@@ -25,15 +25,15 @@ RUN mkdir /home/mne_data
 
 ## Workaround for firestore
 RUN pip install protobuf==4.25.3
-RUN pip install google_cloud_firestore==2.15.0
+RUN pip install google_cloud_firestore==2.16.0
 ### Missing __init__ file in protobuf
 RUN touch /usr/local/lib/python3.9/site-packages/protobuf-4.25.3-py3.9.egg/google/__init__.py
 ## google.cloud.location is never used in these files, and is missing in path.
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/client.py'
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/base.py'
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/grpc.py'
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/grpc_asyncio.py'
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/rest.py'
-RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.15.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/async_client.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/client.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/base.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/grpc.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/grpc_asyncio.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/transports/rest.py'
+RUN sed -i 's/from google.cloud.location import locations_pb2//g' '/usr/local/lib/python3.9/site-packages/google_cloud_firestore-2.16.0-py3.9.egg/google/cloud/firestore_v1/services/firestore/async_client.py'
 
 ENTRYPOINT [ "python", "/examples/ERP/classify_P300_bi.py" ]

doc/api.rst

@@ -32,6 +32,7 @@ Pipelines
     QuantumClassifierWithDefaultRiemannianPipeline
     QuantumMDMWithRiemannianPipeline
     QuantumMDMVotingClassifier
+    FeaturesUnionClassifier
 
 
 Ensemble

pyriemann_qiskit/pipelines.py

@@ -2,12 +2,14 @@
 import numpy as np
 from sklearn.base import BaseEstimator, ClassifierMixin, TransformerMixin
 from sklearn.decomposition import PCA
-from sklearn.pipeline import make_pipeline
+from sklearn.discriminant_analysis import LinearDiscriminantAnalysis as LDA
+from sklearn.pipeline import make_pipeline, FeatureUnion
 from sklearn.ensemble import VotingClassifier
 from qiskit_optimization.algorithms import CobylaOptimizer
 from pyriemann.estimation import XdawnCovariances, ERPCovariances
 from pyriemann.tangentspace import TangentSpace
 from pyriemann.preprocessing import Whitening
+from pyriemann.classification import MDM
 from pyriemann_qiskit.utils.utils import is_qfunction
 from pyriemann_qiskit.utils.filtering import NoDimRed
 from pyriemann_qiskit.utils.hyper_params_factory import (
@@ -16,7 +18,12 @@
     gen_two_local,
     get_spsa,
 )
-from pyriemann_qiskit.classification import QuanticVQC, QuanticSVM, QuanticMDM
+from pyriemann_qiskit.classification import (
+    QuanticNCH,
+    QuanticVQC,
+    QuanticSVM,
+    QuanticMDM,
+)
 
 
 class BasePipeline(BaseEstimator, ClassifierMixin, TransformerMixin):
@@ -497,3 +504,47 @@ def _create_pipe(self):
                 voting="soft",
             )
         )
+
+
+class FeaturesUnionClassifier(BasePipeline):
+
+    """An alias for FeatureUnion + Classifier
+
+    Aggregate features generated by different transformers, and
+    use a classifier (e.g. LDA) in top of it.
+
+    Parameters
+    ----------
+    transformers : List[TransformerMixin], default=[QuanticNCH, MDM]
+        A list of sklearn transformers.
+    classifier : ClassifierMixin, default=LDA()
+        A classifier
+
+    Attributes
+    ----------
+    classes_ : list
+        list of classes.
+
+    Notes
+    -----
+    .. versionadded:: 0.2.0
+
+    """
+
+    def __init__(
+        self,
+        transformers=[
+            QuanticNCH(quantum=True, subsampling="random", n_jobs=-1),
+            MDM(metric="logeuclid"),
+        ],
+        classifier=LDA(),
+    ):
+        self.transformers = transformers
+        self.classifier = classifier
+        BasePipeline.__init__(self, "FeatureUnionClassifier")
+
+    def _create_pipe(self):
+        return make_pipeline(
+            FeatureUnion([(type(t).__name__, t) for t in self.transformers]),
+            self.classifier,
+        )

setup.py

@@ -44,7 +44,7 @@
                         'qiskit-aer==0.12.2',
                         'cvxpy==1.4.2',
                         'scipy==1.11.4',
-                        'docplex>=2.21.207',
+                        'docplex==2.25.236',
                         'firebase_admin==6.4.0',
                         'scikit-learn==1.3.2',
                         'tqdm',