From 5c6acf01ba53122136b46535621162ac50e487ac Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Mon, 2 Dec 2019 08:27:40 -0500
Subject: [PATCH] Did some doc and corrected some paths"
---
docs/source/index.rst | 1 +
docs/source/tutorials/example1.rst | 439 ++++++++++++++++++
docs/source/tutorials/index.rst | 15 +
docs/source/tutorials/installation.rst | 21 +
.../config_files/config_example_1.yml | 8 +-
.../monoview/exec_classif_mono_view.py | 2 +-
.../monoview_classifiers/adaboost.py | 4 +
.../monoview_classifiers/lasso.py | 2 +-
.../monoview_classifiers/sgd.py | 2 +-
.../monoview_classifiers/svm_linear.py | 2 +-
.../additions/late_fusion_utils.py | 2 +
11 files changed, 490 insertions(+), 8 deletions(-)
create mode 100644 docs/source/tutorials/example1.rst
create mode 100644 docs/source/tutorials/index.rst
create mode 100644 docs/source/tutorials/installation.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 874d3c48..02f0a719 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -15,6 +15,7 @@ The main advantage of the platform is that it allows to add and remove a classif
:caption: Contents:
readme_link
+ tutorials/index
multiview_platform
.. examples
diff --git a/docs/source/tutorials/example1.rst b/docs/source/tutorials/example1.rst
new file mode 100644
index 00000000..57e1ff95
--- /dev/null
+++ b/docs/source/tutorials/example1.rst
@@ -0,0 +1,439 @@
+
+
+====================================
+First steps with Multiview platform
+====================================
+
+Context
+--------------------
+
+
+This platform aims at running multiple state-of-the-art classifiers on a multiview dataset in a classification context.
+It has been developed in order to get a baseline on common algorithms for any classification task.
+
+Adding a new classifier (monoview and/or multiview) as been made as simple as possible in order for users to be able to
+customize the set of classifiers and test their performances in a controlled environment.
+
+
+
+
+Introduction to this tutorial
+-----------------------------
+
+This tutorial will show you how to use the platform on simulated data, for the simplest problem : biclass classification.
+
+The data is naively generated TODO : Keep the same generator ?
+
+
+Getting started
+---------------
+
+**Importing the platform's execution function**
+
+.. code-block:: python
+
+ >>> from multiview_platform.execute import execute
+
+**Understanding the config file**
+
+The config file that will be used in this example is located in ``multiview-machine-learning-omis/multiview_platform/examples/config_files/config_exmaple_1.yml``
+We will decrypt the main arguments :
+
+The first part of the arguments are the basic ones :
+- ``log: True`` allows to print the log in the terminal,
+- ``name: ["plausible"]`` uses the plausible simulated dataset,
+- ``random_state: 42`` fixes the random state of this benchmark, it is useful for reproductibility,
+- ``full: True`` the benchmark will used the full dataset,
+- ``res_dir: "examples/results/example_1/"`` the results will be saved in ``multiview-machine-learning-omis/multiview_platform/examples/results/example_1``
+
+Then the classification-related arguments
+- ``split: 0.8`` means that 80% of the dataset will be used to test the different classifiers and 20% to train them
+- ``type: ["monoview", "multiview"]`` allows for monoview and multiview algorithms to be used in the benchmark
+- ``algos_monoview: ["all"]`` runs on all the available monoview algorithms (same for ``algos_muliview``)
+- ``metrics: ["accuracy_score", "f1_score"]`` means that the benchmark will evaluate the performance of each algortihms on these two metrics.
+
+Then, the two following categories are algorithm-related and contain all the default values for the hyper-parameters.
+
+**Start the benchmark**
+
+During the whole benchmark, the log file will be printed in the terminal. To start the benchmark run :
+
+.. code-block:: python
+
+ >>> execute()
+
+The execution should take less than five minutes. We will first analyze the results and parse through the information the platform output.
+
+
+**Understanding on the results**
+
+The result structure can be startling at first, but as the platform provides a lot of information, it has to be organized.
+
+The results are stored in ``multiview_platform/examples/results/example_1/``. Here, you will find a directory with the name of the database used for the benchmark, here : ``plausible/``
+Then, a directory with the amount of noise in the experiments, we didn't add any, so ``n_0/`` finally, a directory with
+the date and time of the beginning of the experiment. Let's say you started the benchmark on the 25th of December 1560,
+at 03:42 PM, the directory's name should be ``started_1560_12_25-15_42/``.
+From here the result directory has the structure that follo
+
+
+
+
+**Process the method**
+
+Here we choose to have two levels of decomposition, i.e two levels of details. We could also decide the approximate cardinality of the set of approximation coefficients.
+
+.. code-block:: python
+
+ >>> iw.process_analysis(mod='step', steps=2) # To have two levels of decomposition, i.e 2 levels of details
+ >>> print(iw.process_analysis_flag) # True if the decomposition process has been done.
+ True
+
+
+.. _User_exemple1:
+
+Graphs and subgraphs
+--------------------
+
+We start with the main attribute ``tab_Multires`` of ``iw`` which contains the sequence of subgraphs and which also contains the basis.
+
+.. code-block:: python
+
+ >>> tab=iw.tab_Multires
+
+The variable ``tab`` is a MemoryView which has three attributes.
+
+.. code-block:: python
+
+ >>> print(tab)
+ <iw.multiresolution.struct_multires_Lbarre.Tab_Struct_multires_Lbarre object at 0x7f3186287e30>
+
+
+**The attribute** ``steps``: it is the number of decomposition levels.
+
+.. code-block:: python
+
+ >>> print(tab.steps) # To get the number of decomposition levels
+ 2
+
+
+**The attribute** ``Struct_Mres_gr``: it is the sequence of subgraphs which is as well a MemoryView. You can access to the different levels as follows:
+
+.. code-block:: python
+
+ >>> subgraphs = tab.Struct_Mres_gr # To get the sequence of subgraphs
+ >>> j0 = 0
+ >>> Sg = subgraphs[j0] # To get access to the subgraph at level j0+1
+
+
+At each level ``j0`` it is possible to get:
+
+- **the list of vertices of the subgraph.** It is again a MemoryView to save memory. You can access the information using NumPy
+
+.. code-block:: python
+
+ >>> print(np.asarray(Sg.Xbarre)) # Indices of the vertices of the subgraph, drawn from the vertices of the seminal graph
+ [ 0 1 3 4 5 7 10 14 15]
+ >>> # Recall that the subsampling of vertices is one realization of a random point process. The result changes each time you launch iw.process_analysis
+
+*Watch out that if the level is not* ``j0 = 0`` *but* ``j0>0`` *the indices in* ``Sg.Xbarre`` *are taken among the set {0,.. nbarre-1} with nbarre the number of vertices of the graph at level j0-1. In other words the set* ``Sg.Xbarre`` *is not given as a subset of the vertices of the original graph, but of the graph it was drawn from.*
+
+.. code-block:: python
+
+ >>> ind_detailj0=np.asarray(Sg.Xbarre)
+ >>> # Indices of the vertices of the subgraph, drawn from the vertices of the seminal graph
+ >>> if j0>0: # To recover the indices in the original graph
+ for i in range(j0-1,-1,-1):
+ Xbarrei=np.asarray(subgraphs[i].Xbarre)
+ ind_detailj0=Xbarrei[ind_detailj0].copy()
+
+
+
+
+- **the Laplacian matrix encoding the weights of the subgraph.** It is the generator of a continuous Markov chain, so this is a matrix based on the vertices of the subgraph and whose non diagonal entries are :math:`w(x,y)\geq 0` and diagonal entries are :math:`w(x) = -\sum\limits_{x\neq y}w(x,y)`
+
+You can access to it as a sparse matrix. The fields ``Sg.rowLbarres, Sg.colLbarres, Sg.shapeLbarres`` allow it.
+
+.. code-block:: python
+
+ >>> Lbarre0s = Sg.Lbarres
+ >>> print(Lbarre0s) # It is again a MemoryView
+ <MemoryView of 'ndarray' object>
+ >>> # Let us get the sparse matrix
+ >>> Lbarre0ms = sp.coo_matrix((Lbarre0s,( Sg.rowLbarres, Sg.colLbarres)),
+ shape=(Sg.shapeLbarres, Sg.shapeLbarres))
+ >>> plt.figure() # Let us visualize the non vanishing coefficients
+ >>> plt.spy(Lbarre0ms, markersize=2)
+ >>> plt.title('Localization of non vanishing entries')
+ >>> plt.xlabel('Indices')
+ >>> plt.show()
+
+
+.. figure:: ./images/spy_sub_graph_16.png
+ :scale: 50 %
+
+ Localization of the non vanishing coefficients of the Laplacian of the subgraph.
+
+*Watch out that the Laplacian matrix of the graph is computed through a sparsification step from another Laplacian matrix, the Schur complement of the original Laplacian. The latter is also stored in* ``Sg`` *under the field* ``Sg.Lbarre``
+
+.. code-block:: python
+
+ >>> Lbarre0 = Sg.Lbarre
+ >>> print(Lbarre0) # It is again a Memory view
+ <MemoryView of 'ndarray' object>
+ >>> # Let us get the sparse matrix
+ >>> Lbarre0m = sp.coo_matrix((Lbarre0,( Sg.rowLbarre, Sg.colLbarre)),
+ shape=(Sg.shapeLbarre, Sg.shapeLbarre))
+ >>> sp.linalg.norm(Lbarre0m-Lbarre0ms) # check the difference between the Schur complement and its sparsified version
+ 0
+ >>> # Here the Schur complement and its sparsified version are the same.
+
+Analysis and reconstruction operators
+-------------------------------------
+
+We come back to the attributes of ``tab``.
+
+The third attribute of ``tab`` is ``Struct_Mana_re``. It is again a MemoryView object.
+
+.. code-block:: python
+
+ >>> basis = tab.Struct_Mana_re
+ >>> print(basis)
+ <MemoryView of 'ndarray' object>
+ >>> l0 = 0 # To access to the functions of the first level (finest scale)
+ >>> a0 = basis[l0]
+
+The attributes of ``basis`` store all the operators needed to analyse signals, ie. to compute wavelets coefficients, and the operators to reconstruct the signals given coefficients.
+
+These objects beeing slightly more complicated to handle and not really useful in this experiment we do not explore them now more in details. If you want to know more there is a dedicated tutorial :ref:`User_exemple_analysis_recons`.
+
+Process a signal
+----------------
+
+Computation of intertwining wavelet coefficients.
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+We will now process a signal.
+
+**Signal input:** this is here a simple step function. To be processed by ``iw`` it has to be a 2d Numpy array, with possibly just one line.
+
+.. code-block:: python
+
+ >>> n = 16
+ >>> Sig = np.zeros((1,n)) # Sig has to be a 2d NumPy array, here with just one line
+ >>> Sig[0,0:n//2] = 1
+ >>> print(Sig)
+ [[1. 1. 1. 1. 1. 1. 1. 1. 0. 0. 0. 0. 0. 0. 0. 0.]]
+
+Let us have a look on it.
+
+.. code-block:: python
+
+ >>> plt.figure()
+ >>> plt.plot(Sig[0,:]) # Watch out that Sig is a 2d NumPy array
+ >>> plt.title('Original signal')
+ >>> plt.show()
+
+
+.. figure:: ./images/Sig_16.png
+ :scale: 50 %
+
+ Original signal.
+
+**Computation of the intertwining wavelet coefficients:**
+
+This is done using the attribute of ``iw`` which is ``process_coefficients``. The output is a 2d NumPy array, with possibly one line.
+
+.. code-block:: python
+
+ >>> coeffs_iw = iw.process_coefficients(Sig)
+ >>> print(coeffs_iw.shape)
+ (1, 16)
+ >>> print(coeffs_iw) # coeffs is again a 2d NumPy array
+ [[-2.55845734e-03 -1.78582022e-02 1.25000130e-01 1.78582022e-02
+ 4.16493056e-04 4.16493056e-04 2.55845734e-03 1.84741585e-02
+ 8.56532883e-01 9.78647881e-01 9.99267234e-01 9.99456183e-01
+ 9.95570764e-01 8.68070076e-01 1.15588087e-02 2.15887658e-02]]
+
+**Organization of the intertwining wavelet coefficients:**
+
+The organization of the intertwining wavelet coefficients (IW coefficients) in the NumPy array ``coeffs_iw`` is as follows:
+
+ ``coeffs_iw``:math:`=[[g_1,g_2,\dots,g_K,f_K]]`
+
+with
+
+- :math:`g_1`: the sequence of coefficients of the finest details level,
+- :math:`g_K`: the sequence of coefficients of the coarsest details level,
+- :math:`f_K` the sequence of scaling coefficients, or so called approximation coefficients.
+
+The attribute ``following_size`` of ``iw`` gives the number of coefficients in each layer
+
+.. code-block:: python
+
+ >>> levels_coeffs = np.asarray(iw.following_size)
+ >>> print(levels_coeffs)
+ [7 1 8]
+
+
+In our example
+
+- the finest details level :math:`g_1` has 7 coefficients,
+- the coarsest details level :math:`g_2` has 1 coefficients
+- we have 8 approximation coefficients in :math:`f_2`.
+
+We can also try to guess it on the plot of the IW coefficients since the details coefficients almost vanish.
+
+ >>> plt.figure()
+ >>> plt.plot(coeffs_iw[0,:],'*') # Watch out that coeffs is a 2d NumPy array
+ >>> plt.title('Intertwining wavelet coefficients')
+ >>> plt.show()
+
+
+.. figure:: ./images/Coeffs_16.png
+ :scale: 50 %
+
+ IW coefficients.
+
+*Remember our method is based on a random subsampling and thus the number of coefficients in each layer generally changes at each new run of* ``iw``. *But we compute a basis and thus the total number of coefficients is always the total number of vertices in the graph.*
+
+Reconstruction of signals.
+<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+The reconstruction of a signal from its IW coefficients is done using the attribute ``process_signal`` of ``iw``.
+
+**Reconstruction from the scaling coefficients.**
+
+Let us look at the signal whose coefficients are the scaling coefficients. We will keep the 8 last coefficients, and put 0 for the other ones.
+
+.. code-block:: python
+
+ >>> coeffs_approx = np.zeros((1,n))
+ >>> napprox = levels_coeffs[tab.steps]
+ >>> coeffs_approx[0,n-napprox:n] = coeffs_iw[0,n-napprox:n].copy() # these are the f_2 coefficients
+ >>> plt.figure()
+ >>> plt.plot(coeffs_approx[0,:],'*')
+ >>> plt.show()
+
+.. figure:: ./images/Coeffs_approx_16.png
+ :scale: 50 %
+
+ Approximation coefficients.
+
+Let us compute the approximation part from its scaling coefficients.
+
+.. code-block:: python
+
+ >>> approx = iw.process_signal(coeffs_approx)
+ >>> plt.figure()
+ >>> plt.plot(approx[0,:])
+ >>> plt.title('approximation part')
+ >>> plt.show()
+
+
+.. figure:: ./images/Sig_approx_16.png
+ :scale: 50 %
+
+ Approximation part: the vertex 15 and 0 are connected so we have a boundary effect on the approximation.
+
+**Reconstruction from the finest detail coefficients.**
+
+We need to extract the 7 first IW coefficients which corresponds to the finest detail coefficients.
+
+.. code-block:: python
+
+ >>> coeffs_detail1 = np.zeros((1,n))
+ >>> ndetail1 = levels_coeffs[0]
+ >>> coeffs_detail1[0,0:ndetail1] = coeffs_iw[0,0:ndetail1].copy() # these are the g_1 coefficients
+ >>> print(coeffs_detail1)
+ [[-0.00255846 -0.0178582 0.12500013 0.0178582 0.00041649 0.00041649
+ 0.00255846 0. 0. 0. 0. 0.
+ 0. 0. 0. 0. ]]
+
+Let us compute the finest detail contribution from its coefficients.
+
+.. code-block:: python
+
+ >>> detail1 = iw.process_signal(coeffs_detail1)
+ >>> plt.figure()
+ >>> plt.plot(detail1[0,:])
+ >>> plt.plot(Sig[0,:],'--r')
+ >>> plt.title('finest detail part')
+ >>> plt.show()
+
+
+.. figure:: ./images/Sig_detail1_16.png
+ :scale: 50 %
+
+ Finest detail part in blue, in red is the original signal. The detail part is localized and does not vanish on the discontinuity.
+
+
+**Reconstruction from the coarsest detail coefficients.**
+
+We need to extract the coefficients corresponding to the coarsest detail level.
+
+.. code-block:: python
+
+ >>> coeffs_detail2 = np.zeros((1,n))
+ >>> coeffs_detail2[0,ndetail1:n-napprox] = coeffs_iw[0,ndetail1:n-napprox].copy() # these are the g_2 coefficients
+ >>> print(coeffs_detail2)
+ [[0. 0. 0. 0. 0. 0.
+ 0. 0.01847416 0. 0. 0. 0.
+ 0. 0. 0. 0. ]]
+
+Let us compute the coarsest detail contribution from its coefficients
+
+.. code-block:: python
+
+ >>> detail2 = iw.process_signal(coeffs_detail2)
+ >>> plt.figure()
+ >>> plt.plot(detail2[0,:])
+ >>> plt.title('coarsest detail part')
+ >>> plt.show()
+
+
+.. figure:: ./images/Sig_detail2_16.png
+ :scale: 50 %
+
+ Coarsest detail part. We have some boundary effects due to the connection between vertex 15 and vertex 0 in the original graph.
+
+**Exact reconstruction of the signal.**
+
+As we expect the sum of the approximation, finest and coarsest detail parts, yields the signal, since we do not take into account insignificant numerical errors.
+
+.. code-block:: python
+
+ >>> Sig_L = detail1 + detail2 + approx
+ >>> plt.figure()
+ >>> plt.subplot(2,1,1)
+ >>> plt.plot(Sig_L[0,:])
+ >>> plt.subplot(2,1,2)
+ >>> plt.plot(np.abs(Sig_L[0,:]-Sig[0,:]))
+ >>> plt.show()
+
+.. figure:: ./images/Sig_L.png
+
+ On top the sum of the approximation, finest and coarsest details parts. Below the error between this reconstructed signal and the original one.
+
+
+*The attribute* ``process_reconstruction_signal`` *of* ``iw`` *uses the analysis and reconstruction operators to compute the wavelet coefficients of the signal and reconstruct it from them. This is equivalent to run* ``iw.process_coefficients`` *and then* ``iw.process_signal`` *starting from the original signal.*
+
+.. code-block:: python
+
+ >>> coeffs_iw = iw.process_coefficients(Sig)
+ >>> Sig_R = iw.process_signal(coeffs_iw)
+ >>> Sig_r = iw.process_reconstruction_signal(Sig)
+ >>> plt.figure()
+ >>> plt.subplot(2,1,1)
+ >>> plt.plot(Sig_R[0,:]-Sig_r[0,:])
+ >>> plt.subplot(2,1,2)
+ >>> plt.plot(np.abs(Sig_R[0,:]-Sig[0,:]))
+ >>> plt.show()
+
+.. figure:: ./images/Sig_R.png
+
+ On top the difference between the signal reconstructed from ``coeffs`` and the output of ``iw.process_reconstruction_signal(Sig)``. Below the error between this reconstructed signal and the original one.
+
+
+
+
+.. note::
diff --git a/docs/source/tutorials/index.rst b/docs/source/tutorials/index.rst
new file mode 100644
index 00000000..ebb2b7a9
--- /dev/null
+++ b/docs/source/tutorials/index.rst
@@ -0,0 +1,15 @@
+=============================
+Multiview Platform Tutorials
+=============================
+
+The following are some tutorials which explain how to use the toolbox.
+
+.. toctree::
+ :maxdepth: 1
+
+ installation
+ User_Example1
+ User_Example2
+ User_Example3
+ User_Example4
+ User_Example5
\ No newline at end of file
diff --git a/docs/source/tutorials/installation.rst b/docs/source/tutorials/installation.rst
new file mode 100644
index 00000000..246d4b46
--- /dev/null
+++ b/docs/source/tutorials/installation.rst
@@ -0,0 +1,21 @@
+
+=======================================
+Install Multiview Platform
+=======================================
+
+Multiview Platform is a package developped for Python3.x.
+
+To sum up what you need to run the platform :
+
+- Python 3 is required. Download and install `Python 3 <https://www.python.org/downloads/>`_.
+
+
+Launching the setup tool
+------------------------
+Run in a terminal the following command, in the multiview-machine-learning-omis directory
+
+.. code-block:: shell
+
+ $ pip install -e .
+
+
diff --git a/multiview_platform/examples/config_files/config_example_1.yml b/multiview_platform/examples/config_files/config_example_1.yml
index 8d1316dc..ee883da2 100644
--- a/multiview_platform/examples/config_files/config_example_1.yml
+++ b/multiview_platform/examples/config_files/config_example_1.yml
@@ -19,9 +19,9 @@ Base :
# The number of parallel computing threads
nb_cores: 1
# Used to run the benchmark on the full dataset
- full: False
+ full: True
# Used to be able to run more than one benchmark per minute
- debug: False
+ debug: True
# To add noise to the data, will add gaussian noise with noise_std
add_noise: False
noise_std: 0.0
@@ -54,7 +54,7 @@ Classification:
# The metric that will be used in the hyper-parameter optimization process
metric_princ: "f1_score"
# The type of hyper-parameter optimization method
- hps_type: "randomized_search"
+ hps_type: None
# The number of iteration in the hyper-parameter optimization process
hps_iter: 2
@@ -180,4 +180,4 @@ weighted_linear_late_fusion:
decision_tree:
max_depth: [1]
criterion: ["gini"]
- splitter: ["best"]
\ No newline at end of file
+ splitter: ["best"]
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
index 9b5490f2..bb24ae0d 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
@@ -201,7 +201,7 @@ def getHPs(classifierModule, hyper_param_search, nIter, classifier_module_name,
classifier_module_name])
logging.debug("Done:\t " + hyper_param_search + " best settings")
else:
- clKWARGS = kwargs[classifier_module_name + "KWARGS"]
+ clKWARGS = kwargs[classifier_module_name]
testFoldsPreds = None
return clKWARGS, testFoldsPreds
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/adaboost.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/adaboost.py
index 1e7beb5d..637f12e1 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/adaboost.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/adaboost.py
@@ -54,6 +54,10 @@ class Adaboost(AdaBoostClassifier, BaseMonoviewClassifier):
def __init__(self, random_state=None, n_estimators=50,
base_estimator=None, **kwargs):
+ if isinstance(base_estimator, str):
+ if base_estimator == "DecisionTreeClassifier":
+ base_estimator = DecisionTreeClassifier()
+
super(Adaboost, self).__init__(
random_state=random_state,
n_estimators=n_estimators,
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py
index c36ad031..ca85cf79 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py
@@ -63,7 +63,7 @@ class Lasso(LassoSK, BaseMonoviewClassifier):
neg_y = np.copy(y)
neg_y[np.where(neg_y == 0)] = -1
super(Lasso, self).fit(X, neg_y)
- self.feature_importances_ = self.coef_/np.sum(self.coef_)
+ # self.feature_importances_ = self.coef_/np.sum(self.coef_)
return self
def predict(self, X):
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/sgd.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/sgd.py
index bd0d8c70..1023f6b3 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/sgd.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/sgd.py
@@ -80,7 +80,7 @@ class SGD(SGDClassifier, BaseMonoviewClassifier):
"""
interpret_string = ""
import numpy as np
- self.feature_importances_ = (self.coef_/np.sum(self.coef_)).reshape(self.coef_.shape[1])
+ # self.feature_importances_ = (self.coef_/np.sum(self.coef_)).reshape(self.coef_.shape[1])
return interpret_string
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/svm_linear.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/svm_linear.py
index 47c983c7..13b0d6ae 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/svm_linear.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/svm_linear.py
@@ -38,7 +38,7 @@ class SVMLinear(SVCClassifier, BaseMonoviewClassifier):
def getInterpret(self, directory, y_test):
interpret_string = ""
- self.feature_importances_ = (self.coef_/np.sum(self.coef_)).reshape((self.coef_.shape[1],))
+ # self.feature_importances_ = (self.coef_/np.sum(self.coef_)).reshape((self.coef_.shape[1],))
return interpret_string
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/late_fusion_utils.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/late_fusion_utils.py
index f768ecc6..487e4276 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/late_fusion_utils.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/late_fusion_utils.py
@@ -113,6 +113,8 @@ class LateFusionClassifier(BaseMultiviewClassifier, BaseFusionClassifier):
if isinstance(self.classifier_configs, ConfigDistribution):
self.classifier_configs = self.classifier_configs.draw(nb_view)
+ elif isinstance(self.classifier_configs, dict):
+ self.classifier_configs = [{classifier_name: self.classifier_configs[classifier_name]} for classifier_name in self.classifiers_names]
self.monoview_estimators = [
self.init_monoview_estimator(classifier_name,
--
GitLab